50 files changed, 58 insertions, 58 deletions
diff --git a/tools/makelabel/etc/manifest.txt b/tools/makelabel/etc/manifest.txt
deleted file mode 100644
index 18bf0be09..000000000
--- a/tools/makelabel/etc/manifest.txt
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.android.inputmethod.latin.makelabel.LabelMaker
diff --git a/tools/makelabel/Android.mk b/tools/maketext/Android.mk
index 9fa865084..98731b718 100644
--- a/tools/makelabel/Android.mk
+++ b/tools/maketext/Android.mk
@@ -20,7 +20,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under,src)
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 LOCAL_JAVA_RESOURCE_DIRS := res
 LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE := makelabel
+LOCAL_MODULE := maketext
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 include $(LOCAL_PATH)/etc/Android.mk
diff --git a/tools/makelabel/etc/Android.mk b/tools/maketext/etc/Android.mk
index 2d2e9a6ed..4fa194bcd 100644
--- a/tools/makelabel/etc/Android.mk
+++ b/tools/maketext/etc/Android.mk
@@ -17,5 +17,5 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := eng
 
-LOCAL_PREBUILT_EXECUTABLES := makelabel
+LOCAL_PREBUILT_EXECUTABLES := maketext
 include $(BUILD_HOST_PREBUILT)
diff --git a/tools/makelabel/etc/makelabel b/tools/maketext/etc/maketext
index 44a05b612..0edd36020 100755
--- a/tools/makelabel/etc/makelabel
+++ b/tools/maketext/etc/maketext
@@ -33,7 +33,7 @@ progdir=`pwd`
 prog="${progdir}"/`basename "${prog}"`
 cd "${oldwd}"
 
-jarfile=makelabel.jar
+jarfile=maketext.jar
 frameworkdir="$progdir"
 if [ ! -r "$frameworkdir/$jarfile" ]
 then
diff --git a/tools/maketext/etc/manifest.txt b/tools/maketext/etc/manifest.txt
new file mode 100644
index 000000000..bfd1a52be
--- /dev/null
+++ b/tools/maketext/etc/manifest.txt
@@ -0,0 +1 @@
+Main-Class: com.android.inputmethod.latin.maketext.LabelText
diff --git a/tools/makelabel/res/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.tmpl b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
index 72f4edda7..5a193388a 100644
--- a/tools/makelabel/res/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.tmpl
+++ b/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
@@ -25,23 +25,23 @@ import java.util.HashMap;
 
 /**
  * !!!!! DO NOT EDIT THIS FILE !!!!!
- * This file is generated by tools/makelabel.
+ * This file is generated by tools/maketext.
  */
