diff --git a/reactos/base/applications/regedit/clb/lang/En.rc b/reactos/base/applications/regedit/clb/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/regedit/clb/lang/En.rc
rename to reactos/base/applications/regedit/clb/lang/en-US.rc
diff --git a/reactos/base/applications/regedit/clb/lang/Ja.rc b/reactos/base/applications/regedit/clb/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/applications/regedit/clb/lang/Ja.rc
rename to reactos/base/applications/regedit/clb/lang/ja-JP.rc
diff --git a/reactos/base/applications/regedit/clb/lang/No.rc b/reactos/base/applications/regedit/clb/lang/nb-NO.rc
similarity index 94%
rename from reactos/base/applications/regedit/clb/lang/No.rc
rename to reactos/base/applications/regedit/clb/lang/nb-NO.rc
index 280a8730aff..c59b74ff93e 100644
--- a/reactos/base/applications/regedit/clb/lang/No.rc
+++ b/reactos/base/applications/regedit/clb/lang/nb-NO.rc
@@ -1,9 +1,9 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Column List Box Styles"
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
    GROUPBOX "kolonne liste Boks Stiler", -1, 6, 7, 158, 71
diff --git a/reactos/base/applications/regedit/clb/rsrc.rc b/reactos/base/applications/regedit/clb/rsrc.rc
index d6663c06609..d024d048328 100644
--- a/reactos/base/applications/regedit/clb/rsrc.rc
+++ b/reactos/base/applications/regedit/clb/rsrc.rc
@@ -29,8 +29,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* include localised resources */
 
 
-#include "lang/En.rc"
-#include "lang/Ja.rc"
-#include "lang/No.rc"
-
+#include "lang/en-US.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nb-NO.rc"
 
diff --git a/reactos/base/applications/regedit/lang/Cz.rc b/reactos/base/applications/regedit/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Cz.rc
rename to reactos/base/applications/regedit/lang/cs-CZ.rc
diff --git a/reactos/base/applications/regedit/lang/De.rc b/reactos/base/applications/regedit/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/De.rc
rename to reactos/base/applications/regedit/lang/de-DE.rc
diff --git a/reactos/base/applications/regedit/lang/En.rc b/reactos/base/applications/regedit/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/En.rc
rename to reactos/base/applications/regedit/lang/en-US.rc
diff --git a/reactos/base/applications/regedit/lang/Es.rc b/reactos/base/applications/regedit/lang/es-ES.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/Es.rc
rename to reactos/base/applications/regedit/lang/es-ES.rc
index 804bee4e915..a2a461e8e14 100644
--- a/reactos/base/applications/regedit/lang/Es.rc
+++ b/reactos/base/applications/regedit/lang/es-ES.rc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Fr.rc b/reactos/base/applications/regedit/lang/fr-FR.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/Fr.rc
rename to reactos/base/applications/regedit/lang/fr-FR.rc
index 4296316afb1..e1d61f62494 100644
--- a/reactos/base/applications/regedit/lang/Fr.rc
+++ b/reactos/base/applications/regedit/lang/fr-FR.rc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Hu.rc b/reactos/base/applications/regedit/lang/hu-HU.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Hu.rc
rename to reactos/base/applications/regedit/lang/hu-HU.rc
diff --git a/reactos/base/applications/regedit/lang/It.rc b/reactos/base/applications/regedit/lang/it-IT.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/It.rc
rename to reactos/base/applications/regedit/lang/it-IT.rc
index eda9ef63cf7..42f5f68ba4f 100644
--- a/reactos/base/applications/regedit/lang/It.rc
+++ b/reactos/base/applications/regedit/lang/it-IT.rc
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Ja.rc b/reactos/base/applications/regedit/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Ja.rc
rename to reactos/base/applications/regedit/lang/ja-JP.rc
diff --git a/reactos/base/applications/regedit/lang/Nl.rc b/reactos/base/applications/regedit/lang/nl-NL.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/Nl.rc
rename to reactos/base/applications/regedit/lang/nl-NL.rc
index 021eef2e0f4..9b513d320d4 100644
--- a/reactos/base/applications/regedit/lang/Nl.rc
+++ b/reactos/base/applications/regedit/lang/nl-NL.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Pl.rc b/reactos/base/applications/regedit/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Pl.rc
rename to reactos/base/applications/regedit/lang/pl-PL.rc
diff --git a/reactos/base/applications/regedit/lang/Pt.rc b/reactos/base/applications/regedit/lang/pt-PT.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/Pt.rc
rename to reactos/base/applications/regedit/lang/pt-PT.rc
index 8c0546bf9fb..dce104d1ccb 100644
--- a/reactos/base/applications/regedit/lang/Pt.rc
+++ b/reactos/base/applications/regedit/lang/pt-PT.rc
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Ru.rc b/reactos/base/applications/regedit/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Ru.rc
rename to reactos/base/applications/regedit/lang/ru-RU.rc
diff --git a/reactos/base/applications/regedit/lang/Si.rc b/reactos/base/applications/regedit/lang/sl-SI.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Si.rc
rename to reactos/base/applications/regedit/lang/sl-SI.rc
diff --git a/reactos/base/applications/regedit/lang/Sv.rc b/reactos/base/applications/regedit/lang/sv-SE.rc
similarity index 99%
rename from reactos/base/applications/regedit/lang/Sv.rc
rename to reactos/base/applications/regedit/lang/sv-SE.rc
index a9b9d2d540a..99c43e8189f 100644
--- a/reactos/base/applications/regedit/lang/Sv.rc
+++ b/reactos/base/applications/regedit/lang/sv-SE.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
 
 ID_ACCEL ACCELERATORS
 {
diff --git a/reactos/base/applications/regedit/lang/Uk.rc b/reactos/base/applications/regedit/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/regedit/lang/Uk.rc
rename to reactos/base/applications/regedit/lang/uk-UA.rc
diff --git a/reactos/base/applications/regedit/rsrc.rc b/reactos/base/applications/regedit/rsrc.rc
index b4eecf7e1cf..27975620f2a 100644
--- a/reactos/base/applications/regedit/rsrc.rc
+++ b/reactos/base/applications/regedit/rsrc.rc
@@ -28,19 +28,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 
-#include "lang/Cz.rc"
-#include "lang/De.rc"
-#include "lang/En.rc"
-#include "lang/Es.rc"
-#include "lang/Fr.rc"
-#include "lang/It.rc"
-#include "lang/Ja.rc"
-#include "lang/Nl.rc"
-#include "lang/Pl.rc"
-#include "lang/Pt.rc"
-#include "lang/Ru.rc"
-#include "lang/Si.rc"
-#include "lang/Sv.rc"
-#include "lang/Hu.rc"
-#include "lang/Uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/pt-PT.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sl-SI.rc"
+#include "lang/sv-SE.rc"
+#include "lang/hu-HU.rc"
+#include "lang/uk-UA.rc"