diff --git a/java/res/values-ar/donottranslate-altchars.xml b/java/res/values-ar/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-ar/donottranslate-altchars.xml
rename to java/res/values-ar/donottranslate-more-keys.xml
diff --git a/java/res/values-ca/donottranslate-altchars.xml b/java/res/values-ca/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-ca/donottranslate-altchars.xml
rename to java/res/values-ca/donottranslate-more-keys.xml
diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-cs/donottranslate-altchars.xml
rename to java/res/values-cs/donottranslate-more-keys.xml
diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-da/donottranslate-altchars.xml
rename to java/res/values-da/donottranslate-more-keys.xml
diff --git a/java/res/values-de-rZZ/donottranslate-altchars.xml b/java/res/values-de-rZZ/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-de-rZZ/donottranslate-altchars.xml
rename to java/res/values-de-rZZ/donottranslate-more-keys.xml
diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-de/donottranslate-altchars.xml
rename to java/res/values-de/donottranslate-more-keys.xml
diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-en/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-en/donottranslate-altchars.xml
rename to java/res/values-en/donottranslate-more-keys.xml
diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-es/donottranslate-altchars.xml
rename to java/res/values-es/donottranslate-more-keys.xml
diff --git a/java/res/values-fi/donottranslate-altchars.xml b/java/res/values-fi/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-fi/donottranslate-altchars.xml
rename to java/res/values-fi/donottranslate-more-keys.xml
diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-fr/donottranslate-altchars.xml
rename to java/res/values-fr/donottranslate-more-keys.xml
diff --git a/java/res/values-hr/donottranslate-altchars.xml b/java/res/values-hr/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-hr/donottranslate-altchars.xml
rename to java/res/values-hr/donottranslate-more-keys.xml
diff --git a/java/res/values-hu/donottranslate-altchars.xml b/java/res/values-hu/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-hu/donottranslate-altchars.xml
rename to java/res/values-hu/donottranslate-more-keys.xml
diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-it/donottranslate-altchars.xml
rename to java/res/values-it/donottranslate-more-keys.xml
diff --git a/java/res/values-lt/donottranslate-altchars.xml b/java/res/values-lt/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-lt/donottranslate-altchars.xml
rename to java/res/values-lt/donottranslate-more-keys.xml
diff --git a/java/res/values-lv/donottranslate-altchars.xml b/java/res/values-lv/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-lv/donottranslate-altchars.xml
rename to java/res/values-lv/donottranslate-more-keys.xml
diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-nb/donottranslate-altchars.xml
rename to java/res/values-nb/donottranslate-more-keys.xml
diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-nl/donottranslate-altchars.xml
rename to java/res/values-nl/donottranslate-more-keys.xml
diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-pl/donottranslate-altchars.xml
rename to java/res/values-pl/donottranslate-more-keys.xml
diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-pt/donottranslate-altchars.xml
rename to java/res/values-pt/donottranslate-more-keys.xml
diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-rm/donottranslate-altchars.xml
rename to java/res/values-rm/donottranslate-more-keys.xml
diff --git a/java/res/values-ro/donottranslate-altchars.xml b/java/res/values-ro/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-ro/donottranslate-altchars.xml
rename to java/res/values-ro/donottranslate-more-keys.xml
diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-ru/donottranslate-altchars.xml
rename to java/res/values-ru/donottranslate-more-keys.xml
diff --git a/java/res/values-sk/donottranslate-altchars.xml b/java/res/values-sk/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-sk/donottranslate-altchars.xml
rename to java/res/values-sk/donottranslate-more-keys.xml
diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-sv/donottranslate-altchars.xml
rename to java/res/values-sv/donottranslate-more-keys.xml
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index 17aeff7..1854a86 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -25,7 +25,7 @@
     <bool name="config_enable_show_popup_on_keypress_option">false</bool>
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <bool name="config_sliding_key_input_enabled">false</bool>
-    <bool name="config_digit_popup_characters_enabled">false</bool>
+    <bool name="config_digit_more_keys_enabled">false</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_default_sound_enabled">true</bool>
@@ -39,5 +39,5 @@
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
-    <integer name="config_max_mini_keyboard_column">5</integer>
+    <integer name="config_max_more_keys_column">5</integer>
 </resources>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index 8b4ff36..a438fe9 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -25,7 +25,7 @@
     <bool name="config_enable_show_popup_on_keypress_option">false</bool>
     <bool name="config_enable_bigram_suggestions_option">false</bool>
     <bool name="config_sliding_key_input_enabled">false</bool>
-    <bool name="config_digit_popup_characters_enabled">false</bool>
+    <bool name="config_digit_more_keys_enabled">false</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_default_sound_enabled">true</bool>
@@ -37,7 +37,7 @@
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">medium</string>
-    <integer name="config_max_mini_keyboard_column">5</integer>
+    <integer name="config_max_more_keys_column">5</integer>
     <!--  Screen metrics for logging. 0 = "mdpi", 1 = "hdpi", 2 = "xlarge" -->
     <integer name="log_screen_metrics">2</integer>
 </resources>
diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values-tr/donottranslate-altchars.xml
rename to java/res/values-tr/donottranslate-more-keys.xml
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 734004f..fdeca25 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -95,8 +95,8 @@
         <!-- Amount to offset the touch Y coordinate by, for bias correction. -->
         <attr name="verticalCorrection" format="dimension" />
 
-        <!-- Layout resource for popup panel -->
-        <attr name="popupLayout" format="reference" />
+        <!-- Layout resource for more keys panel -->
+        <attr name="moreKeysLayout" format="reference" />
 
         <attr name="shadowColor" format="color" />
         <attr name="shadowRadius" format="float" />
@@ -153,8 +153,8 @@
         <attr name="horizontalGap" format="dimension|fraction" />
         <!-- Default vertical gap between rows of keys. -->
         <attr name="verticalGap" format="dimension|fraction" />
-        <!-- Popup panel layout template -->
-        <attr name="popupTemplate" format="reference" />
+        <!-- More keys keyboard layout template -->
+        <attr name="moreKeysTemplate" format="reference" />
         <!-- Locale of the keyboard layout -->
         <attr name="keyboardLocale" format="string" />
         <!-- True if the keyboard is Right-To-Left -->
@@ -178,10 +178,10 @@
     <declare-styleable name="Keyboard_Key">
         <!-- The unicode value that this key outputs. -->
         <attr name="code" format="integer" />
-        <!-- The characters to display in the popup keyboard. -->
-        <attr name="popupCharacters" format="string" />
-        <!-- Maximum column of mini keyboard -->
-        <attr name="maxMiniKeyboardColumn" format="integer" />
+        <!-- The keys to display in the more keys keyboard. -->
+        <attr name="moreKeys" format="string" />
+        <!-- Maximum column of more keys keyboard -->
+        <attr name="maxMoreKeysColumn" format="integer" />
         <!-- Whether this is a functional key which has different key top than normal key. -->
         <attr name="isFunctional" format="boolean" />
         <!-- Whether this is a toggle key. -->
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 28cbc95..923e37d 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -27,7 +27,7 @@
     <bool name="config_enable_bigram_suggestions_option">true</bool>
     <bool name="config_enable_usability_study_mode_option">false</bool>
     <bool name="config_sliding_key_input_enabled">true</bool>
-    <bool name="config_digit_popup_characters_enabled">true</bool>
+    <bool name="config_digit_more_keys_enabled">true</bool>
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">true</bool>
     <!-- Default value for bigram suggestion: while showing candidates for a word should we weigh
@@ -67,7 +67,7 @@
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
     <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
-    <integer name="config_max_mini_keyboard_column">5</integer>
+    <integer name="config_max_more_keys_column">5</integer>
     <string-array name="auto_correction_threshold_values" translatable="false">
         <!-- Off, When auto correction setting is Off, this value is not used. -->
         <item></item>
diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-more-keys.xml
similarity index 100%
rename from java/res/values/donottranslate-altchars.xml
rename to java/res/values/donottranslate-more-keys.xml
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index eb5b749..ddc0634 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -21,12 +21,12 @@
         <item name="keyboardHeight">@dimen/keyboardHeight</item>
         <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
         <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
-        <item name="popupTemplate">@xml/kbd_mini_keyboard_template</item>
+        <item name="moreKeysTemplate">@xml/kbd_mini_keyboard_template</item>
         <item name="keyboardTopPadding">@fraction/keyboard_top_padding</item>
         <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding</item>
         <item name="horizontalGap">@fraction/key_horizontal_gap</item>
         <item name="verticalGap">@fraction/key_bottom_gap</item>
-        <item name="maxMiniKeyboardColumn">@integer/config_max_mini_keyboard_column</item>
+        <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>
     </style>
     <style name="LatinKeyboard">
         <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled
@@ -61,7 +61,7 @@
         <item name="keyPreviewOffset">@dimen/key_preview_offset</item>
         <item name="keyPreviewHeight">@dimen/key_preview_height</item>
         <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