-public final class KeyboardLabelsSet {
-    // Language to labels map.
-    private static final HashMap<String, String[]> sLocaleToLabelsMap =
+public final class KeyboardTextsSet {
+    // Language to texts map.
+    private static final HashMap<String, String[]> sLocaleToTextsMap =
             new HashMap<String, String[]>();
     private static final HashMap<String, Integer> sLowerCaseNameToIdsMap =
             new HashMap<String, Integer>();
 
-    private String[] mLabels;
-    // Resource name to label map.
-    private HashMap<String, String> mResourceNameToLabelsMap = new HashMap<String, String>();
+    private String[] mTexts;
+    // Resource name to text map.
+    private HashMap<String, String> mResourceNameToTextsMap = new HashMap<String, String>();
 
     public void setLanguage(final String language) {
-        mLabels = sLocaleToLabelsMap.get(language);
-        if (mLabels == null) {
-            mLabels = LANGUAGE_DEFAULT;
+        mTexts = sLocaleToTextsMap.get(language);
+        if (mTexts == null) {
+            mTexts = LANGUAGE_DEFAULT;
         }
     }
 
@@ -56,31 +56,31 @@ public final class KeyboardLabelsSet {
         final String packageName = res.getResourcePackageName(referenceId);
         for (final String resName : resourceNames) {
             final int resId = res.getIdentifier(resName, "string", packageName);
-            mResourceNameToLabelsMap.put(resName, res.getString(resId));
+            mResourceNameToTextsMap.put(resName, res.getString(resId));
         }
     }
 
-    public String getLabel(final String name) {
+    public String getText(final String name) {
         String lowerCaseName = null;
-        String label = mResourceNameToLabelsMap.get(name);
-        if (label == null) {
+        String text = mResourceNameToTextsMap.get(name);
+        if (text == null) {
             lowerCaseName = name.toLowerCase();
-            label = mResourceNameToLabelsMap.get(lowerCaseName);
+            text = mResourceNameToTextsMap.get(lowerCaseName);
         }
-        if (label != null) {
-            return label;
+        if (text != null) {
+            return text;
         }
         Integer id = sLowerCaseNameToIdsMap.get(name);
         if (id == null) {
             id = sLowerCaseNameToIdsMap.get(lowerCaseName); // lowerCaseName != null
         }
         if (id == null) throw new RuntimeException("Unknown label: " + name);
-        label = (id < mLabels.length) ? mLabels[id] : null;
-        return (label == null) ? LANGUAGE_DEFAULT[id] : label;
+        text = (id < mTexts.length) ? mTexts[id] : null;
+        return (text == null) ? LANGUAGE_DEFAULT[id] : text;
     }
 
     private static final String[] RESOURCE_NAMES = {
-        // These labels' name should be aligned with the @string/<name> in values/strings.xml.
+        // These texts' name should be aligned with the @string/<name> in values/strings.xml.
         // Labels for action.
         "label_go_key",
         // "label_search_key",
@@ -102,14 +102,14 @@ public final class KeyboardLabelsSet {
 
     private static final String EMPTY = "";
 
-    /* Default labels */
+    /* Default texts */
     private static final String[] LANGUAGE_DEFAULT = {
-        /* @DEFAULT_LABELS@ */
+        /* @DEFAULT_TEXTS@ */
     };
 
-    /* @LABELS@ */
-    private static final Object[] LANGUAGES_AND_LABELS = {
-        /* @LANGUAGES_AND_LABELS@ */
+    /* @TEXTS@ */
+    private static final Object[] LANGUAGES_AND_TEXTS = {
+        /* @LANGUAGES_AND_TEXTS@ */
     };
 
     static {
@@ -118,10 +118,10 @@ public final class KeyboardLabelsSet {
             sLowerCaseNameToIdsMap.put(name, id++);
         }
 
-        for (int i = 0; i < LANGUAGES_AND_LABELS.length; i += 2) {
-            final String language = (String)LANGUAGES_AND_LABELS[i];
-            final String[] labels = (String[])LANGUAGES_AND_LABELS[i + 1];
-            sLocaleToLabelsMap.put(language, labels);
+        for (int i = 0; i < LANGUAGES_AND_TEXTS.length; i += 2) {
+            final String language = (String)LANGUAGES_AND_TEXTS[i];
+            final String[] texts = (String[])LANGUAGES_AND_TEXTS[i + 1];
+            sLocaleToTextsMap.put(language, texts);
         }
     }
 }
diff --git a/tools/makelabel/res/values-ar/donottranslate-more-keys.xml b/tools/maketext/res/values-ar/donottranslate-more-keys.xml
index 402e17160..402e17160 100644
--- a/tools/makelabel/res/values-ar/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ar/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-be/donottranslate-more-keys.xml b/tools/maketext/res/values-be/donottranslate-more-keys.xml
index 835553a1f..835553a1f 100644
--- a/tools/makelabel/res/values-be/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-be/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ca/donottranslate-more-keys.xml b/tools/maketext/res/values-ca/donottranslate-more-keys.xml
index baa23bf9c..baa23bf9c 100644
--- a/tools/makelabel/res/values-ca/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ca/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-cs/donottranslate-more-keys.xml b/tools/maketext/res/values-cs/donottranslate-more-keys.xml
index 9af6794df..9af6794df 100644
--- a/tools/makelabel/res/values-cs/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-cs/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-da/donottranslate-more-keys.xml b/tools/maketext/res/values-da/donottranslate-more-keys.xml
index acc0c534d..acc0c534d 100644
--- a/tools/makelabel/res/values-da/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-da/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-de/donottranslate-more-keys.xml b/tools/maketext/res/values-de/donottranslate-more-keys.xml
index 562e574eb..562e574eb 100644
--- a/tools/makelabel/res/values-de/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-de/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-en/donottranslate-more-keys.xml b/tools/maketext/res/values-en/donottranslate-more-keys.xml
index 969a5041b..969a5041b 100644
--- a/tools/makelabel/res/values-en/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-en/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-es/donottranslate-more-keys.xml b/tools/maketext/res/values-es/donottranslate-more-keys.xml
index f56b1d54f..f56b1d54f 100644
--- a/tools/makelabel/res/values-es/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-es/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-et/donottranslate-more-keys.xml b/tools/maketext/res/values-et/donottranslate-more-keys.xml
index 69cf654a6..69cf654a6 100644
--- a/tools/makelabel/res/values-et/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-et/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fa/donottranslate-more-keys.xml b/tools/maketext/res/values-fa/donottranslate-more-keys.xml
index 1da1c1889..1da1c1889 100644
--- a/tools/makelabel/res/values-fa/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-fa/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fi/donottranslate-more-keys.xml b/tools/maketext/res/values-fi/donottranslate-more-keys.xml
index 25b785845..25b785845 100644
--- a/tools/makelabel/res/values-fi/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-fi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-fr/donottranslate-more-keys.xml b/tools/maketext/res/values-fr/donottranslate-more-keys.xml
index 7b11a183d..7b11a183d 100644
--- a/tools/makelabel/res/values-fr/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-fr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hi/donottranslate-more-keys.xml b/tools/maketext/res/values-hi/donottranslate-more-keys.xml
index 19bcb9dda..19bcb9dda 100644
--- a/tools/makelabel/res/values-hi/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-hi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hr/donottranslate-more-keys.xml b/tools/maketext/res/values-hr/donottranslate-more-keys.xml
index 9b4005d0d..9b4005d0d 100644
--- a/tools/makelabel/res/values-hr/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-hr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-hu/donottranslate-more-keys.xml b/tools/maketext/res/values-hu/donottranslate-more-keys.xml
index 48259104b..48259104b 100644
--- a/tools/makelabel/res/values-hu/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-hu/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-is/donottranslate-more-keys.xml b/tools/maketext/res/values-is/donottranslate-more-keys.xml
index 284aae930..284aae930 100644
--- a/tools/makelabel/res/values-is/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-is/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-it/donottranslate-more-keys.xml b/tools/maketext/res/values-it/donottranslate-more-keys.xml
index 17dd03108..17dd03108 100644
--- a/tools/makelabel/res/values-it/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-it/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-iw/donottranslate-more-keys.xml b/tools/maketext/res/values-iw/donottranslate-more-keys.xml
index ad209edde..ad209edde 100644
--- a/tools/makelabel/res/values-iw/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-iw/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ky/donottranslate-more-keys.xml b/tools/maketext/res/values-ky/donottranslate-more-keys.xml
index fd90248b2..fd90248b2 100644
--- a/tools/makelabel/res/values-ky/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ky/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-lt/donottranslate-more-keys.xml b/tools/maketext/res/values-lt/donottranslate-more-keys.xml
index 1491d954e..1491d954e 100644
--- a/tools/makelabel/res/values-lt/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-lt/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-lv/donottranslate-more-keys.xml b/tools/maketext/res/values-lv/donottranslate-more-keys.xml
index d0a44480a..d0a44480a 100644
--- a/tools/makelabel/res/values-lv/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-lv/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-mk/donottranslate-more-keys.xml b/tools/maketext/res/values-mk/donottranslate-more-keys.xml
index d0cccf61b..d0cccf61b 100644
--- a/tools/makelabel/res/values-mk/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-mk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-nb/donottranslate-more-keys.xml b/tools/maketext/res/values-nb/donottranslate-more-keys.xml
index 49e6d5faf..49e6d5faf 100644
--- a/tools/makelabel/res/values-nb/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-nb/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-nl/donottranslate-more-keys.xml b/tools/maketext/res/values-nl/donottranslate-more-keys.xml
index 73768aff2..73768aff2 100644
--- a/tools/makelabel/res/values-nl/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-nl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-pl/donottranslate-more-keys.xml b/tools/maketext/res/values-pl/donottranslate-more-keys.xml
index 0f8a59bd6..0f8a59bd6 100644
--- a/tools/makelabel/res/values-pl/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-pl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-pt/donottranslate-more-keys.xml b/tools/maketext/res/values-pt/donottranslate-more-keys.xml
index 0c9065f27..0c9065f27 100644
--- a/tools/makelabel/res/values-pt/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-pt/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-rm/donottranslate-more-keys.xml b/tools/maketext/res/values-rm/donottranslate-more-keys.xml
index aa0d7f817..aa0d7f817 100644
--- a/tools/makelabel/res/values-rm/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-rm/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ro/donottranslate-more-keys.xml b/tools/maketext/res/values-ro/donottranslate-more-keys.xml
index 44613cf85..44613cf85 100644
--- a/tools/makelabel/res/values-ro/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ro/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-ru/donottranslate-more-keys.xml b/tools/maketext/res/values-ru/donottranslate-more-keys.xml
index 0bb57074c..0bb57074c 100644
--- a/tools/makelabel/res/values-ru/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-ru/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sk/donottranslate-more-keys.xml b/tools/maketext/res/values-sk/donottranslate-more-keys.xml
index f6e1e8d72..f6e1e8d72 100644
--- a/tools/makelabel/res/values-sk/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-sk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sl/donottranslate-more-keys.xml b/tools/maketext/res/values-sl/donottranslate-more-keys.xml
index ccff2ac29..ccff2ac29 100644
--- a/tools/makelabel/res/values-sl/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-sl/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sr/donottranslate-more-keys.xml b/tools/maketext/res/values-sr/donottranslate-more-keys.xml
index e85d3d7a2..e85d3d7a2 100644
--- a/tools/makelabel/res/values-sr/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-sr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-sv/donottranslate-more-keys.xml b/tools/maketext/res/values-sv/donottranslate-more-keys.xml
index d479191f4..d479191f4 100644
--- a/tools/makelabel/res/values-sv/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-sv/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-tr/donottranslate-more-keys.xml b/tools/maketext/res/values-tr/donottranslate-more-keys.xml
index 1161811d4..1161811d4 100644
--- a/tools/makelabel/res/values-tr/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-tr/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-uk/donottranslate-more-keys.xml b/tools/maketext/res/values-uk/donottranslate-more-keys.xml
index 32397049a..32397049a 100644
--- a/tools/makelabel/res/values-uk/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-uk/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-vi/donottranslate-more-keys.xml b/tools/maketext/res/values-vi/donottranslate-more-keys.xml
index 6ef1c6bc5..6ef1c6bc5 100644
--- a/tools/makelabel/res/values-vi/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-vi/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values-zz/donottranslate-more-keys.xml b/tools/maketext/res/values-zz/donottranslate-more-keys.xml
index eb984a469..eb984a469 100644
--- a/tools/makelabel/res/values-zz/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-zz/donottranslate-more-keys.xml
diff --git a/tools/makelabel/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml
index 401613410..401613410 100644
--- a/tools/makelabel/res/values/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values/donottranslate-more-keys.xml
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/ArrayInitializerFormatter.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java
index 0cf2991b0..3365c7273 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/ArrayInitializerFormatter.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 import java.io.PrintStream;
 
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/JarUtils.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java
index b24b2ca30..366d73e20 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/JarUtils.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/LabelMaker.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java
index e02f80283..a5abcf1c1 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/LabelMaker.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
 import java.util.jar.JarFile;
 
-public class LabelMaker {
+public class LabelText {
     static class Options {
         private static final String OPTION_JAVA = "-java";
 
@@ -58,7 +58,7 @@ public class LabelMaker {
 
     public static void main(final String[] args) {
         final Options options = new Options(args);
-        final JarFile jar = JarUtils.getJarFile(LabelMaker.class.getClassLoader());
+        final JarFile jar = JarUtils.getJarFile(LabelText.class.getClassLoader());
         final MoreKeysResources resources = new MoreKeysResources(jar);
         resources.writeToJava(options.mJava);
     }
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/MoreKeysResources.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java
index 1dfb8533f..a4835932b 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/MoreKeysResources.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 import java.io.Closeable;
 import java.io.File;
@@ -30,13 +30,13 @@ import java.util.Locale;
 import java.util.jar.JarFile;
 
 public class MoreKeysResources {
-    private static final String LABEL_RESOURCE_NAME = "donottranslate-more-keys.xml";
+    private static final String TEXT_RESOURCE_NAME = "donottranslate-more-keys.xml";
 
-    private static final String JAVA_TEMPLATE = "KeyboardLabelsSet.tmpl";
+    private static final String JAVA_TEMPLATE = "KeyboardTextsSet.tmpl";
     private static final String MARK_NAMES = "@NAMES@";
-    private static final String MARK_DEFAULT_LABELS = "@DEFAULT_LABELS@";
-    private static final String MARK_LABELS = "@LABELS@";
-    private static final String MARK_LANGUAGES_AND_LABELS = "@LANGUAGES_AND_LABELS@";
+    private static final String MARK_DEFAULT_TEXTS = "@DEFAULT_TEXTS@";
+    private static final String MARK_TEXTS = "@TEXTS@";
+    private static final String MARK_LANGUAGES_AND_TEXTS = "@LANGUAGES_AND_TEXTS@";
     private static final String DEFAUT_LANGUAGE_NAME = "DEFAULT";
     private static final String ARRAY_NAME_FOR_LANGUAGE = "LANGUAGE_%s";
     private static final String EMPTY_STRING_VAR = "EMPTY";
@@ -53,7 +53,7 @@ public class MoreKeysResources {
 
     public MoreKeysResources(final JarFile jar) {
         mJar = jar;
-        final ArrayList<String> resources = JarUtils.getNameListing(jar, LABEL_RESOURCE_NAME);
+        final ArrayList<String> resources = JarUtils.getNameListing(jar, TEXT_RESOURCE_NAME);
         for (final String name : resources) {
             final String dirName = name.substring(0, name.lastIndexOf('/'));
             final int pos = dirName.lastIndexOf('/');
@@ -118,11 +118,11 @@ public class MoreKeysResources {
         while ((line = in.readLine()) != null) {
             if (line.contains(MARK_NAMES)) {
                 dumpNames(out);
-            } else if (line.contains(MARK_DEFAULT_LABELS)) {
-                dumpDefaultLabels(out);
-            } else if (line.contains(MARK_LABELS)) {
-                dumpLabels(out);
-            } else if (line.contains(MARK_LANGUAGES_AND_LABELS)) {
+            } else if (line.contains(MARK_DEFAULT_TEXTS)) {
+                dumpDefaultTexts(out);
+            } else if (line.contains(MARK_TEXTS)) {
+                dumpTexts(out);
+            } else if (line.contains(MARK_LANGUAGES_AND_TEXTS)) {
                 dumpLanguageMap(out);
             } else {
                 out.println(line);
@@ -140,12 +140,12 @@ public class MoreKeysResources {
         }
     }
 
-    private void dumpDefaultLabels(final PrintStream out) {
+    private void dumpDefaultTexts(final PrintStream out) {
         final StringResourceMap defaultResMap = mResourcesMap.get(DEFAUT_LANGUAGE_NAME);
-        dumpLabelsInternal(out, defaultResMap, defaultResMap);
+        dumpTextsInternal(out, defaultResMap, defaultResMap);
     }
 
-    private void dumpLabels(final PrintStream out) {
+    private void dumpTexts(final PrintStream out) {
         final StringResourceMap defaultResMap = mResourcesMap.get(DEFAUT_LANGUAGE_NAME);
         final ArrayList<String> allLanguages = new ArrayList<String>();
         allLanguages.addAll(mResourcesMap.keySet());
@@ -158,7 +158,7 @@ public class MoreKeysResources {
             out.format("    private static final String[] " + ARRAY_NAME_FOR_LANGUAGE + " = {\n",
                     language);
             final StringResourceMap resMap = mResourcesMap.get(language);
-            dumpLabelsInternal(out, resMap, defaultResMap);
+            dumpTextsInternal(out, resMap, defaultResMap);
             out.format("    };\n\n");
         }
     }
@@ -181,7 +181,7 @@ public class MoreKeysResources {
         }
     }
 
-    private static void dumpLabelsInternal(final PrintStream out, final StringResourceMap resMap,
+    private static void dumpTextsInternal(final PrintStream out, final StringResourceMap resMap,
             final StringResourceMap defaultResMap) {
         final ArrayInitializerFormatter formatter =
                 new ArrayInitializerFormatter(out, 100, "        ");
@@ -235,7 +235,7 @@ public class MoreKeysResources {
         String t = text;
         t = replaceAll(t, "\\?", "?");
         t = replaceAll(t, "\\@", "@");
-        t = replaceAll(t, "@string/", "!label/");
+        t = replaceAll(t, "@string/", "!text/");
         return t;
     }
 
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResource.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java
index 793483ce1..568a896a9 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResource.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 public class StringResource {
     public final String mName;
diff --git a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResourceMap.java b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java
index 764421f10..6ceea5a37 100644
--- a/tools/makelabel/src/com/android/inputmethod/latin/makelabel/StringResourceMap.java
+++ b/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makelabel;
+package com.android.inputmethod.latin.maketext;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;