diff --git a/java/res/xml/kbd_arabic.xml b/java/res/xml/kbd_arabic.xml
index 91b2281..d7f77cc 100644
--- a/java/res/xml/kbd_arabic.xml
+++ b/java/res/xml/kbd_arabic.xml
@@ -23,5 +23,5 @@
     latin:isRtlKeyboard="true"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_arabic" />
+        latin:keyboardLayout="@xml/rows_arabic" />
 </Keyboard>
diff --git a/java/res/xml/kbd_azerty.xml b/java/res/xml/kbd_azerty.xml
index 3abaf64..7bafe5b 100644
--- a/java/res/xml/kbd_azerty.xml
+++ b/java/res/xml/kbd_azerty.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_azerty" />
+        latin:keyboardLayout="@xml/rows_azerty" />
 </Keyboard>
diff --git a/java/res/xml/kbd_bulgarian.xml b/java/res/xml/kbd_bulgarian.xml
index f114383..a651991 100644
--- a/java/res/xml/kbd_bulgarian.xml
+++ b/java/res/xml/kbd_bulgarian.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_bulgarian" />
+        latin:keyboardLayout="@xml/rows_bulgarian" />
 </Keyboard>
diff --git a/java/res/xml/kbd_hebrew.xml b/java/res/xml/kbd_hebrew.xml
index f25aadd..3d574db 100644
--- a/java/res/xml/kbd_hebrew.xml
+++ b/java/res/xml/kbd_hebrew.xml
@@ -23,5 +23,5 @@
     latin:isRtlKeyboard="true"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_hebrew" />
+        latin:keyboardLayout="@xml/rows_hebrew" />
 </Keyboard>
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index 38dd6bf..8b0deea 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="26.67%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_number" />
+        latin:keyboardLayout="@xml/rows_number" />
 </Keyboard>
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index b550f17..91637b6 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="26.67%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone" />
+        latin:keyboardLayout="@xml/rows_phone" />
 </Keyboard>
diff --git a/java/res/xml/kbd_phone_shift.xml b/java/res/xml/kbd_phone_shift.xml
index eea823f..104f33f 100644
--- a/java/res/xml/kbd_phone_shift.xml
+++ b/java/res/xml/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
     latin:keyWidth="26.67%p"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+        latin:keyboardLayout="@xml/rows_phone_shift" />
 </Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index ae0146c..2f49b94 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+        latin:keyboardLayout="@xml/rows_qwerty" />
 </Keyboard>
diff --git a/java/res/xml/kbd_qwertz.xml b/java/res/xml/kbd_qwertz.xml
index 5bcceb2..9f7e901 100644
--- a/java/res/xml/kbd_qwertz.xml
+++ b/java/res/xml/kbd_qwertz.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_qwertz" />
+        latin:keyboardLayout="@xml/rows_qwertz" />
 </Keyboard>
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_scandinavian.xml
index 4caa989..46ddfcb 100644
--- a/java/res/xml/kbd_scandinavian.xml
+++ b/java/res/xml/kbd_scandinavian.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
+        latin:keyboardLayout="@xml/rows_scandinavian" />
 </Keyboard>
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_serbian.xml
index 40b7199..05597c4 100644
--- a/java/res/xml/kbd_serbian.xml
+++ b/java/res/xml/kbd_serbian.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_serbian" />
+        latin:keyboardLayout="@xml/rows_serbian" />
 </Keyboard>
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_slavic.xml
index 6207d29..ca891c0 100644
--- a/java/res/xml/kbd_slavic.xml
+++ b/java/res/xml/kbd_slavic.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_slavic" />
+        latin:keyboardLayout="@xml/rows_slavic" />
 </Keyboard>
diff --git a/java/res/xml/kbd_spanish.xml b/java/res/xml/kbd_spanish.xml
index cfb8c6c..6ce2b5d 100644
--- a/java/res/xml/kbd_spanish.xml
+++ b/java/res/xml/kbd_spanish.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_spanish" />
+        latin:keyboardLayout="@xml/rows_spanish" />
 </Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 737f684..f6612a2 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_symbols" />
