diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index e8e80ac..dbea4dc 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -37,7 +37,7 @@
         <default>
             <key-style
                 latin:styleName="settingsPopupStyle"
-                latin:keyLabelOption="popupHint"
+                latin:keyLabelOption="hasPopupHint"
                 latin:popupCharacters="\@icon/5|\@integer/key_settings"
                 latin:parentStyle="functionalKeyStyle" />
         </default>
@@ -73,7 +73,7 @@
         latin:styleName="smileyKeyStyle"
         latin:keyLabel=":-)"
         latin:keyOutputText=":-) "
-        latin:keyLabelOption="popupHint"
+        latin:keyLabelOption="hasPopupHint"
         latin:popupCharacters="@string/alternates_for_smiley"
         latin:maxPopupKeyboardColumn="5" />
     <key-style
@@ -116,7 +116,7 @@
     <key-style
         latin:styleName="comKeyStyle"
         latin:keyLabel="@string/keylabel_for_popular_domain"
-        latin:keyLabelOption="fontNormal|popupHint"
+        latin:keyLabelOption="fontNormal|hasPopupHint"
         latin:keyOutputText="@string/keylabel_for_popular_domain"
         latin:popupCharacters="@string/alternates_for_popular_domain" />
     <switch>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 2c7af0a..b3a1010 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -91,24 +91,27 @@
             <Row>
                 <Key
                     latin:keyLabel="-"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="+"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="."
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="1"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="2" />
+                    latin:keyLabel="2"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="3" />
+                    latin:keyLabel="3"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyStyle="deleteKeyStyle"
                     latin:keyXPos="-11.00%p"
@@ -117,25 +120,27 @@
             </Row>
             <Row>
                 <Key
-                    latin:keyLabel="*"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="/"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=","
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="4"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="5" />
+                    latin:keyLabel="5"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="6" />
+                    latin:keyLabel="6"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyStyle="returnKeyStyle"
                     latin:keyXPos="-11.00%p"
@@ -148,24 +153,27 @@
                      edge key. -->
                 <Key
                     latin:keyLabel="("
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=")"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="="
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="7"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="8" />
+                    latin:keyLabel="8"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="9" />
+                    latin:keyLabel="9"
+                    latin:keyStyle="numKeyStyle" />
             </Row>
             <!-- This row is intentionally not marked as a bottom row -->
             <Row>
@@ -180,10 +188,11 @@
                     latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
-                    latin:keyLabel="0" />
+                    latin:keyLabel="0"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyLabel="#"
-                    latin:keyStyle="numLabelStyle" />
+                    latin:keyStyle="numKeyStyle" />
                 <Spacer
                     latin:keyXPos="-11.00%p"
                     latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 4dee882..dd53a20 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -30,12 +30,12 @@
     <Row>
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="+"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
@@ -53,12 +53,12 @@
     <Row>
         <Key
             latin:keyLabel=","
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
@@ -82,12 +82,12 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel=")"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -114,7 +114,7 @@
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyLabel="#"
-            latin:keyStyle="numLabelStyle" />
+            latin:keyStyle="numKeyStyle" />
         <Spacer
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index 87de880..d083ecb 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -30,12 +30,12 @@
     <Row>
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="11.00%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="+"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:code="44"
@@ -57,12 +57,12 @@
     <Row>
         <Key
             latin:keyLabel=","
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="11.00%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:code="59"
@@ -90,15 +90,15 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel=")"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="N"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -124,7 +124,7 @@
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyLabel="#"
-            latin:keyStyle="numLabelStyle" />
+            latin:keyStyle="numKeyStyle" />
         <Spacer
             latin:keyXPos="-11.00%p"
             latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index 0dbc5cf..278db13 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -59,12 +59,12 @@
                 <Key
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="!"
+                    latin:keyHintLabel="!"
                     latin:popupCharacters="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\?"
+                    latin:keyHintLabel="\?"
                     latin:popupCharacters="\?" />
             </default>
         </switch>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 8fd65fe..4f41c17 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -49,7 +49,7 @@
                 <Key
                     latin:keyLabel="/"
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\@"
+                    latin:keyHintLabel="\@"
                     latin:popupCharacters="\@" />
             </default>
         </switch>