-        <item name="popupLayout">@layout/mini_keyboard</item>
+        <item name="moreKeysLayout">@layout/mini_keyboard</item>
         <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
         <item name="shadowColor">#BB000000</item>
         <item name="shadowRadius">2.75</item>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index 43b6623..d94c3fa 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -38,7 +38,7 @@
             <key-style
                 latin:styleName="f2PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="\@icon/3|\@integer/key_settings"
+                latin:moreKeys="\@icon/3|\@integer/key_settings"
                 latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>
@@ -72,8 +72,8 @@
         latin:keyLabel=":-)"
         latin:keyOutputText=":-) "
         latin:keyLabelOption="hasPopupHint"
-        latin:popupCharacters="@string/alternates_for_smiley"
-        latin:maxMiniKeyboardColumn="5" />
+        latin:moreKeys="@string/alternates_for_smiley"
+        latin:maxMoreKeysColumn="5" />
     <key-style
         latin:styleName="shortcutKeyStyle"
         latin:code="@integer/key_shortcut"
@@ -117,5 +117,5 @@
         latin:keyLabel="@string/keylabel_for_popular_domain"
         latin:keyLabelOption="fontNormal|hasPopupHint"
         latin:keyOutputText="@string/keylabel_for_popular_domain"
-        latin:popupCharacters="@string/alternates_for_popular_domain" />
+        latin:moreKeys="@string/alternates_for_popular_domain" />
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
index c7dfcc8..1756d83 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
@@ -26,34 +26,34 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
index 78004fe..d403db1 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row2.xml
@@ -26,29 +26,29 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a"
+            latin:moreKeys="@string/alternates_for_a"
             latin:keyXPos="4.5%p" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-14.6%p"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index 456f3c8..04f39ed 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -29,20 +29,20 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <include
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 4c978cb..ef02922 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -47,7 +47,7 @@
                     latin:keyLabel="/"
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\@"
-                    latin:popupCharacters="\@" />
+                    latin:moreKeys="\@" />
             </default>
         </switch>
         <Key
diff --git a/java/res/xml-sw600dp/kbd_row3_comma_period.xml b/java/res/xml-sw600dp/kbd_row3_comma_period.xml
index 2545316..b844430 100644
--- a/java/res/xml-sw600dp/kbd_row3_comma_period.xml
+++ b/java/res/xml-sw600dp/kbd_row3_comma_period.xml
@@ -35,12 +35,12 @@
                 latin:keyLabel=","
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="!"
-                latin:popupCharacters="!" />
+                latin:moreKeys="!" />
             <Key
                 latin:keyLabel="."
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="\?"
-                latin:popupCharacters="\?" />
+                latin:moreKeys="\?" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/kbd_row3_smiley.xml
index 0ae3ae4..f9b647c 100644
--- a/java/res/xml-sw600dp/kbd_row3_smiley.xml
+++ b/java/res/xml-sw600dp/kbd_row3_smiley.xml
@@ -37,7 +37,7 @@
                 latin:keyLabel="-"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="_"
-                latin:popupCharacters="_"
+                latin:moreKeys="_"
                 latin:keyXPos="-8.9%p"
                 latin:keyWidth="fillBoth" />
         </case>
@@ -48,7 +48,7 @@
                 latin:keyLabel=":"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="+"
-                latin:popupCharacters="+"
+                latin:moreKeys="+"
                 latin:keyXPos="-8.9%p"
                 latin:keyWidth="fillBoth" />
         </case>
diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
index 50d4d4b..637201f 100644
--- a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
+++ b/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
@@ -35,14 +35,14 @@
                 latin:keyLabel="/"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel=":"
-                latin:popupCharacters=":" />
+                latin:moreKeys=":" />
         </case>
         <default>
             <Key
                 latin:keyLabel="@string/keylabel_for_apostrophe"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="@string/keyhintlabel_for_apostrophe"
-                latin:popupCharacters="@string/alternates_for_apostrophe" />
+                latin:moreKeys="@string/alternates_for_apostrophe" />
         </default>
     </switch>
     <switch>
@@ -57,7 +57,7 @@
                 latin:keyLabel="@string/keylabel_for_dash"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="@string/keyhintlabel_for_dash"
-                latin:popupCharacters="@string/alternates_for_dash" />
+                latin:moreKeys="@string/alternates_for_dash" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml
index 4c20f51..275df50 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml
@@ -36,7 +36,7 @@
             latin:keyLabel="ق" />
         <Key
             latin:keyLabel="ف"
-            latin:popupCharacters="ڤ" />
+            latin:moreKeys="ڤ" />
         <Key
             latin:keyLabel="غ" />
         <Key
@@ -45,14 +45,14 @@
              \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL -->
         <Key
             latin:keyLabel="ه"
-            latin:popupCharacters="\ufeeb|\u0647\u0640" />
+            latin:moreKeys="\ufeeb|\u0647\u0640" />
         <Key
             latin:keyLabel="خ" />
         <Key
             latin:keyLabel="ح" />
         <Key
             latin:keyLabel="ج"
-            latin:popupCharacters="چ" />
+            latin:moreKeys="چ" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -70,7 +70,7 @@
             latin:keyLabel="ي" />
         <Key
             latin:keyLabel="ب"
-            latin:popupCharacters="پ" />
+            latin:moreKeys="پ" />
         <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
              \u0644: ARABIC LETTER LAM
              \u0627: ARABIC LETTER ALEF
@@ -82,13 +82,13 @@
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ل"
-            latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+            latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
         <!-- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
              \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ا"
-            latin:popupCharacters="\u0623,\u0625,\u0622" />
+            latin:moreKeys="\u0623,\u0625,\u0622" />
         <Key
             latin:keyLabel="ت" />
         <Key
@@ -97,7 +97,7 @@
             latin:keyLabel="م" />
         <Key
             latin:keyLabel="ك"
-            latin:popupCharacters="گ" />
+            latin:moreKeys="گ" />
         <Key
             latin:keyLabel="ط" />
         <Key
@@ -123,7 +123,7 @@
                     latin:keyLabel="-"
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="_"
-                    latin:popupCharacters="_" />
+                    latin:moreKeys="_" />
             </case>
             <case
                 latin:imeAction="actionSearch"
@@ -132,7 +132,7 @@
                     latin:keyLabel=":"
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="+"
-                    latin:popupCharacters="+" />
+                    latin:moreKeys="+" />
             </case>
             <default>
                 <Key
@@ -157,7 +157,7 @@
             latin:keyLabel="و" />
         <Key
             latin:keyLabel="ز"
-            latin:popupCharacters="ژ" />
+            latin:moreKeys="ژ" />
         <Key
             latin:keyLabel="ظ" />
         <Key
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml
index 406b4e6..fbe8248 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml
@@ -28,34 +28,34 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -66,29 +66,29 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q"
+            latin:moreKeys="@string/alternates_for_q"
             latin:keyXPos="5.0%p" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="m" />
         <Key
@@ -104,20 +104,20 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="\'" />
         <switch>
@@ -134,12 +134,12 @@
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="!"
-                    latin:popupCharacters="!" />
+                    latin:moreKeys="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\?"
-                    latin:popupCharacters="\?" />
+                    latin:moreKeys="\?" />
             </default>
         </switch>
         <include
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
index fc2247c..a8adbd3 100644
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw600dp/kbd_rows_hebrew.xml
@@ -59,17 +59,17 @@
             latin:keyLabel="ד" />
         <Key
             latin:keyLabel="ג"
-            latin:popupCharacters="ג׳" />
+            latin:moreKeys="ג׳" />
         <Key
             latin:keyLabel="כ" />
         <Key
             latin:keyLabel="ע" />
         <Key
             latin:keyLabel="י"
-            latin:popupCharacters="ײַ" />
+            latin:moreKeys="ײַ" />
         <Key
             latin:keyLabel="ח"
-            latin:popupCharacters="ח׳" />
+            latin:moreKeys="ח׳" />
         <Key
             latin:keyLabel="ל" />
         <Key
@@ -96,7 +96,7 @@
                     latin:keyLabel="-"
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="_"
-                    latin:popupCharacters="_"
+                    latin:moreKeys="_"
                     latin:keyWidth="10.0%p" />
             </case>
             <case
@@ -106,7 +106,7 @@
                     latin:keyLabel=":"
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="+"
-                    latin:popupCharacters="+"
+                    latin:moreKeys="+"
                     latin:keyWidth="10.0%p" />
             </case>
             <default>
@@ -117,7 +117,7 @@
         </switch>
         <Key
             latin:keyLabel="ז"
-            latin:popupCharacters="ז׳" />
+            latin:moreKeys="ז׳" />
         <Key
             latin:keyLabel="ס" />
         <Key
@@ -130,13 +130,13 @@
             latin:keyLabel="מ" />
         <Key
             latin:keyLabel="צ"