+        latin:keyboardLayout="@xml/rows_symbols" />
 </Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 9c163d6..41a5571 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -22,5 +22,5 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <include
-        latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+        latin:keyboardLayout="@xml/rows_symbols_shift" />
 </Keyboard>
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/key_f1.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_f1.xml
rename to java/res/xml/key_f1.xml
diff --git a/java/res/xml/kbd_settings_or_tab.xml b/java/res/xml/key_settings_or_tab.xml
similarity index 100%
rename from java/res/xml/kbd_settings_or_tab.xml
rename to java/res/xml/key_settings_or_tab.xml
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/key_styles_common.xml
similarity index 100%
rename from java/res/xml/kbd_key_styles.xml
rename to java/res/xml/key_styles_common.xml
diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/key_styles_currency.xml
similarity index 91%
rename from java/res/xml/kbd_currency_key_styles.xml
rename to java/res/xml/key_styles_currency.xml
index 2258883..3e4afdf 100644
--- a/java/res/xml/kbd_currency_key_styles.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -26,7 +26,7 @@
             latin:passwordInput="true"
         >
             <include
-                latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+                latin:keyboardLayout="@xml/key_styles_currency_dollar" />
         </case>
         <!-- Countries using Euro currency, 23 countries as for January 2011. -->
               1. Andorra (ca_AD, ca_ES)
@@ -62,19 +62,19 @@
             latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|pt_PT|tr"
         >
             <include
-                latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+                latin:keyboardLayout="@xml/key_styles_currency_euro" />
         </case>
         <case
             latin:languageCode="ca|et|lb|mt|sla"
         >
             <include
-                latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+                latin:keyboardLayout="@xml/key_styles_currency_euro" />
         </case>
         <case
             latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"
         >
             <include
-                latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+                latin:keyboardLayout="@xml/key_styles_currency_euro" />
         </case>
         <case
             latin:languageCode="iw"
@@ -121,7 +121,7 @@
         </case>
         <default>
             <include
-                latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+                latin:keyboardLayout="@xml/key_styles_currency_dollar" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/kbd_currency_dollar_key_styles.xml b/java/res/xml/key_styles_currency_dollar.xml
similarity index 100%
rename from java/res/xml/kbd_currency_dollar_key_styles.xml
rename to java/res/xml/key_styles_currency_dollar.xml
diff --git a/java/res/xml/kbd_currency_euro_key_styles.xml b/java/res/xml/key_styles_currency_euro.xml
similarity index 100%
rename from java/res/xml/kbd_currency_euro_key_styles.xml
rename to java/res/xml/key_styles_currency_euro.xml
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/key_styles_number.xml
similarity index 100%
rename from java/res/xml/kbd_numkey_styles.xml
rename to java/res/xml/key_styles_number.xml
diff --git a/java/res/xml/kbd_symbols_f1.xml b/java/res/xml/key_symbols_f1.xml
similarity index 100%
rename from java/res/xml/kbd_symbols_f1.xml
rename to java/res/xml/key_symbols_f1.xml
diff --git a/java/res/xml/kbd_row3_comma_period.xml b/java/res/xml/keys_comma_period.xml
similarity index 100%
rename from java/res/xml/kbd_row3_comma_period.xml
rename to java/res/xml/keys_comma_period.xml
diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/row_qwerty1.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row1.xml
rename to java/res/xml/row_qwerty1.xml
diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/row_qwerty2.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row2.xml
rename to java/res/xml/row_qwerty2.xml
diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/row_qwerty3.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row3.xml
rename to java/res/xml/row_qwerty3.xml
diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/row_qwerty4.xml
similarity index 91%
rename from java/res/xml/kbd_qwerty_row4.xml
rename to java/res/xml/row_qwerty4.xml
index eb1e9b8..65500a6 100644
--- a/java/res/xml/kbd_qwerty_row4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -33,7 +33,7 @@
                     latin:keyStyle="toSymbolKeyStyle"
                     latin:keyWidth="15%p" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+                    latin:keyboardLayout="@xml/key_f1" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