@@ -75,7 +75,7 @@
                         <Key
                             latin:keyLabel="/"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter=":"
+                            latin:keyHintLabel=":"
                             latin:popupCharacters=":"
                             latin:keyWidth="9.750%p" />
                     </case>
@@ -83,7 +83,7 @@
                         <Key
                             latin:keyLabel="\?"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="_"
+                            latin:keyHintLabel="_"
                             latin:popupCharacters="_"
                             latin:keyWidth="9.750%p" />
                     </default>
@@ -100,7 +100,7 @@
                         <Key
                             latin:keyLabel="!"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="\'"
+                            latin:keyHintLabel="\'"
                             latin:popupCharacters="\'"
                             latin:keyWidth="9.750%p" />
                     </default>
@@ -122,7 +122,7 @@
                         <Key
                             latin:keyLabel="/"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter=":"
+                            latin:keyHintLabel=":"
                             latin:popupCharacters=":"
                             latin:keyWidth="9.750%p" />
                     </case>
@@ -130,7 +130,7 @@
                         <Key
                             latin:keyLabel="\'"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="&quot;"
+                            latin:keyHintLabel="&quot;"
                             latin:popupCharacters="&quot;"
                             latin:keyWidth="9.750%p" />
                     </default>
@@ -147,7 +147,7 @@
                         <Key
                             latin:keyLabel="-"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="_"
+                            latin:keyHintLabel="_"
                             latin:popupCharacters="_"
                             latin:keyWidth="9.750%p" />
                     </default>
diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml
index a9c5eb3..5e9584f 100644
--- a/java/res/xml-sw600dp/kbd_row3_right.xml
+++ b/java/res/xml-sw600dp/kbd_row3_right.xml
@@ -37,7 +37,7 @@
             <Key
                 latin:keyLabel="-"
                 latin:keyLabelOption="hasUppercaseLetter"
-                latin:keyHintLetter="_"
+                latin:keyHintLabel="_"
                 latin:popupCharacters="_"
                 latin:keyXPos="-8.9%p"
                 latin:keyWidth="fillBoth"
@@ -49,7 +49,7 @@
             <Key
                 latin:keyLabel=":"
                 latin:keyLabelOption="hasUppercaseLetter"
-                latin:keyHintLetter="+"
+                latin:keyHintLabel="+"
                 latin:popupCharacters="+"
                 latin:keyXPos="-8.9%p"
                 latin:keyWidth="fillBoth"
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml
index b53bbbb..7ba716b 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml
@@ -139,12 +139,12 @@
                 <Key
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="!"
+                    latin:keyHintLabel="!"
                     latin:popupCharacters="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\?"
+                    latin:keyHintLabel="\?"
                     latin:popupCharacters="\?" />
             </default>
         </switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
index 7ea9b0f..7f85fe7 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
@@ -104,12 +104,12 @@
                 <Key
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="!"
+                    latin:keyHintLabel="!"
                     latin:popupCharacters="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\?"
+                    latin:keyHintLabel="\?"
                     latin:popupCharacters="\?" />
             </default>
         </switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
index 43fa665..b723247 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_russian.xml
@@ -119,7 +119,7 @@
         <Key
             latin:keyLabel="."
             latin:keyLabelOption="hasUppercaseLetter"
-            latin:keyHintLetter=","
+            latin:keyHintLabel=","
             latin:popupCharacters="," />
         <include
             latin:keyboardLayout="@xml/kbd_row3_right" />
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
index 3666ead..645ef62 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
@@ -147,12 +147,12 @@
                 <Key
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="!"
+                    latin:keyHintLabel="!"
                     latin:popupCharacters="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\?"
+                    latin:keyHintLabel="\?"
                     latin:popupCharacters="\?" />
             </default>
         </switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml
index 80debda..4dfe944 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_serbian.xml
@@ -127,12 +127,12 @@
                 <Key
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="!"
+                    latin:keyHintLabel="!"
                     latin:popupCharacters="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="\?"
+                    latin:keyHintLabel="\?"
                     latin:popupCharacters="\?" />
             </default>
         </switch>