-            latin:popupCharacters="צ׳" />
+            latin:moreKeys="צ׳" />
         <Key
             latin:keyLabel="ת"
-            latin:popupCharacters="ת׳" />
+            latin:moreKeys="ת׳" />
         <Key
             latin:keyLabel="ץ"
-            latin:popupCharacters="ץ׳" />
+            latin:moreKeys="ץ׳" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
index 3d177e7..75fe8b5 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
@@ -28,34 +28,34 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -71,20 +71,20 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <switch>
@@ -101,12 +101,12 @@
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="!"
-                    latin:popupCharacters="!" />
+                    latin:moreKeys="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\?"
-                    latin:popupCharacters="\?" />
+                    latin:moreKeys="\?" />
             </default>
         </switch>
         <include
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
index 2f4b95e..5d36ebc 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_russian.xml
@@ -36,7 +36,7 @@
             latin:keyLabel="к" />
         <Key
             latin:keyLabel="е"
-            latin:popupCharacters="@string/alternates_for_cyrillic_e" />
+            latin:moreKeys="@string/alternates_for_cyrillic_e" />
         <Key
             latin:keyLabel="н" />
         <Key
@@ -124,12 +124,12 @@
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="!"
-                    latin:popupCharacters="!" />
+                    latin:moreKeys="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\?"
-                    latin:popupCharacters="\?" />
+                    latin:moreKeys="\?" />
             </default>
         </switch>
         <include
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
index 5059137..9c768df 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
@@ -28,34 +28,34 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyLabel="å" />
         <Key
@@ -69,34 +69,34 @@
         <Key
             latin:keyLabel="a"
             latin:keyXPos="3.5%p"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_10"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_10" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_11" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -112,20 +112,20 @@
             latin:keyWidth="4.35%p" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <include
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/kbd_rows_spanish.xml
index 49243eb..805b963 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/kbd_rows_spanish.xml
@@ -30,29 +30,29 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a"
+            latin:moreKeys="@string/alternates_for_a"
             latin:keyXPos="5.0%p" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="ñ" />
         <Key
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml
index 420e46c..f67f8a8 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml
@@ -30,34 +30,34 @@
     >
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_1"
-            latin:popupCharacters="@string/alternates_for_symbols_1" />
+            latin:moreKeys="@string/alternates_for_symbols_1" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_2"
-            latin:popupCharacters="@string/alternates_for_symbols_2" />
+            latin:moreKeys="@string/alternates_for_symbols_2" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_3"
-            latin:popupCharacters="@string/alternates_for_symbols_3" />
+            latin:moreKeys="@string/alternates_for_symbols_3" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_4"
-            latin:popupCharacters="@string/alternates_for_symbols_4" />
+            latin:moreKeys="@string/alternates_for_symbols_4" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_5"
-            latin:popupCharacters="@string/alternates_for_symbols_5" />
+            latin:moreKeys="@string/alternates_for_symbols_5" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_6"
-            latin:popupCharacters="@string/alternates_for_symbols_6" />
+            latin:moreKeys="@string/alternates_for_symbols_6" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_7"
-            latin:popupCharacters="@string/alternates_for_symbols_7" />
+            latin:moreKeys="@string/alternates_for_symbols_7" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_8"
-            latin:popupCharacters="@string/alternates_for_symbols_8" />
+            latin:moreKeys="@string/alternates_for_symbols_8" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_9"
-            latin:popupCharacters="@string/alternates_for_symbols_9" />
+            latin:moreKeys="@string/alternates_for_symbols_9" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_0"
-            latin:popupCharacters="@string/alternates_for_symbols_0" />
+            latin:moreKeys="@string/alternates_for_symbols_0" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -73,24 +73,24 @@
             latin:keyStyle="currencyKeyStyle" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_percent"
-            latin:popupCharacters="@string/alternates_for_symbols_percent" />
+            latin:moreKeys="@string/alternates_for_symbols_percent" />
         <Key
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:popupCharacters="†,‡,★" />
+            latin:moreKeys="†,‡,★" />
         <Key
             latin:keyLabel="-"
-            latin:popupCharacters="_,–,—" />
+            latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:popupCharacters="±" />
+            latin:moreKeys="±" />
         <Key
             latin:keyLabel="("
-            latin:popupCharacters="[,{,&lt;" />
+            latin:moreKeys="[,{,&lt;" />
         <Key
             latin:keyLabel=")"
-            latin:popupCharacters="],},&gt;" />
+            latin:moreKeys="],},&gt;" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -104,20 +104,20 @@
             latin:keyWidth="10.0%p" />
         <Key
             latin:keyLabel="&lt;"
-            latin:popupCharacters="≤,«,‹" />
+            latin:moreKeys="≤,«,‹" />
         <Key
             latin:keyLabel="&gt;"
-            latin:popupCharacters="≥,»,›" />
+            latin:moreKeys="≥,»,›" />
         <Key
             latin:keyLabel="="
-            latin:popupCharacters="≠,≈" />
+            latin:moreKeys="≠,≈" />
         <switch>
             <case
                 latin:mode="url"
             >
                 <Key
                     latin:keyLabel="\'"
-                    latin:popupCharacters="‘,’,‚,‛" />
+                    latin:moreKeys="‘,’,‚,‛" />
             </case>
             <default>
                 <Key
@@ -126,18 +126,18 @@
         </switch>
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_semicolon"
-            latin:popupCharacters="@string/alternates_for_symbols_semicolon" />
+            latin:moreKeys="@string/alternates_for_symbols_semicolon" />
         <Key
             latin:keyLabel="@string/keylabel_for_comma"
-            latin:popupCharacters="@string/alternates_for_comma" />
+            latin:moreKeys="@string/alternates_for_comma" />
         <Key
             latin:keyLabel="." />
         <Key
             latin:keyLabel="!"
-            latin:popupCharacters="¡" />
+            latin:moreKeys="¡" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_question"
-            latin:popupCharacters="@string/alternates_for_symbols_question" />
+            latin:moreKeys="@string/alternates_for_symbols_question" />
         <Key
             latin:keyLabel="/"
             latin:keyWidth="fillRight" />
@@ -157,10 +157,10 @@
             latin:keyXPos="30.750%p"
             latin:keyWidth="39.750%p" />
         <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
-        <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
+        <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
         <Key
             latin:keyLabel="&quot;"
-            latin:popupCharacters="“,”,«,»,‘,’,‚,‛" />
+            latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
         <Key
             latin:keyLabel="_" />
         <Spacer
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
index c5143d9..3d62eff 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
@@ -34,19 +34,19 @@
             latin:keyLabel="|" />
         <Key
             latin:keyLabel="•"
-            latin:popupCharacters="♪,♥,♠,♦,♣" />
+            latin:moreKeys="♪,♥,♠,♦,♣" />
         <Key
             latin:keyLabel="√" />
         <Key
             latin:keyLabel="π"
-            latin:popupCharacters="Π" />
+            latin:moreKeys="Π" />
         <Key
             latin:keyLabel="÷" />
         <Key
             latin:keyLabel="×" />
         <Key
             latin:keyLabel="§"
-            latin:popupCharacters="¶" />
+            latin:moreKeys="¶" />
         <Key
             latin:keyLabel="Δ" />
         <Key
@@ -68,13 +68,13 @@
             latin:keyLabel="¥" />
         <Key
             latin:keyLabel="^"
-            latin:popupCharacters="↑,↓,←,→" />
+            latin:moreKeys="↑,↓,←,→" />
         <Key
             latin:keyLabel="°"
-            latin:popupCharacters="′,″" />
+            latin:moreKeys="′,″" />
         <Key
             latin:keyLabel="±"
-            latin:popupCharacters="∞" />
+            latin:moreKeys="∞" />
         <Key
             latin:keyLabel="{" />
         <Key
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 52ee91a..ffab1aa 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -54,8 +54,8 @@
         latin:keyLabel=":-)"
         latin:keyOutputText=":-) "
         latin:keyLabelOption="hasPopupHint"
-        latin:popupCharacters="@string/alternates_for_smiley"
-        latin:maxMiniKeyboardColumn="5" />
+        latin:moreKeys="@string/alternates_for_smiley"
+        latin:maxMoreKeysColumn="5" />
     <key-style
         latin:styleName="settingsKeyStyle"
         latin:code="@integer/key_settings"
@@ -103,5 +103,5 @@
         latin:keyLabel="@string/keylabel_for_popular_domain"
         latin:keyLabelOption="fontNormal|hasPopupHint"
         latin:keyOutputText="@string/keylabel_for_popular_domain"