@@ -49,9 +49,9 @@
                     latin:keyStyle="toSymbolKeyStyle"
                     latin:keyWidth="13.75%p" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+                    latin:keyboardLayout="@xml/key_settings_or_tab" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+                    latin:keyboardLayout="@xml/key_f1" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/row_symbols4.xml
similarity index 91%
rename from java/res/xml/kbd_symbols_row4.xml
rename to java/res/xml/row_symbols4.xml
index 864cf2b..8b094dd 100644
--- a/java/res/xml/kbd_symbols_row4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -33,7 +33,7 @@
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="15%p" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_symbols_f1" />
+                    latin:keyboardLayout="@xml/key_symbols_f1" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
@@ -49,9 +49,9 @@
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="13.75%p" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+                    latin:keyboardLayout="@xml/key_settings_or_tab" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+                    latin:keyboardLayout="@xml/key_f1" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/row_symbols_shift4.xml
similarity index 97%
rename from java/res/xml/kbd_symbols_shift_row4.xml
rename to java/res/xml/row_symbols_shift4.xml
index 079112c..4e13ac7 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -54,7 +54,7 @@
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="13.75%p" />
                 <include
-                    latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+                    latin:keyboardLayout="@xml/key_settings_or_tab" />
                 <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
                     <!-- latin:moreKeys="‟" -->
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/rows_arabic.xml
similarity index 98%
rename from java/res/xml/kbd_rows_arabic.xml
rename to java/res/xml/rows_arabic.xml
index dd5123e..dcee10e 100644
--- a/java/res/xml/kbd_rows_arabic.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -185,5 +185,5 @@
             latin:visualInsetsLeft="1%p" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/rows_azerty.xml
similarity index 97%
rename from java/res/xml/kbd_rows_azerty.xml
rename to java/res/xml/rows_azerty.xml
index 54fe546..b7a0936 100644
--- a/java/res/xml/kbd_rows_azerty.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -132,5 +132,5 @@
             latin:visualInsetsLeft="1%p" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
similarity index 96%
rename from java/res/xml/kbd_rows_bulgarian.xml
rename to java/res/xml/rows_bulgarian.xml
index 7b18361..9b5a5e6 100644
--- a/java/res/xml/kbd_rows_bulgarian.xml
+++ b/java/res/xml/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="9.091%p"
     >
@@ -124,5 +124,5 @@
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
similarity index 96%
rename from java/res/xml/kbd_rows_hebrew.xml
rename to java/res/xml/rows_hebrew.xml
index 6be8174..a64a09d 100644
--- a/java/res/xml/kbd_rows_hebrew.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -105,5 +105,5 @@
         <!-- Here is 5%p space -->
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_number.xml b/java/res/xml/rows_number.xml
similarity index 80%
rename from java/res/xml/kbd_rows_number.xml
rename to java/res/xml/rows_number.xml
index b066e0a..8da83be 100644
--- a/java/res/xml/kbd_rows_number.xml
+++ b/java/res/xml/rows_number.xml
@@ -23,19 +23,19 @@
     latin:keyWidth="26.67%p"
 >
     <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" />
     <switch>
         <case
             latin:passwordInput="true"
         >
             <include
-                latin:keyboardLayout="@xml/kbd_rows_number_password" />
+                latin:keyboardLayout="@xml/rows_number_password" />
         </case>
         <default>
             <include
