diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 3b6df73..3b35f35 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -31,7 +31,7 @@
                 latin:isModifier="true" />
             <key-style
                 latin:styleName="shiftKeyStyle"
-                latin:codes="@integer/key_shift"
+                latin:code="@integer/key_shift"
                 latin:keyIcon="@drawable/sym_keyboard_shift"
                 latin:shiftedIcon="@drawable/sym_keyboard_shift_locked"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -39,7 +39,7 @@
                 latin:isSticky="true" />
             <key-style
                 latin:styleName="deleteKeyStyle"
-                latin:codes="@integer/key_delete"
+                latin:code="@integer/key_delete"
                 latin:keyIcon="@drawable/sym_keyboard_delete"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
                 latin:parentStyle="functionalKeyStyle"
@@ -54,7 +54,7 @@
                 >
                     <key-style
                         latin:styleName="toSymbolKeyStyle"
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyIcon="@drawable/sym_keyboard_123_mic"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
                         latin:parentStyle="functionalKeyStyle" />
@@ -62,32 +62,32 @@
                 <default>
                     <key-style
                         latin:styleName="toSymbolKeyStyle"
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyLabel="@string/label_to_symbol_key"
                         latin:parentStyle="functionalKeyStyle" />
                 </default>
             </switch>
             <key-style
                 latin:styleName="settingsKeyStyle"
-                latin:codes="@integer/key_settings"
+                latin:code="@integer/key_settings"
                 latin:keyIcon="@drawable/sym_keyboard_settings"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="spaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_keyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="tabKeyStyle"
-                latin:codes="@integer/key_tab"
+                latin:code="@integer/key_tab"
                 latin:keyIcon="@drawable/sym_keyboard_tab"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:codes="@integer/key_voice"
+                latin:code="@integer/key_voice"
                 latin:keyIcon="@drawable/sym_keyboard_mic"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:keyHintIcon="@drawable/hint_popup"
@@ -97,7 +97,7 @@
                  which is laid out as normal letter key. -->
             <key-style
                 latin:styleName="nonSpecialBackgroundTabKeyStyle"
-                latin:codes="@integer/key_tab"
+                latin:code="@integer/key_tab"
                 latin:keyIcon="@drawable/sym_keyboard_tab"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
         </case>
@@ -108,7 +108,7 @@
                 latin:styleName="functionalKeyStyle" />
             <key-style
                 latin:styleName="shiftKeyStyle"
-                latin:codes="@integer/key_shift"
+                latin:code="@integer/key_shift"
                 latin:keyIcon="@drawable/sym_bkeyboard_shift"
                 latin:shiftedIcon="@drawable/sym_bkeyboard_shift_locked"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -116,7 +116,7 @@
                 latin:isSticky="true" />
             <key-style
                 latin:styleName="deleteKeyStyle"
-                latin:codes="@integer/key_delete"
+                latin:code="@integer/key_delete"
                 latin:keyIcon="@drawable/sym_bkeyboard_delete"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
                 latin:parentStyle="functionalKeyStyle"
@@ -131,7 +131,7 @@
                 >
                     <key-style
                         latin:styleName="toSymbolKeyStyle"
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
                         latin:parentStyle="functionalKeyStyle" />
@@ -139,32 +139,32 @@
                 <default>
                     <key-style
                         latin:styleName="toSymbolKeyStyle"
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyLabel="@string/label_to_symbol_key"
                         latin:parentStyle="functionalKeyStyle" />
                 </default>
             </switch>
             <key-style
                 latin:styleName="settingsKeyStyle"
-                latin:codes="@integer/key_settings"
+                latin:code="@integer/key_settings"
                 latin:keyIcon="@drawable/sym_bkeyboard_settings"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="spaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_bkeyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="tabKeyStyle"
-                latin:codes="@integer/key_tab"
+                latin:code="@integer/key_tab"
                 latin:keyIcon="@drawable/sym_bkeyboard_tab"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
                 latin:parentStyle="functionalKeyStyle" />
             <key-style
                 latin:styleName="micKeyStyle"
-                latin:codes="@integer/key_voice"
+                latin:code="@integer/key_voice"
                 latin:keyIcon="@drawable/sym_bkeyboard_mic"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
                 latin:keyHintIcon="@drawable/hint_popup"
@@ -174,7 +174,7 @@
                  which is laid out as normal letter key. -->
             <key-style
                 latin:styleName="nonSpecialBackgroundTabKeyStyle"
-                latin:codes="@integer/key_tab"
+                latin:code="@integer/key_tab"
                 latin:keyIcon="@drawable/sym_bkeyboard_tab"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
         </case>
@@ -186,7 +186,7 @@
         >
             <key-style
                 latin:styleName="returnKeyStyle"
-                latin:codes="@integer/key_return"
+                latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_go_key"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
@@ -195,7 +195,7 @@
         >
             <key-style
                 latin:styleName="returnKeyStyle"
-                latin:codes="@integer/key_return"
+                latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_next_key"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
@@ -204,7 +204,7 @@
         >
             <key-style
                 latin:styleName="returnKeyStyle"