-        latin:popupCharacters="@string/alternates_for_popular_domain" />
+        latin:moreKeys="@string/alternates_for_popular_domain" />
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/kbd_qwerty_row1.xml
index 0fdb463..b9dc957 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row1.xml
@@ -30,34 +30,34 @@
             latin:keyWidth="7.969%p" />
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/kbd_qwerty_row2.xml
index 7f7dd57..eb5ab70 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row2.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row2.xml
@@ -30,28 +30,28 @@
             latin:keyWidth="11.172%p"/>
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-15.704%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/kbd_qwerty_row3.xml
index 677235f..668cc1f 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row3.xml
@@ -29,20 +29,20 @@
             latin:keyWidth="13.829%p"/>
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <include
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
index 1ff9d81..9346111 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
@@ -59,7 +59,7 @@
                             latin:keyLabel=":"
                             latin:keyLabelOption="hasUppercaseLetter"
                             latin:keyHintLabel="+"
-                            latin:popupCharacters="+" />
+                            latin:moreKeys="+" />
                     </case>
                     <default>
                         <Key
@@ -78,7 +78,7 @@
                             latin:keyLabel="/"
                             latin:keyLabelOption="hasUppercaseLetter"
                             latin:keyHintLabel="\@"
-                            latin:popupCharacters="\@" />
+                            latin:moreKeys="\@" />
                     </default>
                 </switch>
             </default>
diff --git a/java/res/xml-sw768dp/kbd_row3_comma_period.xml b/java/res/xml-sw768dp/kbd_row3_comma_period.xml
index 2545316..b844430 100644
--- a/java/res/xml-sw768dp/kbd_row3_comma_period.xml
+++ b/java/res/xml-sw768dp/kbd_row3_comma_period.xml
@@ -35,12 +35,12 @@
                 latin:keyLabel=","
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="!"
-                latin:popupCharacters="!" />
+                latin:moreKeys="!" />
             <Key
                 latin:keyLabel="."
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="\?"
-                latin:popupCharacters="\?" />
+                latin:moreKeys="\?" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
index 50d4d4b..637201f 100644
--- a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
+++ b/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
@@ -35,14 +35,14 @@
                 latin:keyLabel="/"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel=":"
-                latin:popupCharacters=":" />
+                latin:moreKeys=":" />
         </case>
         <default>
             <Key
                 latin:keyLabel="@string/keylabel_for_apostrophe"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="@string/keyhintlabel_for_apostrophe"
-                latin:popupCharacters="@string/alternates_for_apostrophe" />
+                latin:moreKeys="@string/alternates_for_apostrophe" />
         </default>
     </switch>
     <switch>
@@ -57,7 +57,7 @@
                 latin:keyLabel="@string/keylabel_for_dash"
                 latin:keyLabelOption="hasUppercaseLetter"
                 latin:keyHintLabel="@string/keyhintlabel_for_dash"
-                latin:popupCharacters="@string/alternates_for_dash" />
+                latin:moreKeys="@string/alternates_for_dash" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/kbd_rows_arabic.xml
index 2f10d54..984ba50 100644
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw768dp/kbd_rows_arabic.xml
@@ -40,7 +40,7 @@
             latin:keyLabel="ق" />
         <Key
             latin:keyLabel="ف"
-            latin:popupCharacters="ڤ" />
+            latin:moreKeys="ڤ" />
         <Key
             latin:keyLabel="غ" />
         <Key
@@ -49,14 +49,14 @@
              \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL -->
         <Key
             latin:keyLabel="ه"
-            latin:popupCharacters="\ufeeb|\u0647\u0640" />
+            latin:moreKeys="\ufeeb|\u0647\u0640" />
         <Key
             latin:keyLabel="خ" />
         <Key
             latin:keyLabel="ح" />
         <Key
             latin:keyLabel="ج"
-            latin:popupCharacters="چ" />
+            latin:moreKeys="چ" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.500%p"
@@ -77,7 +77,7 @@
             latin:keyLabel="ي" />
         <Key
             latin:keyLabel="ب"
-            latin:popupCharacters="پ" />
+            latin:moreKeys="پ" />
         <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
              \u0644: ARABIC LETTER LAM
              \u0627: ARABIC LETTER ALEF
@@ -89,13 +89,13 @@
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ل"
-            latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+            latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
         <!-- \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
              \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ا"
-            latin:popupCharacters="\u0623,\u0625,\u0622" />
+            latin:moreKeys="\u0623,\u0625,\u0622" />
         <Key
             latin:keyLabel="ت" />
         <Key
@@ -104,7 +104,7 @@
             latin:keyLabel="م" />
         <Key
             latin:keyLabel="ك"
-            latin:popupCharacters="گ" />
+            latin:moreKeys="گ" />
         <Key
             latin:keyLabel="ط" />
         <Key
@@ -134,7 +134,7 @@
             latin:keyLabel="و" />
         <Key
             latin:keyLabel="ز"
-            latin:popupCharacters="ژ" />
+            latin:moreKeys="ژ" />
         <Key
             latin:keyLabel="ظ" />
         <Key
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/kbd_rows_azerty.xml
index 7aec0d1..b37c22c 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/kbd_rows_azerty.xml
@@ -32,34 +32,34 @@
             latin:keyWidth="7.969%p" />
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -74,28 +74,28 @@
             latin:keyWidth="10.167%p" />
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="m" />
         <Key
@@ -111,25 +111,25 @@
             latin:keyWidth="13.829%p" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="\'"
             latin:keyLabelOption="hasUppercaseLetter"
             latin:keyHintLabel=":"
-            latin:popupCharacters=":" />
+            latin:moreKeys=":" />
         <switch>
             <case
                 latin:mode="email"
@@ -144,12 +144,12 @@
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="!"
-                    latin:popupCharacters="!" />
+                    latin:moreKeys="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\?"
-                    latin:popupCharacters="\?" />
+                    latin:moreKeys="\?" />
             </default>
         </switch>
         <Key
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/kbd_rows_hebrew.xml
index bacc6a1..27b39d1 100644
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw768dp/kbd_rows_hebrew.xml
@@ -66,17 +66,17 @@
             latin:keyLabel="ד" />
         <Key
             latin:keyLabel="ג"
-            latin:popupCharacters="ג׳" />
+            latin:moreKeys="ג׳" />
         <Key
             latin:keyLabel="כ" />
         <Key
             latin:keyLabel="ע" />
         <Key
             latin:keyLabel="י"
-            latin:popupCharacters="ײַ" />
+            latin:moreKeys="ײַ" />
         <Key
             latin:keyLabel="ח"
-            latin:popupCharacters="ח׳" />
+            latin:moreKeys="ח׳" />
         <Key
             latin:keyLabel="ל" />
         <Key
@@ -89,7 +89,7 @@
     >
         <Key
             latin:keyLabel="ז"
-            latin:popupCharacters="ז׳"
+            latin:moreKeys="ז׳"
             latin:keyXPos="13.829%p" />
         <Key
             latin:keyLabel="ס" />
@@ -103,13 +103,13 @@
             latin:keyLabel="מ" />
         <Key
             latin:keyLabel="צ"
-            latin:popupCharacters="צ׳" />
+            latin:moreKeys="צ׳" />
         <Key
             latin:keyLabel="ת"
-            latin:popupCharacters="ת׳" />
+            latin:moreKeys="ת׳" />
         <Key
             latin:keyLabel="ץ"
-            latin:popupCharacters="ץ׳" />
+            latin:moreKeys="ץ׳" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-10.400%p"
diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
index 5556d1f..38dd209 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
@@ -32,34 +32,34 @@
             latin:keyWidth="7.969%p" />
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -75,20 +75,20 @@
             latin:keyWidth="13.829%p" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <switch>
@@ -105,12 +105,12 @@
                     latin:keyLabel=","
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="!"
-                    latin:popupCharacters="!" />
+                    latin:moreKeys="!" />
                 <Key
                     latin:keyLabel="."
                     latin:keyLabelOption="hasUppercaseLetter"
                     latin:keyHintLabel="\?"
-                    latin:popupCharacters="\?" />
+                    latin:moreKeys="\?" />
             </default>
         </switch>
         <Key
diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-sw768dp/kbd_rows_russian.xml
index 82ceaea..1b2cbe7 100644
--- a/java/res/xml-sw768dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_russian.xml
@@ -39,7 +39,7 @@
             latin:keyLabel="к" />
         <Key
             latin:keyLabel="е"
-            latin:popupCharacters="@string/alternates_for_cyrillic_e" />
+            latin:moreKeys="@string/alternates_for_cyrillic_e" />
         <Key
             latin:keyLabel="н" />
         <Key
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
index 743c6bd..fa3a09a 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
@@ -32,34 +32,34 @@
             latin:keyWidth="7.500%p" />
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyLabel="å" />
         <Key
@@ -76,34 +76,34 @@
             latin:keyWidth="9.375%p" />
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_10"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_10" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_11" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -117,20 +117,20 @@
             latin:keyWidth="12.750%p" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <include
diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-sw768dp/kbd_rows_spanish.xml
index 510cafb..0f34232 100644
--- a/java/res/xml-sw768dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw768dp/kbd_rows_spanish.xml
@@ -34,28 +34,28 @@
             latin:keyWidth="10.167%p" />
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="ñ" />
         <Key
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/kbd_rows_symbols.xml
index 66b9789..3b599b9 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_rows_symbols.xml
@@ -34,34 +34,34 @@
             latin:keyWidth="7.969%p" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_1"
-            latin:popupCharacters="@string/alternates_for_symbols_1" />
+            latin:moreKeys="@string/alternates_for_symbols_1" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_2"
-            latin:popupCharacters="@string/alternates_for_symbols_2" />
+            latin:moreKeys="@string/alternates_for_symbols_2" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_3"
-            latin:popupCharacters="@string/alternates_for_symbols_3" />
+            latin:moreKeys="@string/alternates_for_symbols_3" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_4"
-            latin:popupCharacters="@string/alternates_for_symbols_4" />
+            latin:moreKeys="@string/alternates_for_symbols_4" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_5"
-            latin:popupCharacters="@string/alternates_for_symbols_5" />
+            latin:moreKeys="@string/alternates_for_symbols_5" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_6"
-            latin:popupCharacters="@string/alternates_for_symbols_6" />
+            latin:moreKeys="@string/alternates_for_symbols_6" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_7"
-            latin:popupCharacters="@string/alternates_for_symbols_7" />
+            latin:moreKeys="@string/alternates_for_symbols_7" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_8"
-            latin:popupCharacters="@string/alternates_for_symbols_8" />
+            latin:moreKeys="@string/alternates_for_symbols_8" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_9"
-            latin:popupCharacters="@string/alternates_for_symbols_9" />
+            latin:moreKeys="@string/alternates_for_symbols_9" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_0"
-            latin:popupCharacters="@string/alternates_for_symbols_0" />
+            latin:moreKeys="@string/alternates_for_symbols_0" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-9.219%p"
@@ -80,24 +80,24 @@
             latin:keyStyle="currencyKeyStyle" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_percent"
-            latin:popupCharacters="@string/alternates_for_symbols_percent" />
+            latin:moreKeys="@string/alternates_for_symbols_percent" />
         <Key
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:popupCharacters="†,‡,★" />
+            latin:moreKeys="†,‡,★" />
         <Key
             latin:keyLabel="-"
-            latin:popupCharacters="_,–,—" />
+            latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:popupCharacters="±" />
+            latin:moreKeys="±" />
         <Key
             latin:keyLabel="("
-            latin:popupCharacters="[,{,&lt;" />
+            latin:moreKeys="[,{,&lt;" />
         <Key
             latin:keyLabel=")"
-            latin:popupCharacters="],},&gt;" />
+            latin:moreKeys="],},&gt;" />
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-15.704%p"
@@ -111,20 +111,20 @@
             latin:keyWidth="13.829%p" />
         <Key
             latin:keyLabel="&lt;"
-            latin:popupCharacters="≤,«,‹" />
+            latin:moreKeys="≤,«,‹" />
         <Key
             latin:keyLabel="&gt;"
-            latin:popupCharacters="≥,»,›" />
+            latin:moreKeys="≥,»,›" />
         <Key
             latin:keyLabel="="
-            latin:popupCharacters="≠,≈" />
+            latin:moreKeys="≠,≈" />
         <switch>
             <case
                 latin:mode="url"
             >
                 <Key
                     latin:keyLabel="\'"
-                    latin:popupCharacters="‘,’,‚,‛" />
+                    latin:moreKeys="‘,’,‚,‛" />
             </case>
             <default>
                 <Key
@@ -133,18 +133,18 @@
         </switch>
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_semicolon"
-            latin:popupCharacters="@string/alternates_for_symbols_semicolon" />
+            latin:moreKeys="@string/alternates_for_symbols_semicolon" />
         <Key
             latin:keyLabel="@string/keylabel_for_comma"
-            latin:popupCharacters="@string/alternates_for_comma" />
+            latin:moreKeys="@string/alternates_for_comma" />
         <Key
             latin:keyLabel="." />
         <Key
             latin:keyLabel="!"
-            latin:popupCharacters="¡" />
+            latin:moreKeys="¡" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_question"
-            latin:popupCharacters="@string/alternates_for_symbols_question" />
+            latin:moreKeys="@string/alternates_for_symbols_question" />
         <Key
             latin:keyStyle="toMoreSymbolKeyStyle"
             latin:keyXPos="-13.750%p"
@@ -172,10 +172,10 @@
             latin:keyXPos="31.250%p"
             latin:keyWidth="37.500%p" />
         <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
-        <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
+        <!-- latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛" -->
         <Key
             latin:keyLabel="&quot;"
-            latin:popupCharacters="“,”,«,»,‘,’,‚,‛" />
+            latin:moreKeys="“,”,«,»,‘,’,‚,‛" />
         <Key
             latin:keyLabel="_" />
         <switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
index 82bc4b2..30f72ac 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
@@ -38,19 +38,19 @@
             latin:keyLabel="|" />
         <Key
             latin:keyLabel="•"
-            latin:popupCharacters="♪,♥,♠,♦,♣" />
+            latin:moreKeys="♪,♥,♠,♦,♣" />
         <Key
             latin:keyLabel="√" />
         <Key
             latin:keyLabel="π"
-            latin:popupCharacters="Π" />
+            latin:moreKeys="Π" />
         <Key
             latin:keyLabel="÷" />
         <Key
             latin:keyLabel="×" />
         <Key
             latin:keyLabel="§"
-            latin:popupCharacters="¶" />
+            latin:moreKeys="¶" />
         <Key
             latin:keyLabel="Δ" />
         <Key
@@ -75,13 +75,13 @@
             latin:keyLabel="¥" />
         <Key
             latin:keyLabel="^"
-            latin:popupCharacters="↑,↓,←,→" />
+            latin:moreKeys="↑,↓,←,→" />
         <Key
             latin:keyLabel="°"
-            latin:popupCharacters="′,″" />
+            latin:moreKeys="′,″" />
         <Key
             latin:keyLabel="±"
-            latin:popupCharacters="∞" />
+            latin:moreKeys="∞" />
         <Key
             latin:keyLabel="{" />
         <Key
diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/kbd_currency_key_styles.xml
index d2c7117..d4f19b5 100644
--- a/java/res/xml/kbd_currency_key_styles.xml
+++ b/java/res/xml/kbd_currency_key_styles.xml
@@ -62,7 +62,7 @@
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="€"
-                latin:popupCharacters="@string/alternates_for_currency_euro" />
+                latin:moreKeys="@string/alternates_for_currency_euro" />
         </case>
         <case
             latin:languageCode="ca|et|lb|mt|sla"
@@ -70,7 +70,7 @@
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="€"
-                latin:popupCharacters="@string/alternates_for_currency_euro" />
+                latin:moreKeys="@string/alternates_for_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"
@@ -78,7 +78,7 @@
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="€"
-                latin:popupCharacters="@string/alternates_for_currency_euro" />
+                latin:moreKeys="@string/alternates_for_currency_euro" />
         </case>
         <case
             latin:languageCode="iw"
@@ -86,7 +86,7 @@
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="₪"
-                latin:popupCharacters="@string/alternates_for_currency_general" />
+                latin:moreKeys="@string/alternates_for_currency_general" />
         </case>
         <!-- United Kingdom -->
         <case
@@ -95,13 +95,13 @@
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="£"
-                latin:popupCharacters="@string/alternates_for_currency_pound" />
+                latin:moreKeys="@string/alternates_for_currency_pound" />
         </case>
         <default>
             <key-style
                 latin:styleName="currencyKeyStyle"
                 latin:keyLabel="$"
-                latin:popupCharacters="@string/alternates_for_currency_dollar" />
+                latin:moreKeys="@string/alternates_for_currency_dollar" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 86f0bf2..7bfeb65 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -33,7 +33,7 @@
             <key-style
                 latin:styleName="f1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_f1"
+                latin:moreKeys="@string/alternates_for_f1"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <!-- clobberSettingsKey="false -->
@@ -43,7 +43,7 @@
             <key-style
                 latin:styleName="f1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_f1_settings"
+                latin:moreKeys="@string/alternates_for_f1_settings"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <!-- clobberSettingsKey="false" hasSettingsKey="true" -->
@@ -53,7 +53,7 @@
             <key-style
                 latin:styleName="f1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_f1_navigate"
+                latin:moreKeys="@string/alternates_for_f1_navigate"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <!-- clobberSettingsKey="false" and hasSettingsKey="true" navigateAction="false" -->
@@ -61,7 +61,7 @@
             <key-style
                 latin:styleName="f1PopupStyle"
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_f1"
+                latin:moreKeys="@string/alternates_for_f1"
                 latin:parentStyle="functionalKeyStyle" />
         </default>
     </switch>
