diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index ad588d7..70cf6a2 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="15.00%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_number" />
+        latin:keyboardLayout="@xml/rows_number" />
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index ce769b8..72acef2 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="15.00%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone" />
+        latin:keyboardLayout="@xml/rows_phone" />
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml
index 3753deb..e722545 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="15.00%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+        latin:keyboardLayout="@xml/rows_phone_shift" />
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/key_f2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_f2.xml
rename to java/res/xml-sw600dp/key_f2.xml
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_row3_smiley.xml
rename to java/res/xml-sw600dp/key_smiley.xml
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/key_styles_common.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_key_styles.xml
rename to java/res/xml-sw600dp/key_styles_common.xml
diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
rename to java/res/xml-sw600dp/keys_apostrophe_dash.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/row_qwerty1.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row1.xml
rename to java/res/xml-sw600dp/row_qwerty1.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/row_qwerty2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row2.xml
rename to java/res/xml-sw600dp/row_qwerty2.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/row_qwerty3.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_qwerty_row3.xml
rename to java/res/xml-sw600dp/row_qwerty3.xml
index 1a86bbf..3d19904 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/row_qwerty3.xml
@@ -46,9 +46,9 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillBoth" />
     </Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
similarity index 90%
rename from java/res/xml-sw600dp/kbd_qwerty_row4.xml
rename to java/res/xml-sw600dp/row_qwerty4.xml
index 54ca22b..bf6bcb1 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -59,18 +59,18 @@
                 latin:languageCode="iw"
             >
                 <include
-                    latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+                    latin:keyboardLayout="@xml/keys_comma_period" />
             </case>
             <!-- not languageCode="iw" -->
             <default>
                 <include
-                    latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+                    latin:keyboardLayout="@xml/keys_apostrophe_dash" />
             </default>
         </switch>
         <Spacer
             latin:keyXPos="-10.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
similarity index 97%
rename from java/res/xml-sw600dp/kbd_rows_arabic.xml
rename to java/res/xml-sw600dp/rows_arabic.xml
index f96564f..8d4901b 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.0%p"
     >
@@ -146,7 +146,7 @@
         latin:keyWidth="8.0%p"
     >
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley" />
+            latin:keyboardLayout="@xml/key_smiley" />
         <!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
         <Key
             latin:keyLabel="ئ" />
@@ -184,5 +184,5 @@
             latin:keyLabel="د" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
similarity index 94%
rename from java/res/xml-sw600dp/kbd_rows_azerty.xml
rename to java/res/xml-sw600dp/rows_azerty.xml
index 9e2bc69..c9a9dab 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.5%p"
     >
@@ -121,12 +121,12 @@
         <Key
             latin:keyLabel="\'" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_bulgarian.xml
rename to java/res/xml-sw600dp/rows_bulgarian.xml
index 22e7435..b464158 100644
--- a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.692%p"
     >
@@ -106,12 +106,12 @@
         <Key
             latin:keyLabel="ю" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_hebrew.xml
rename to java/res/xml-sw600dp/rows_hebrew.xml
index 5c4194c..71fb463 100644
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -22,12 +22,12 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
     >
         <include
-            latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+            latin:keyboardLayout="@xml/keys_apostrophe_dash" />
         <Key
             latin:keyLabel="ק" />
         <Key
