diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 74ce854..b20123c 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="13.250%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_number" />
+        latin:keyboardLayout="@xml/rows_number" />
 </Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index 0a9b8b5..fa9bf1b 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="13.250%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone" />
+        latin:keyboardLayout="@xml/rows_phone" />
 </Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_shift.xml
index 055d70c..a56afcc 100644
--- a/java/res/xml-sw768dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="13.250%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+        latin:keyboardLayout="@xml/rows_phone_shift" />
 </Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/key_styles_common.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_key_styles.xml
rename to java/res/xml-sw768dp/key_styles_common.xml
diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/keys_apostrophe_dash.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
rename to java/res/xml-sw768dp/keys_apostrophe_dash.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/row_qwerty1.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row1.xml
rename to java/res/xml-sw768dp/row_qwerty1.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/row_qwerty2.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row2.xml
rename to java/res/xml-sw768dp/row_qwerty2.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/row_qwerty3.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_qwerty_row3.xml
rename to java/res/xml-sw768dp/row_qwerty3.xml
index f2f137e..e2bb2e5 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw768dp/row_qwerty3.xml
@@ -46,7 +46,7 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyXPos="-13.750%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/row_qwerty4.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_qwerty_row4.xml
rename to java/res/xml-sw768dp/row_qwerty4.xml
index 1f00dff..c3ba911 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/row_qwerty4.xml
@@ -92,11 +92,11 @@
                 latin:languageCode="iw"
             >
                 <include
-                    latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+                    latin:keyboardLayout="@xml/keys_comma_period" />
             </case>
             <default>
                 <include
-                    latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+                    latin:keyboardLayout="@xml/keys_apostrophe_dash" />
             </default>
         </switch>
         <switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml
similarity index 98%
rename from java/res/xml-sw768dp/kbd_rows_arabic.xml
rename to java/res/xml-sw768dp/rows_arabic.xml
index 412d5d9..0e4aee4 100644
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw768dp/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="7.375%p"
     >
@@ -189,5 +189,5 @@
             latin:keyLabel="د" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/rows_azerty.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_rows_azerty.xml
rename to java/res/xml-sw768dp/rows_azerty.xml
index 127f716..c97ac40 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/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.282%p"
     >
@@ -131,12 +131,12 @@
             latin:keyHintLabel=":"
             latin:moreKeys=":" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyXPos="-13.750%p"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_bulgarian.xml
rename to java/res/xml-sw768dp/rows_bulgarian.xml
index 42b3da5..57f39b4 100644
--- a/java/res/xml-sw768dp/kbd_rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/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.333%p"
     >
@@ -112,11 +112,11 @@
         <Key
             latin:keyLabel="ю" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_hebrew.xml
rename to java/res/xml-sw768dp/rows_hebrew.xml
index 5f4b556..755afc8 100644
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.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.282%p"
     >
@@ -31,7 +31,7 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="7.969%p" />
         <include
-            latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+            latin:keyboardLayout="@xml/keys_apostrophe_dash" />
         <Key
             latin:keyLabel="ק" />
         <Key
@@ -116,5 +116,5 @@
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_number_normal.xml
rename to java/res/xml-sw768dp/rows_number_normal.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_number_password.xml b/java/res/xml-sw768dp/rows_number_password.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_number_password.xml
rename to java/res/xml-sw768dp/rows_number_password.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_phone.xml
rename to java/res/xml-sw768dp/rows_phone.xml
index 1320cf0..da90895 100644
--- a/java/res/xml-sw768dp/kbd_rows_phone.xml
+++ b/java/res/xml-sw768dp/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>
         <Key
             latin:keyStyle="numTabKeyStyle"
diff --git a/java/res/xml-sw768dp/kbd_rows_phone_shift.xml b/java/res/xml-sw768dp/rows_phone_shift.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_phone_shift.xml
rename to java/res/xml-sw768dp/rows_phone_shift.xml
index e749790..5861998 100644
--- a/java/res/xml-sw768dp/kbd_rows_phone_shift.xml
+++ b/java/res/xml-sw768dp/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>
         <Key
             latin:keyStyle="numTabKeyStyle"
diff --git a/java/res/xml-sw768dp/kbd_rows_qwerty.xml b/java/res/xml-sw768dp/rows_qwerty.xml
similarity index 75%
rename from java/res/xml-sw768dp/kbd_rows_qwerty.xml
rename to java/res/xml-sw768dp/rows_qwerty.xml
index 6237712..71be44e 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw768dp/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-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/rows_qwertz.xml
similarity index 92%
rename from java/res/xml-sw768dp/kbd_rows_qwertz.xml
rename to java/res/xml-sw768dp/rows_qwertz.xml
index 7a7a046..05a2a9c 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/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="8.282%p"
     >
@@ -66,7 +66,7 @@
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+        latin:keyboardLayout="@xml/row_qwerty2" />
     <Row
         latin:keyWidth="8.047%p"
     >
@@ -92,12 +92,12 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyXPos="-13.750%p"
             latin:keyWidth="fillBoth" />
     </Row>
    <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/rows_scandinavian.xml
similarity index 96%
rename from java/res/xml-sw768dp/kbd_rows_scandinavian.xml
rename to java/res/xml-sw768dp/rows_scandinavian.xml
index 334b76d..373617b 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/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.375%p"
     >
@@ -134,12 +134,12 @@
         <Key
             latin:keyLabel="m" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyXPos="-12.750%p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_serbian.xml
rename to java/res/xml-sw768dp/rows_serbian.xml
index 0b1773e..2e9e140 100644
--- a/java/res/xml-sw768dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw768dp/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="7.125%p"
     >
@@ -112,12 +112,12 @@
         <Key
             latin:keyLabel="м" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-13.750%p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_slavic.xml b/java/res/xml-sw768dp/rows_slavic.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_rows_slavic.xml
rename to java/res/xml-sw768dp/rows_slavic.xml
index 4c9128d..86b4498 100644
--- a/java/res/xml-sw768dp/kbd_rows_slavic.xml
+++ b/java/res/xml-sw768dp/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.125%p"
     >
@@ -121,11 +121,11 @@
         <Key
             latin:keyLabel="ю" />
         <include
-            latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+            latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="fillBoth" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-sw768dp/rows_spanish.xml
similarity index 89%
rename from java/res/xml-sw768dp/kbd_rows_spanish.xml
rename to java/res/xml-sw768dp/rows_spanish.xml
index 7e543b2..f626a45 100644
--- a/java/res/xml-sw768dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw768dp/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.125%p"
     >
@@ -64,7 +64,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-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
similarity index 98%
rename from java/res/xml-sw768dp/kbd_rows_symbols.xml
rename to java/res/xml-sw768dp/rows_symbols.xml
index 641fe19..820e5f7 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/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="8.282%p"
     >
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
rename to java/res/xml-sw768dp/rows_symbols_shift.xml
index f6b47a8..80735b6 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/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="8.282%p"
     >