-                latin:codes="@integer/key_return"
+                latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_done_key"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
@@ -213,7 +213,7 @@
         >
             <key-style
                 latin:styleName="returnKeyStyle"
-                latin:codes="@integer/key_return"
+                latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_send_key"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
@@ -226,7 +226,7 @@
                 >
                     <key-style
                         latin:styleName="returnKeyStyle"
-                        latin:codes="@integer/key_return"
+                        latin:code="@integer/key_return"
                         latin:keyIcon="@drawable/sym_keyboard_search"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_search"
                         latin:parentStyle="functionalKeyStyle" />
@@ -236,7 +236,7 @@
                 >
                     <key-style
                         latin:styleName="returnKeyStyle"
-                        latin:codes="@integer/key_return"
+                        latin:code="@integer/key_return"
                         latin:keyIcon="@drawable/sym_bkeyboard_search"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_search"
                         latin:parentStyle="functionalKeyStyle" />
@@ -250,7 +250,7 @@
                 >
                     <key-style
                         latin:styleName="returnKeyStyle"
-                        latin:codes="@integer/key_return"
+                        latin:code="@integer/key_return"
                         latin:keyIcon="@drawable/sym_keyboard_return"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_return"
                         latin:parentStyle="functionalKeyStyle" />
@@ -260,7 +260,7 @@
                 >
                     <key-style
                         latin:styleName="returnKeyStyle"
-                        latin:codes="@integer/key_return"
+                        latin:code="@integer/key_return"
                         latin:keyIcon="@drawable/sym_bkeyboard_return"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_return"
                         latin:parentStyle="functionalKeyStyle" />
@@ -270,12 +270,12 @@
     </switch>
     <key-style
         latin:styleName="toAlphaKeyStyle"
-        latin:codes="@integer/key_switch_alpha_symbol"
+        latin:code="@integer/key_switch_alpha_symbol"
         latin:keyLabel="@string/label_to_alpha_key"
         latin:parentStyle="functionalKeyStyle" />
     <key-style
         latin:styleName="altKeyStyle"
-        latin:codes="@integer/key_shift"
+        latin:code="@integer/key_shift"
         latin:keyLabel="@string/label_alt_key"
         latin:parentStyle="functionalKeyStyle"
         latin:isSticky="true" />
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index f4a5def..f4fe840 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -37,7 +37,7 @@
         >
             <key-style
                 latin:styleName="numSpaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_keyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
@@ -46,7 +46,7 @@
         >
             <key-style
                 latin:styleName="numSpaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_bkeyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/kbd_numkey_styles.xml
index 006476d..2f9ae32 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/kbd_numkey_styles.xml
@@ -27,60 +27,60 @@
         >
             <key-style
                 latin:styleName="num0KeyStyle"
-                latin:codes="48"
+                latin:code="48"
                 latin:keyIcon="@drawable/sym_keyboard_num0" />
             <key-style
                 latin:styleName="num1KeyStyle"
-                latin:codes="49"
+                latin:code="49"
                 latin:keyIcon="@drawable/sym_keyboard_num1" />
             <key-style
                 latin:styleName="num2KeyStyle"
-                latin:codes="50"
+                latin:code="50"
                 latin:keyIcon="@drawable/sym_keyboard_num2" />
             <key-style
                 latin:styleName="num3KeyStyle"
-                latin:codes="51"
+                latin:code="51"
                 latin:keyIcon="@drawable/sym_keyboard_num3" />
             <key-style
                 latin:styleName="num4KeyStyle"
-                latin:codes="52"
+                latin:code="52"
                 latin:keyIcon="@drawable/sym_keyboard_num4" />
             <key-style
                 latin:styleName="num5KeyStyle"
-                latin:codes="53"
+                latin:code="53"
                 latin:keyIcon="@drawable/sym_keyboard_num5" />
             <key-style
                 latin:styleName="num6KeyStyle"
-                latin:codes="54"
+                latin:code="54"
                 latin:keyIcon="@drawable/sym_keyboard_num6" />
             <key-style
                 latin:styleName="num7KeyStyle"
-                latin:codes="55"
+                latin:code="55"
                 latin:keyIcon="@drawable/sym_keyboard_num7" />
             <key-style
                 latin:styleName="num8KeyStyle"
-                latin:codes="56"
+                latin:code="56"
                 latin:keyIcon="@drawable/sym_keyboard_num8" />
             <key-style
                 latin:styleName="num9KeyStyle"
-                latin:codes="57"
+                latin:code="57"
                 latin:keyIcon="@drawable/sym_keyboard_num9" />
             <key-style
                 latin:styleName="numStarKeyStyle"
-                latin:codes="42"
+                latin:code="42"
                 latin:keyIcon="@drawable/sym_keyboard_numstar" />
             <key-style
                 latin:styleName="numPoundKeyStyle"
-                latin:codes="35"
+                latin:code="35"
                 latin:keyIcon="@drawable/sym_keyboard_numpound" />
             <key-style
                 latin:styleName="numAltKeyStyle"
-                latin:codes="@integer/key_switch_alpha_symbol"
+                latin:code="@integer/key_switch_alpha_symbol"
                 latin:keyIcon="@drawable/sym_keyboard_numalt"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
             <key-style
                 latin:styleName="numSpaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_keyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