@@ -81,7 +81,7 @@
         latin:keyWidth="8.9%p"
     >
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="ז"
@@ -111,5 +111,5 @@
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
similarity index 98%
rename from java/res/xml-sw600dp/kbd_rows_number_normal.xml
rename to java/res/xml-sw600dp/rows_number_normal.xml
index 1e39f39..f7eb950 100644
--- a/java/res/xml-sw600dp/kbd_rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -133,6 +133,6 @@
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
similarity index 97%
rename from java/res/xml-sw600dp/kbd_rows_number_password.xml
rename to java/res/xml-sw600dp/rows_number_password.xml
index 4d96334..c3f21e1 100644
--- a/java/res/xml-sw600dp/kbd_rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -76,6 +76,6 @@
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
similarity index 95%
rename from java/res/xml-sw600dp/kbd_rows_phone.xml
rename to java/res/xml-sw600dp/rows_phone.xml
index 69d058f..1bad7ca 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -22,9 +22,9 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_numkey_styles" />
+        latin:keyboardLayout="@xml/key_styles_number" />
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
@@ -117,6 +117,6 @@
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml b/java/res/xml-sw600dp/rows_phone_shift.xml
similarity index 95%
rename from java/res/xml-sw600dp/kbd_rows_phone_shift.xml
rename to java/res/xml-sw600dp/rows_phone_shift.xml
index 04db678..c2f00fe 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml
+++ b/java/res/xml-sw600dp/rows_phone_shift.xml
@@ -22,9 +22,9 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_numkey_styles" />
+        latin:keyboardLayout="@xml/key_styles_number" />
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
@@ -127,6 +127,6 @@
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
similarity index 75%
rename from java/res/xml-sw600dp/kbd_rows_qwerty.xml
rename to java/res/xml-sw600dp/rows_qwerty.xml
index a2d26b3..eb41c50 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+        latin:keyboardLayout="@xml/row_qwerty1" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+        latin:keyboardLayout="@xml/row_qwerty2" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+        latin:keyboardLayout="@xml/row_qwerty3" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
similarity index 90%
rename from java/res/xml-sw600dp/kbd_rows_qwertz.xml
rename to java/res/xml-sw600dp/rows_qwertz.xml
index bc08d07..fe93a70 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
     >
@@ -62,7 +62,7 @@
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+        latin:keyboardLayout="@xml/row_qwerty2" />
     <Row
         latin:keyWidth="8.9%p"
     >
@@ -88,12 +88,12 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/rows_scandinavian.xml
similarity index 94%
rename from java/res/xml-sw600dp/kbd_rows_scandinavian.xml
rename to java/res/xml-sw600dp/rows_scandinavian.xml
index 6d9164e..f334f8b 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_scandinavian.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.9%p"
     >
@@ -129,12 +129,12 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_serbian.xml
rename to java/res/xml-sw600dp/rows_serbian.xml
index 7e918bb..c21fd4c 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.0%p"
     >
@@ -109,12 +109,12 @@
         <Key
             latin:keyLabel="ж" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
similarity index 93%
rename from java/res/xml-sw600dp/kbd_rows_slavic.xml
rename to java/res/xml-sw600dp/rows_slavic.xml
index aa5adfd..889a438 100644
--- a/java/res/xml-sw600dp/kbd_rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.60%p"
     >
@@ -115,12 +115,12 @@
         <Key
             latin:keyLabel="ю" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_smiley"
+            latin:keyboardLayout="@xml/key_smiley"
             latin:keyXPos="-8.9%p"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
similarity index 89%
rename from java/res/xml-sw600dp/kbd_rows_spanish.xml
rename to java/res/xml-sw600dp/rows_spanish.xml
index 8506af6..b516beb 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -22,9 +22,9 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+        latin:keyboardLayout="@xml/row_qwerty1" />
     <Row
         latin:keyWidth="8.5%p"
     >
@@ -61,7 +61,7 @@
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+        latin:keyboardLayout="@xml/row_qwerty3" />
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
similarity index 96%
rename from java/res/xml-sw600dp/kbd_rows_symbols.xml
rename to java/res/xml-sw600dp/rows_symbols.xml
index bb48fe7..e345a23 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -22,9 +22,9 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="9.0%p"
     >
@@ -167,6 +167,6 @@
             latin:keyXPos="-10.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
similarity index 95%
rename from java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
rename to java/res/xml-sw600dp/rows_symbols_shift.xml
index 8e47515..d3531dd 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_common" />
     <include
-        latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
         latin:keyWidth="9.0%p"
     >
@@ -127,6 +127,6 @@
             latin:keyXPos="-10.00%p"
             latin:keyWidth="0%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>