@@ -90,8 +90,8 @@
                 latin:keyLabel=":-)"
                 latin:keyOutputText=":-) "
                 latin:keyLabelOption="hasPopupHint"
-                latin:popupCharacters="@string/alternates_for_smiley"
-                latin:maxMiniKeyboardColumn="5"
+                latin:moreKeys="@string/alternates_for_smiley"
+                latin:maxMoreKeysColumn="5"
                 latin:parentStyle="functionalKeyStyle" />
         </case>
         <case
@@ -220,7 +220,7 @@
         latin:keyLabel="."
         latin:keyHintLabel="@string/keyhintlabel_for_punctuation"
         latin:keyLabelOption="hasPopupHint"
-        latin:popupCharacters="@string/alternates_for_punctuation"
-        latin:maxMiniKeyboardColumn="@integer/mini_keyboard_column_for_punctuation"
+        latin:moreKeys="@string/alternates_for_punctuation"
+        latin:maxMoreKeysColumn="@integer/mini_keyboard_column_for_punctuation"
         latin:parentStyle="functionalKeyStyle" />
 </merge>
diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml
index daa1382..7b4948a 100644
--- a/java/res/xml/kbd_qwerty_row1.xml
+++ b/java/res/xml/kbd_qwerty_row1.xml
@@ -27,43 +27,43 @@
         <Key
             latin:keyLabel="q"
             latin:keyHintLabel="1"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
             latin:keyHintLabel="2"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
             latin:keyHintLabel="3"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
             latin:keyHintLabel="4"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
             latin:keyHintLabel="5"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
             latin:keyHintLabel="6"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
             latin:keyHintLabel="7"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
             latin:keyHintLabel="8"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
             latin:keyHintLabel="9"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
             latin:keyHintLabel="0"
-            latin:popupCharacters="@string/alternates_for_p"
+            latin:moreKeys="@string/alternates_for_p"
             latin:keyWidth="fillRight" />
     </Row>
 </merge>
diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/kbd_qwerty_row2.xml
index 6e4872e..1468ff7 100644
--- a/java/res/xml/kbd_qwerty_row2.xml
+++ b/java/res/xml/kbd_qwerty_row2.xml
@@ -26,29 +26,29 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a"
+            latin:moreKeys="@string/alternates_for_a"
             latin:keyXPos="5%p" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <!-- Here is 5%p space -->
     </Row>
 </merge>
diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/kbd_qwerty_row3.xml
index 6a20355..6a2d0bb 100644
--- a/java/res/xml/kbd_qwerty_row3.xml
+++ b/java/res/xml/kbd_qwerty_row3.xml
@@ -30,20 +30,20 @@
             latin:visualInsetsRight="1%p" />
         <Key
             latin:keyLabel="z"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <Key
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/kbd_rows_arabic.xml
index daa2a65..569ac7e 100644
--- a/java/res/xml/kbd_rows_arabic.xml
+++ b/java/res/xml/kbd_rows_arabic.xml
@@ -29,47 +29,47 @@
         <Key
             latin:keyLabel="ض"
             latin:keyHintLabel="1"
-            latin:popupCharacters="1,١" />
+            latin:moreKeys="1,١" />
         <Key
             latin:keyLabel="ص"
             latin:keyHintLabel="2"
-            latin:popupCharacters="2,٢" />
+            latin:moreKeys="2,٢" />
         <Key
             latin:keyLabel="ق"
             latin:keyHintLabel="3"
-            latin:popupCharacters="3,٣" />
+            latin:moreKeys="3,٣" />
         <!-- \u06a4: ARABIC LETTER VEH -->
         <Key
             latin:keyLabel="ف"
             latin:keyHintLabel="4"
-            latin:popupCharacters="4,٤,\u06a4" />
+            latin:moreKeys="4,٤,\u06a4" />
         <Key
             latin:keyLabel="غ"
             latin:keyHintLabel="5"
-            latin:popupCharacters="5,٥" />
+            latin:moreKeys="5,٥" />
         <Key
             latin:keyLabel="ع"
             latin:keyHintLabel="6"
-            latin:popupCharacters="6,٦" />
+            latin:moreKeys="6,٦" />
         <!-- \ufeeb: ARABIC LETTER HEH INITIAL FORM
              \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL -->
         <Key
             latin:keyLabel="ه"
             latin:keyHintLabel="7"
-            latin:popupCharacters="7,٧,\ufeeb|\u0647\u0640" />
+            latin:moreKeys="7,٧,\ufeeb|\u0647\u0640" />
         <Key
             latin:keyLabel="خ"
             latin:keyHintLabel="8"
-            latin:popupCharacters="8,٨" />
+            latin:moreKeys="8,٨" />
         <Key
             latin:keyLabel="ح"
             latin:keyHintLabel="9"
-            latin:popupCharacters="9,٩" />
+            latin:moreKeys="9,٩" />
         <!-- \u0686: ARABIC LETTER TCHEH -->
         <Key
             latin:keyLabel="ج"
             latin:keyHintLabel="0"
-            latin:popupCharacters="0,٠,\u0686"
+            latin:moreKeys="0,٠,\u0686"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -83,10 +83,10 @@
              \u0649: ARABIC LETTER ALEF MAKSURA -->
         <Key
             latin:keyLabel="ي"
-            latin:popupCharacters="\u0626,\u0649" />
+            latin:moreKeys="\u0626,\u0649" />
         <Key
             latin:keyLabel="ب"
-            latin:popupCharacters="پ" />
+            latin:moreKeys="پ" />
         <!-- \ufefb: ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
              \u0644: ARABIC LETTER LAM
              \u0627: ARABIC LETTER ALEF
@@ -98,24 +98,24 @@
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ل"
-            latin:popupCharacters="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
+            latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
         <!-- \u0621: ARABIC LETTER HAMZA
              \u0623: ARABIC LETTER ALEF WITH HAMZA ABOVE
              \u0625: ARABIC LETTER ALEF WITH HAMZA BELOW
              \u0622: ARABIC LETTER ALEF WITH MADDA ABOVE -->
         <Key
             latin:keyLabel="ا"
-            latin:popupCharacters="\u0621,\u0623,\u0625,\u0622" />
+            latin:moreKeys="\u0621,\u0623,\u0625,\u0622" />
         <Key
             latin:keyLabel="ت"
-            latin:popupCharacters="ث" />
+            latin:moreKeys="ث" />
         <Key
             latin:keyLabel="ن" />
         <Key
             latin:keyLabel="م" />
         <Key
             latin:keyLabel="ك"
-            latin:popupCharacters="گ"
+            latin:moreKeys="گ"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -132,14 +132,14 @@
             latin:keyLabel="د" />
         <Key
             latin:keyLabel="ز"
-            latin:popupCharacters="ژ" />
+            latin:moreKeys="ژ" />
         <Key
             latin:keyLabel="ر" />
         <Key
             latin:keyLabel="ة" />
         <Key
             latin:keyLabel="و"
-            latin:popupCharacters="ؤ" />
+            latin:moreKeys="ؤ" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/kbd_rows_azerty.xml
index dbf25eb..4169b48 100644
--- a/java/res/xml/kbd_rows_azerty.xml
+++ b/java/res/xml/kbd_rows_azerty.xml
@@ -29,43 +29,43 @@
         <Key
             latin:keyLabel="a"
             latin:keyHintLabel="1"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="z"
             latin:keyHintLabel="2"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="e"
             latin:keyHintLabel="3"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
             latin:keyHintLabel="4"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
             latin:keyHintLabel="5"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
             latin:keyHintLabel="6"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
             latin:keyHintLabel="7"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
             latin:keyHintLabel="8"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
             latin:keyHintLabel="9"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
             latin:keyHintLabel="0"
-            latin:popupCharacters="@string/alternates_for_p"
+            latin:moreKeys="@string/alternates_for_p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -73,28 +73,28 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="m"
             latin:keyWidth="fillRight" />
@@ -108,24 +108,24 @@
             latin:visualInsetsRight="1%p" />
         <Key
             latin:keyLabel="w"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
 
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="\'"
-            latin:popupCharacters="‘,’,‚,‛" />
+            latin:moreKeys="‘,’,‚,‛" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/kbd_rows_hebrew.xml b/java/res/xml/kbd_rows_hebrew.xml
index 1ec0768..6be8174 100644
--- a/java/res/xml/kbd_rows_hebrew.xml
+++ b/java/res/xml/kbd_rows_hebrew.xml
@@ -57,17 +57,17 @@
             latin:keyLabel="ד" />
         <Key
             latin:keyLabel="ג"
-            latin:popupCharacters="ג׳" />
+            latin:moreKeys="ג׳" />
         <Key
             latin:keyLabel="כ" />
         <Key
             latin:keyLabel="ע" />
         <Key
             latin:keyLabel="י"
-            latin:popupCharacters="ײַ" />
+            latin:moreKeys="ײַ" />
         <Key
             latin:keyLabel="ח"
