diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 5d8c081..4c1e3b6 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -55,7 +55,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
@@ -98,7 +98,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-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 1ae6984..a3bed2f 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -98,24 +98,27 @@
                     latin:keyEdgeFlags="left" />
                 <Key
                     latin:keyLabel="-"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="+"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="."
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="1"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="43.125%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.172%p"
@@ -124,25 +127,27 @@
             </Row>
             <Row>
                 <Key
-                    latin:keyLabel="*"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="/"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel=","
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="4"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="43.125%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.172%p"
@@ -155,24 +160,27 @@
                      edge key. -->
                 <Key
                     latin:keyLabel="("
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel=")"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="="
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="7"
+                    latin:keyStyle="numKeyStyle"
                     latin:keyXPos="43.125%p" />
                 <Key
-                    latin:keyLabel="8" />
+                    latin:keyLabel="8"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
-                    latin:keyLabel="9" />
+                    latin:keyLabel="9"
+                    latin:keyStyle="numKeyStyle" />
                 <!-- There is an empty area below the "Enter" key and right of the "9" key. To
                      ignore the touch event on the area, "9" is intentionally not marked as a right
                      edge key. -->
@@ -191,14 +199,14 @@
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="24.140%p" />
                 <Key
-                    latin:keyLabel="*"
-                    latin:keyStyle="numLabelStyle"
+                    latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="43.125%p" />
                 <Key
-                    latin:keyLabel="0" />
+                    latin:keyLabel="0"
+                    latin:keyStyle="numKeyStyle" />
                 <Key
                     latin:keyLabel="#"
-                    latin:keyStyle="numLabelStyle" />
+                    latin:keyStyle="numKeyStyle" />
                 <switch>
                     <case
                         latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index 6801ac5..0935992 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -35,12 +35,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="+"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
@@ -62,12 +62,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel=","
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
@@ -87,12 +87,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="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel=")"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -124,7 +124,7 @@
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyLabel="#"
-            latin:keyStyle="numLabelStyle" />
+            latin:keyStyle="numKeyStyle" />
         <switch>
             <case
                 latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone_symbols.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
index 22f78b6..6ee57d6 100644
--- a/java/res/xml-sw768dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml
@@ -35,12 +35,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="+"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:code="44"
@@ -66,12 +66,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel=","
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyXPos="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:code="59"
@@ -95,16 +95,16 @@
              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="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel=")"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="N"
-            latin:keyStyle="numLabelStyle"
+            latin:keyStyle="numKeyStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -136,7 +136,7 @@
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyLabel="#"
-            latin:keyStyle="numLabelStyle" />
+            latin:keyStyle="numKeyStyle" />
         <switch>
             <case
                 latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
index 00eabab..bdef89d 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
@@ -59,7 +59,7 @@
                         <Key
                             latin:keyLabel=":"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="+"
+                            latin:keyHintLabel="+"
                             latin:popupCharacters="+" />
                     </case>
                     <default>
@@ -78,7 +78,7 @@
                         <Key
                             latin:keyLabel="/"
                             latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLetter="\@"
+                            latin:keyHintLabel="\@"
                             latin:popupCharacters="\@" />
                     </default>
                 </switch>
@@ -101,14 +101,14 @@
                 <Key
                     latin:keyLabel="/"
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter=":"
+                    latin:keyHintLabel=":"
                     latin:popupCharacters=":" />
             </case>
             <default>
                 <Key
                     latin:keyLabel="\'"
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="&quot;"
+                    latin:keyHintLabel="&quot;"
                     latin:popupCharacters="&quot;" />
             </default>
         </switch>
@@ -123,7 +123,7 @@
                 <Key
                     latin:keyLabel="-"
                     latin:keyLabelOption="hasUppercaseLetter"
-                    latin:keyHintLetter="_"
+                    latin:keyHintLabel="_"
                     latin:popupCharacters="_" />
             </default>
         </switch>
diff --git a/java/res/xml-sw768dp/kbd_row3_right2.xml b/java/res/xml-sw768dp/kbd_row3_right2.xml
index e90de8e..2545316 100644
--- a/java/res/xml-sw768dp/kbd_row3_right2.xml
+++ b/java/res/xml-sw768dp/kbd_row3_right2.xml
@@ -34,12 +34,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-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/kbd_rows_azerty.xml
index 3bcba00..373bda9 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/kbd_rows_azerty.xml
@@ -134,7 +134,7 @@
         <Key
             latin:keyLabel="\'"
             latin:keyLabelOption="hasUppercaseLetter"
-            latin:keyHintLetter=":"
+            latin:keyHintLabel=":"
             latin:popupCharacters=":" />
         <switch>
             <case
@@ -149,12 +149,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-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
index 8d5f1e6..6567c31 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
@@ -107,12 +107,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>