-                latin:keyboardLayout="@xml/kbd_rows_number_normal" />
+                latin:keyboardLayout="@xml/rows_number_normal" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/kbd_rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
similarity index 100%
rename from java/res/xml/kbd_rows_number_normal.xml
rename to java/res/xml/rows_number_normal.xml
diff --git a/java/res/xml/kbd_rows_number_password.xml b/java/res/xml/rows_number_password.xml
similarity index 100%
rename from java/res/xml/kbd_rows_number_password.xml
rename to java/res/xml/rows_number_password.xml
diff --git a/java/res/xml/kbd_rows_phone.xml b/java/res/xml/rows_phone.xml
similarity index 94%
rename from java/res/xml/kbd_rows_phone.xml
rename to java/res/xml/rows_phone.xml
index 5500a60..94d0f72 100644
--- a/java/res/xml/kbd_rows_phone.xml
+++ b/java/res/xml/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="num1KeyStyle" />
diff --git a/java/res/xml/kbd_rows_phone_shift.xml b/java/res/xml/rows_phone_shift.xml
similarity index 95%
rename from java/res/xml/kbd_rows_phone_shift.xml
rename to java/res/xml/rows_phone_shift.xml
index b39e2da..1005206 100644
--- a/java/res/xml/kbd_rows_phone_shift.xml
+++ b/java/res/xml/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:keyLabel="("
diff --git a/java/res/xml/kbd_rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
similarity index 75%
rename from java/res/xml/kbd_rows_qwerty.xml
rename to java/res/xml/rows_qwerty.xml
index 6237712..71be44e 100644
--- a/java/res/xml/kbd_rows_qwerty.xml
+++ b/java/res/xml/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/kbd_rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
similarity index 94%
rename from java/res/xml/kbd_rows_qwertz.xml
rename to java/res/xml/rows_qwertz.xml
index 71bb601..e578f9a 100644
--- a/java/res/xml/kbd_rows_qwertz.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -69,7 +69,7 @@
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+        latin:keyboardLayout="@xml/row_qwerty2" />
     <Row
         latin:keyWidth="10%p"
     >
@@ -101,5 +101,5 @@
             latin:visualInsetsLeft="1%p" />
     </Row>
    <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/rows_scandinavian.xml
similarity index 95%
rename from java/res/xml/kbd_rows_scandinavian.xml
rename to java/res/xml/rows_scandinavian.xml
index eb32c00..2bd246b 100644
--- a/java/res/xml/kbd_rows_scandinavian.xml
+++ b/java/res/xml/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="9.091%p"
     >
@@ -106,7 +106,7 @@
             latin:keyWidth="fillRight" />
     </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/kbd_rows_serbian.xml b/java/res/xml/rows_serbian.xml
similarity index 96%
rename from java/res/xml/kbd_rows_serbian.xml
rename to java/res/xml/rows_serbian.xml
index da4d695..beb04d5 100644
--- a/java/res/xml/kbd_rows_serbian.xml
+++ b/java/res/xml/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="9.091%p"
     >
@@ -126,5 +126,5 @@
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_slavic.xml b/java/res/xml/rows_slavic.xml
similarity index 97%
rename from java/res/xml/kbd_rows_slavic.xml
rename to java/res/xml/rows_slavic.xml
index 426be72..52f5af4 100644
--- a/java/res/xml/kbd_rows_slavic.xml
+++ b/java/res/xml/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="9.091%p"
     >
@@ -130,5 +130,5 @@
             latin:keyWidth="fillRight" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_spanish.xml b/java/res/xml/rows_spanish.xml
similarity index 88%
rename from java/res/xml/kbd_rows_spanish.xml
rename to java/res/xml/rows_spanish.xml
index 03d631e..4b4cb9d 100644
--- a/java/res/xml/kbd_rows_spanish.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -56,7 +56,7 @@
             latin:keyLabel="ñ" />
     </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/kbd_rows_symbols.xml b/java/res/xml/rows_symbols.xml
similarity index 96%
rename from java/res/xml/kbd_rows_symbols.xml
rename to java/res/xml/rows_symbols.xml
index c5bcb14..fe9efbb 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -126,5 +126,5 @@
             latin:visualInsetsLeft="1%p" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_symbols_row4" />
+        latin:keyboardLayout="@xml/row_symbols4" />
 </merge>
diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
similarity index 94%
rename from java/res/xml/kbd_rows_symbols_shift.xml
rename to java/res/xml/rows_symbols_shift.xml
index 91654b0..6d1838c 100644
--- a/java/res/xml/kbd_rows_symbols_shift.xml
+++ b/java/res/xml/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="10%p"
     >
@@ -110,5 +110,5 @@
             latin:visualInsetsLeft="1%p" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/kbd_symbols_shift_row4" />
+        latin:keyboardLayout="@xml/row_symbols_shift4" />
 </merge>