-            latin:popupCharacters="ח׳" />
+            latin:moreKeys="ח׳" />
         <Key
             latin:keyLabel="ל" />
         <Key
@@ -81,7 +81,7 @@
     >
         <Key
             latin:keyLabel="ז"
-            latin:popupCharacters="ז׳"
+            latin:moreKeys="ז׳"
             latin:keyXPos="5%p" />
         <Key
             latin:keyLabel="ס" />
@@ -95,13 +95,13 @@
             latin:keyLabel="מ" />
         <Key
             latin:keyLabel="צ"
-            latin:popupCharacters="צ׳" />
+            latin:moreKeys="צ׳" />
         <Key
             latin:keyLabel="ת"
-            latin:popupCharacters="ת׳" />
+            latin:moreKeys="ת׳" />
         <Key
             latin:keyLabel="ץ"
-            latin:popupCharacters="ץ׳" />
+            latin:moreKeys="ץ׳" />
         <!-- Here is 5%p space -->
     </Row>
     <include
diff --git a/java/res/xml/kbd_rows_qwertz.xml b/java/res/xml/kbd_rows_qwertz.xml
index f948921..9d9cfe1 100644
--- a/java/res/xml/kbd_rows_qwertz.xml
+++ b/java/res/xml/kbd_rows_qwertz.xml
@@ -29,43 +29,43 @@
         <Key
             latin:keyLabel="q"
             latin:keyHintLabel="1"
-            latin:popupCharacters="@string/alternates_for_q" />
+            latin:moreKeys="@string/alternates_for_q" />
         <Key
             latin:keyLabel="w"
             latin:keyHintLabel="2"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
             latin:keyHintLabel="3"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
             latin:keyHintLabel="4"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
             latin:keyHintLabel="5"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="z"
             latin:keyHintLabel="6"
-            latin:popupCharacters="@string/alternates_for_z" />
+            latin:moreKeys="@string/alternates_for_z" />
         <Key
             latin:keyLabel="u"
             latin:keyHintLabel="7"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
             latin:keyHintLabel="8"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
             latin:keyHintLabel="9"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
             latin:keyHintLabel="0"
-            latin:popupCharacters="@string/alternates_for_p"
+            latin:moreKeys="@string/alternates_for_p"
             latin:keyWidth="fillRight" />
     </Row>
     <include
@@ -79,20 +79,20 @@
             latin:visualInsetsRight="1%p" />
         <Key
             latin:keyLabel="y"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="x" />
         <Key
             latin:keyLabel="c"
-            latin:popupCharacters="@string/alternates_for_c" />
+            latin:moreKeys="@string/alternates_for_c" />
         <Key
             latin:keyLabel="v"
-            latin:popupCharacters="@string/alternates_for_v" />
+            latin:moreKeys="@string/alternates_for_v" />
         <Key
             latin:keyLabel="b" />
         <Key
             latin:keyLabel="n"
-            latin:popupCharacters="@string/alternates_for_n" />
+            latin:moreKeys="@string/alternates_for_n" />
         <Key
             latin:keyLabel="m" />
         <Key
diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_russian.xml
index 0c7a237..0b2f329 100644
--- a/java/res/xml/kbd_rows_russian.xml
+++ b/java/res/xml/kbd_rows_russian.xml
@@ -29,47 +29,47 @@
         <Key
             latin:keyLabel="й"
             latin:keyHintLabel="1"
-            latin:popupCharacters="1"
+            latin:moreKeys="1"
             latin:keyWidth="8.75%p" />
         <Key
             latin:keyLabel="ц"
             latin:keyHintLabel="2"
-            latin:popupCharacters="2" />
+            latin:moreKeys="2" />
         <Key
             latin:keyLabel="у"
             latin:keyHintLabel="3"
-            latin:popupCharacters="3" />
+            latin:moreKeys="3" />
         <Key
             latin:keyLabel="к"
             latin:keyHintLabel="4"
-            latin:popupCharacters="4" />
+            latin:moreKeys="4" />
         <Key
             latin:keyLabel="е"
             latin:keyHintLabel="5"
-            latin:popupCharacters="@string/alternates_for_cyrillic_e" />
+            latin:moreKeys="@string/alternates_for_cyrillic_e" />
         <Key
             latin:keyLabel="н"
             latin:keyHintLabel="6"
-            latin:popupCharacters="6" />
+            latin:moreKeys="6" />
         <Key
             latin:keyLabel="г"
             latin:keyHintLabel="7"
-            latin:popupCharacters="7" />
+            latin:moreKeys="7" />
         <Key
             latin:keyLabel="ш"
             latin:keyHintLabel="8"
-            latin:popupCharacters="8" />
+            latin:moreKeys="8" />
         <Key
             latin:keyLabel="щ"
             latin:keyHintLabel="9"
-            latin:popupCharacters="9" />
+            latin:moreKeys="9" />
         <Key
             latin:keyLabel="з"
             latin:keyHintLabel="0"
-            latin:popupCharacters="0" />
+            latin:moreKeys="0" />
         <Key
             latin:keyLabel="х"
-            latin:popupCharacters="@string/alternates_for_cyrillic_ha"
+            latin:moreKeys="@string/alternates_for_cyrillic_ha"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -120,7 +120,7 @@
             latin:keyLabel="т" />
         <Key
             latin:keyLabel="ь"
-            latin:popupCharacters="@string/alternates_for_cyrillic_soft_sign" />
+            latin:moreKeys="@string/alternates_for_cyrillic_soft_sign" />
         <Key
             latin:keyLabel="б" />
         <Key
diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/kbd_rows_scandinavian.xml
index 7e8902e..3a04903 100644
--- a/java/res/xml/kbd_rows_scandinavian.xml
+++ b/java/res/xml/kbd_rows_scandinavian.xml
@@ -29,44 +29,44 @@
         <Key
             latin:keyLabel="q"
             latin:keyHintLabel="1"
-            latin:popupCharacters="@string/alternates_for_q"
+            latin:moreKeys="@string/alternates_for_q"
             latin:keyWidth="8.75%p" />
         <Key
             latin:keyLabel="w"
             latin:keyHintLabel="2"
-            latin:popupCharacters="@string/alternates_for_w" />
+            latin:moreKeys="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
             latin:keyHintLabel="3"
-            latin:popupCharacters="@string/alternates_for_e" />
+            latin:moreKeys="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
             latin:keyHintLabel="4"
-            latin:popupCharacters="@string/alternates_for_r" />
+            latin:moreKeys="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
             latin:keyHintLabel="5"
-            latin:popupCharacters="@string/alternates_for_t" />
+            latin:moreKeys="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
             latin:keyHintLabel="6"
-            latin:popupCharacters="@string/alternates_for_y" />
+            latin:moreKeys="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
             latin:keyHintLabel="7"
-            latin:popupCharacters="@string/alternates_for_u" />
+            latin:moreKeys="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
             latin:keyHintLabel="8"
-            latin:popupCharacters="@string/alternates_for_i" />
+            latin:moreKeys="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
             latin:keyHintLabel="9"
-            latin:popupCharacters="@string/alternates_for_o" />
+            latin:moreKeys="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
             latin:keyHintLabel="0"
-            latin:popupCharacters="@string/alternates_for_p" />
+            latin:moreKeys="@string/alternates_for_p" />
         <Key
             latin:keyLabel="å"
             latin:keyWidth="fillRight" />
@@ -76,35 +76,35 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a"
+            latin:moreKeys="@string/alternates_for_a"
             latin:keyWidth="8.75%p" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_10"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_10" />
         <Key
             latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
-            latin:popupCharacters="@string/alternates_for_scandinavia_row2_11"
+            latin:moreKeys="@string/alternates_for_scandinavia_row2_11"
             latin:keyWidth="fillRight" />
     </Row>
     <include
diff --git a/java/res/xml/kbd_rows_serbian.xml b/java/res/xml/kbd_rows_serbian.xml
index 73c807f..c911ae8 100644
--- a/java/res/xml/kbd_rows_serbian.xml
+++ b/java/res/xml/kbd_rows_serbian.xml
@@ -29,43 +29,43 @@
         <Key
             latin:keyLabel="љ"
             latin:keyHintLabel="1"
-            latin:popupCharacters="1" />
+            latin:moreKeys="1" />
         <Key
             latin:keyLabel="њ"
             latin:keyHintLabel="2"
-            latin:popupCharacters="2" />
+            latin:moreKeys="2" />
         <Key
             latin:keyLabel="е"
             latin:keyHintLabel="3"
-            latin:popupCharacters="3" />
+            latin:moreKeys="3" />
         <Key
             latin:keyLabel="р"
             latin:keyHintLabel="4"
-            latin:popupCharacters="4" />
+            latin:moreKeys="4" />
         <Key
             latin:keyLabel="т"
             latin:keyHintLabel="5"