@@ -89,60 +89,60 @@
         >
             <key-style
                 latin:styleName="num0KeyStyle"
-                latin:codes="48"
+                latin:code="48"
                 latin:keyIcon="@drawable/sym_bkeyboard_num0" />
             <key-style
                 latin:styleName="num1KeyStyle"
-                latin:codes="49"
+                latin:code="49"
                 latin:keyIcon="@drawable/sym_bkeyboard_num1" />
             <key-style
                 latin:styleName="num2KeyStyle"
-                latin:codes="50"
+                latin:code="50"
                 latin:keyIcon="@drawable/sym_bkeyboard_num2" />
             <key-style
                 latin:styleName="num3KeyStyle"
-                latin:codes="51"
+                latin:code="51"
                 latin:keyIcon="@drawable/sym_bkeyboard_num3" />
             <key-style
                 latin:styleName="num4KeyStyle"
-                latin:codes="52"
+                latin:code="52"
                 latin:keyIcon="@drawable/sym_bkeyboard_num4" />
             <key-style
                 latin:styleName="num5KeyStyle"
-                latin:codes="53"
+                latin:code="53"
                 latin:keyIcon="@drawable/sym_bkeyboard_num5" />
             <key-style
                 latin:styleName="num6KeyStyle"
-                latin:codes="54"
+                latin:code="54"
                 latin:keyIcon="@drawable/sym_bkeyboard_num6" />
             <key-style
                 latin:styleName="num7KeyStyle"
-                latin:codes="55"
+                latin:code="55"
                 latin:keyIcon="@drawable/sym_bkeyboard_num7" />
             <key-style
                 latin:styleName="num8KeyStyle"
-                latin:codes="56"
+                latin:code="56"
                 latin:keyIcon="@drawable/sym_bkeyboard_num8" />
             <key-style
                 latin:styleName="num9KeyStyle"
-                latin:codes="57"
+                latin:code="57"
                 latin:keyIcon="@drawable/sym_bkeyboard_num9" />
             <key-style
                 latin:styleName="numStarKeyStyle"
-                latin:codes="42"
+                latin:code="42"
                 latin:keyIcon="@drawable/sym_bkeyboard_numstar" />
             <key-style
                 latin:styleName="numPoundKeyStyle"
-                latin:codes="35"
+                latin:code="35"
                 latin:keyIcon="@drawable/sym_bkeyboard_numpound" />
             <key-style
                 latin:styleName="numAltKeyStyle"
-                latin:codes="@integer/key_switch_alpha_symbol"
+                latin:code="@integer/key_switch_alpha_symbol"
                 latin:keyIcon="@drawable/sym_bkeyboard_numalt"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
             <key-style
                 latin:styleName="numSpaceKeyStyle"
-                latin:codes="@integer/key_space"
+                latin:code="@integer/key_space"
                 latin:keyIcon="@drawable/sym_bkeyboard_space"
                 latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index 1997a75..67cd330 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -56,7 +56,7 @@
         <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this 
             has changed. -->
         <Key
-            latin:codes="44"
+            latin:code="44"
             latin:keyLabel="Pause" />
         <Key
             latin:keyLabel="," />
@@ -72,7 +72,7 @@
             latin:keyEdgeFlags="left" />
         <!-- Wait is a semicolon. -->
         <Key
-            latin:codes="59"
+            latin:code="59"
             latin:keyLabel="Wait" />
         <Key
             latin:keyStyle="numPoundKeyStyle" />
@@ -85,7 +85,7 @@
         latin:rowEdgeFlags="bottom"
     >
         <Key
-            latin:codes="@integer/key_switch_alpha_symbol"
+            latin:code="@integer/key_switch_alpha_symbol"
             latin:keyLabel="@string/label_to_numeric_key"
             latin:keyEdgeFlags="left" />
         <Key
diff --git a/java/res/xml/kbd_qwerty_black_symbol.xml b/java/res/xml/kbd_qwerty_black_symbol.xml
index fe6b3a6..6e45c12 100644
--- a/java/res/xml/kbd_qwerty_black_symbol.xml
+++ b/java/res/xml/kbd_qwerty_black_symbol.xml
@@ -34,7 +34,7 @@
                     latin:hasVoiceKey="false"
                 >
                     <Key
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
                         latin:keyWidth="20%p"
@@ -43,7 +43,7 @@
                 </case>
                 <default>
                     <Key
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyLabel="@string/label_to_symbol_key"
                         latin:keyWidth="20%p"
                         latin:isModifier="true"
@@ -63,7 +63,7 @@
                     latin:hasVoiceKey="false"
                 >
                     <Key
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
                         latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
                         latin:keyWidth="15%p"
@@ -72,7 +72,7 @@
                 </case>
                 <default>
                     <Key
-                        latin:codes="@integer/key_switch_alpha_symbol"
+                        latin:code="@integer/key_switch_alpha_symbol"
                         latin:keyLabel="@string/label_to_symbol_key"
                         latin:keyWidth="15%p"
                         latin:isModifier="true"