5 files changed, 8 insertions, 8 deletions
diff --git a/java/res/xml-sw600dp/rowkeys_slavic1.xml b/java/res/xml-sw600dp/rowkeys_east_slavic1.xml
index 6ceb97017..6ceb97017 100644
--- a/java/res/xml-sw600dp/rowkeys_slavic1.xml
+++ b/java/res/xml-sw600dp/rowkeys_east_slavic1.xml
diff --git a/java/res/xml-sw600dp/rowkeys_serbian1.xml b/java/res/xml-sw600dp/rowkeys_south_slavic1.xml
index aa0d5bbe3..aa0d5bbe3 100644
--- a/java/res/xml-sw600dp/rowkeys_serbian1.xml
+++ b/java/res/xml-sw600dp/rowkeys_south_slavic1.xml
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
index 9a9ff74fa..71f049923 100644
--- a/java/res/xml-sw600dp/rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_east_slavic.xml
@@ -27,7 +27,7 @@
         latin:keyWidth="7.60%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic1" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
         <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
             latin:keyLabel="&#x044A;" />
@@ -40,7 +40,7 @@
         latin:keyWidth="7.60%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic2"
+            latin:keyboardLayout="@xml/rowkeys_east_slavic2"
             latin:keyXPos="2.25%p" />
         <Key
             latin:keyStyle="enterKeyStyle"
@@ -53,7 +53,7 @@
         <Key
             latin:keyStyle="shiftKeyStyle" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_slavic3" />
+            latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw600dp/rows_scandinavian.xml b/java/res/xml-sw600dp/rows_nordic.xml
index df1e60fee..5c744582c 100644
--- a/java/res/xml-sw600dp/rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -27,7 +27,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+            latin:keyboardLayout="@xml/rowkeys_nordic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_scandinavian2"
+            latin:keyboardLayout="@xml/rowkeys_nordic2"
             latin:keyXPos="3.5%p" />
         <Key
             latin:keyStyle="enterKeyStyle"
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
index 62a87c29a..9b79a3683 100644
--- a/java/res/xml-sw600dp/rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -27,7 +27,7 @@
         latin:keyWidth="8.0%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian1" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
         latin:keyWidth="7.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian2"
+            latin:keyboardLayout="@xml/rowkeys_south_slavic2"
             latin:keyXPos="2.15%p" />
         <Key
             latin:keyStyle="enterKeyStyle"
@@ -51,7 +51,7 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="8.0%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_serbian3" />
+            latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include