-            latin:popupCharacters="5" />
+            latin:moreKeys="5" />
         <Key
             latin:keyLabel="з"
             latin:keyHintLabel="6"
-            latin:popupCharacters="6" />
+            latin:moreKeys="6" />
         <Key
             latin:keyLabel="у"
             latin:keyHintLabel="7"
-            latin:popupCharacters="7" />
+            latin:moreKeys="7" />
         <Key
             latin:keyLabel="и"
             latin:keyHintLabel="8"
-            latin:popupCharacters="8" />
+            latin:moreKeys="8" />
         <Key
             latin:keyLabel="о"
             latin:keyHintLabel="9"
-            latin:popupCharacters="9" />
+            latin:moreKeys="9" />
         <Key
             latin:keyLabel="п"
             latin:keyHintLabel="0"
-            latin:popupCharacters="0" />
+            latin:moreKeys="0" />
         <Key
             latin:keyLabel="ш"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/kbd_rows_spanish.xml b/java/res/xml/kbd_rows_spanish.xml
index 6d00718..b3276d1 100644
--- a/java/res/xml/kbd_rows_spanish.xml
+++ b/java/res/xml/kbd_rows_spanish.xml
@@ -30,28 +30,28 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:popupCharacters="@string/alternates_for_a" />
+            latin:moreKeys="@string/alternates_for_a" />
         <Key
             latin:keyLabel="s"
-            latin:popupCharacters="@string/alternates_for_s" />
+            latin:moreKeys="@string/alternates_for_s" />
         <Key
             latin:keyLabel="d"
-            latin:popupCharacters="@string/alternates_for_d" />
+            latin:moreKeys="@string/alternates_for_d" />
         <Key
             latin:keyLabel="f" />
         <Key
             latin:keyLabel="g"
-            latin:popupCharacters="@string/alternates_for_g" />
+            latin:moreKeys="@string/alternates_for_g" />
         <Key
             latin:keyLabel="h" />
         <Key
             latin:keyLabel="j" />
         <Key
             latin:keyLabel="k"
-            latin:popupCharacters="@string/alternates_for_k" />
+            latin:moreKeys="@string/alternates_for_k" />
         <Key
             latin:keyLabel="l"
-            latin:popupCharacters="@string/alternates_for_l" />
+            latin:moreKeys="@string/alternates_for_l" />
         <Key
             latin:keyLabel="ñ" />
     </Row>
diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml
index 5880d52..ff3b473 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/kbd_rows_symbols.xml
@@ -30,34 +30,34 @@
     >
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_1"
-            latin:popupCharacters="@string/alternates_for_symbols_1" />
+            latin:moreKeys="@string/alternates_for_symbols_1" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_2"
-            latin:popupCharacters="@string/alternates_for_symbols_2" />
+            latin:moreKeys="@string/alternates_for_symbols_2" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_3"
-            latin:popupCharacters="@string/alternates_for_symbols_3" />
+            latin:moreKeys="@string/alternates_for_symbols_3" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_4"
-            latin:popupCharacters="@string/alternates_for_symbols_4" />
+            latin:moreKeys="@string/alternates_for_symbols_4" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_5"
-            latin:popupCharacters="@string/alternates_for_symbols_5" />
+            latin:moreKeys="@string/alternates_for_symbols_5" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_6"
-            latin:popupCharacters="@string/alternates_for_symbols_6" />
+            latin:moreKeys="@string/alternates_for_symbols_6" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_7"
-            latin:popupCharacters="@string/alternates_for_symbols_7" />
+            latin:moreKeys="@string/alternates_for_symbols_7" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_8"
-            latin:popupCharacters="@string/alternates_for_symbols_8" />
+            latin:moreKeys="@string/alternates_for_symbols_8" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_9"
-            latin:popupCharacters="@string/alternates_for_symbols_9" />
+            latin:moreKeys="@string/alternates_for_symbols_9" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_0"
-            latin:popupCharacters="@string/alternates_for_symbols_0"
+            latin:moreKeys="@string/alternates_for_symbols_0"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -71,24 +71,24 @@
             latin:keyStyle="currencyKeyStyle" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_percent"
-            latin:popupCharacters="@string/alternates_for_symbols_percent" />
+            latin:moreKeys="@string/alternates_for_symbols_percent" />
         <Key
             latin:keyLabel="&amp;" />
         <Key
             latin:keyLabel="*"
-            latin:popupCharacters="†,‡,★" />
+            latin:moreKeys="†,‡,★" />
         <Key
             latin:keyLabel="-"
-            latin:popupCharacters="_,–,—" />
+            latin:moreKeys="_,–,—" />
         <Key
             latin:keyLabel="+"
-            latin:popupCharacters="±" />
+            latin:moreKeys="±" />
         <Key
             latin:keyLabel="("
-            latin:popupCharacters="[,{,&lt;" />
+            latin:moreKeys="[,{,&lt;" />
         <Key
             latin:keyLabel=")"
-            latin:popupCharacters="],},&gt;"
+            latin:moreKeys="],},&gt;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -100,26 +100,26 @@
             latin:visualInsetsRight="1%p" />
         <Key
             latin:keyLabel="!"
-            latin:popupCharacters="¡" />
+            latin:moreKeys="¡" />
         <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
-        <!-- latin:popupCharacters="“,”,„,‟,«,»" -->
+        <!-- latin:moreKeys="“,”,„,‟,«,»" -->
         <Key
             latin:keyLabel="&quot;"
-            latin:popupCharacters="“,”,«,»"
-            latin:maxMiniKeyboardColumn="6" />
+            latin:moreKeys="“,”,«,»"
+            latin:maxMoreKeysColumn="6" />
         <Key
             latin:keyLabel="\'"
-            latin:popupCharacters="‘,’,‚,‛" />
+            latin:moreKeys="‘,’,‚,‛" />
         <Key
             latin:keyLabel=":" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_semicolon"
-            latin:popupCharacters="@string/alternates_for_symbols_semicolon" />
+            latin:moreKeys="@string/alternates_for_symbols_semicolon" />
         <Key
             latin:keyLabel="/" />
         <Key
             latin:keyLabel="@string/keylabel_for_symbols_question"
-            latin:popupCharacters="@string/alternates_for_symbols_question" />
+            latin:moreKeys="@string/alternates_for_symbols_question" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/kbd_rows_symbols_shift.xml
index ff272f1..66c14fe 100644
--- a/java/res/xml/kbd_rows_symbols_shift.xml
+++ b/java/res/xml/kbd_rows_symbols_shift.xml
@@ -34,12 +34,12 @@
             latin:keyLabel="|" />
         <Key
             latin:keyLabel="•"
-            latin:popupCharacters="♪,♥,♠,♦,♣" />
+            latin:moreKeys="♪,♥,♠,♦,♣" />
         <Key
             latin:keyLabel="√" />
         <Key
             latin:keyLabel="π"
-            latin:popupCharacters="Π" />
+            latin:moreKeys="Π" />
         <Key
             latin:keyLabel="÷" />
         <Key
@@ -63,15 +63,15 @@
             latin:keyLabel="€" />
         <Key
             latin:keyLabel="°"
-            latin:popupCharacters="′,″" />
+            latin:moreKeys="′,″" />
         <Key
             latin:keyLabel="^"
-            latin:popupCharacters="↑,↓,←,→" />
+            latin:moreKeys="↑,↓,←,→" />
         <Key
             latin:keyLabel="_" />
         <Key
             latin:keyLabel="="
-            latin:popupCharacters="≠,≈,∞" />
+            latin:moreKeys="≠,≈,∞" />
         <Key
             latin:keyLabel="[" />
         <Key
@@ -93,15 +93,15 @@
             latin:keyLabel="©" />
         <Key
             latin:keyLabel="¶"
-            latin:popupCharacters="§" />
+            latin:moreKeys="§" />
         <Key
             latin:keyLabel="\\" />
         <Key
             latin:keyLabel="&lt;"
-            latin:popupCharacters="≤,«,‹" />
+            latin:moreKeys="≤,«,‹" />
         <Key
             latin:keyLabel="&gt;"
-            latin:popupCharacters="≥,»,›" />
+            latin:moreKeys="≥,»,›" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/kbd_symbols_shift_row4.xml
index bcab19b..c8d5293 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/kbd_symbols_shift_row4.xml
@@ -34,7 +34,7 @@
                     latin:keyWidth="15%p" />
                 <Key
                     latin:keyLabel="„"
-                    latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛"
+                    latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛"
                     latin:keyStyle="functionalKeyStyle" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
@@ -55,7 +55,7 @@
                     latin:keyboardLayout="@xml/kbd_settings_or_tab" />
                 <Key
                     latin:keyLabel="„"
-                    latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛"
+                    latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛"
                     latin:keyWidth="9.2%p"
                     latin:keyStyle="functionalKeyStyle" />
                 <Key