diff --git a/reactos/boot/bootdata/hivesys_arm.inf b/reactos/boot/bootdata/hivesys_arm.inf
index 79858c8a807..f5f07b0735c 100644
--- a/reactos/boot/bootdata/hivesys_arm.inf
+++ b/reactos/boot/bootdata/hivesys_arm.inf
@@ -212,9 +212,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022"
 
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian"
diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf
index eed9a567848..db22b9fe416 100644
--- a/reactos/boot/bootdata/hivesys_i386.inf
+++ b/reactos/boot/bootdata/hivesys_i386.inf
@@ -212,9 +212,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022"
 
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth.dll"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee"
-HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)"
+HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081"
 
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian"
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 08f44708681..e082858e1e9 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -197,7 +197,7 @@ dll\keyboard\kbdsg\kbdsg.dll                        1
 dll\keyboard\kbdsk\kbdsk.dll                        1
 dll\keyboard\kbdsw\kbdsw.dll                        1
 dll\keyboard\kbdtat\kbdtat.dll                      1
-dll\keyboard\kbdth\kbdth.dll                        1
+dll\keyboard\kbdth2\kbdth2.dll                      1
 dll\keyboard\kbdtuf\kbdtuf.dll                      1
 dll\keyboard\kbdtuq\kbdtuq.dll                      1
 dll\keyboard\kbduk\kbduk.dll                        1
diff --git a/reactos/dll/keyboard/kbdth/kbdth.c b/reactos/dll/keyboard/kbdth2/kbdth.c
similarity index 100%
rename from reactos/dll/keyboard/kbdth/kbdth.c
rename to reactos/dll/keyboard/kbdth2/kbdth.c
diff --git a/reactos/dll/keyboard/kbdth/kbdth.def b/reactos/dll/keyboard/kbdth2/kbdth.def
similarity index 100%
rename from reactos/dll/keyboard/kbdth/kbdth.def
rename to reactos/dll/keyboard/kbdth2/kbdth.def
diff --git a/reactos/dll/keyboard/kbdth/kbdth.rbuild b/reactos/dll/keyboard/kbdth2/kbdth.rbuild
similarity index 70%
rename from reactos/dll/keyboard/kbdth/kbdth.rbuild
rename to reactos/dll/keyboard/kbdth2/kbdth.rbuild
index c8eebd8423d..e1127e85b93 100644
--- a/reactos/dll/keyboard/kbdth/kbdth.rbuild
+++ b/reactos/dll/keyboard/kbdth2/kbdth.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kbdth" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true">
+<module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true">
 	<importlibrary definition="kbdth.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/dll/keyboard/kbdth/kbdth.rc b/reactos/dll/keyboard/kbdth2/kbdth.rc
similarity index 100%
rename from reactos/dll/keyboard/kbdth/kbdth.rc
rename to reactos/dll/keyboard/kbdth2/kbdth.rc
diff --git a/reactos/dll/keyboard/keyboard.rbuild b/reactos/dll/keyboard/keyboard.rbuild
index 3ff5e68faff..759ada2b54c 100644
--- a/reactos/dll/keyboard/keyboard.rbuild
+++ b/reactos/dll/keyboard/keyboard.rbuild
@@ -169,8 +169,8 @@
 	<directory name="kbdtat">
 		<xi:include href="kbdtat/kbdtat.rbuild" />
 	</directory>
-	<directory name="kbdth">
-		<xi:include href="kbdth/kbdth.rbuild" />
+	<directory name="kbdth2">
+		<xi:include href="kbdth2/kbdth.rbuild" />
 	</directory>
 	<directory name="kbdtuf">
 		<xi:include href="kbdtuf/kbdtuf.rbuild" />