diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 387ed3945d66215375c7ef684eccc0401b414e41..e056a2601619357bf327ba990f35b10f5165beff 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -525,10 +525,10 @@ public final class KeyboardTextsTable {
         null, null, null, null, null, null, null, null, null, null,
         /* ~ more_keys_for_n */
         // Label for "switch to alphabetic" key.
-        // U+0623: "ا" ARABIC LETTER ALEF
+        // U+0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
         // U+200C: ZERO WIDTH NON-JOINER
         // U+0628: "ب" ARABIC LETTER BEH
-        // U+062C: "Ù¾" ARABIC LETTER PEH
+        // U+062C: "ج" ARABIC LETTER JEEM
         /* label_to_alpha_key */ "\u0623\u200C\u0628\u200C\u062C",
         /* more_keys_for_y ~ */
         null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
index 65b050be73d1007943c2c6d52a6f1e6cb4c258bb..6fbede8a7b8c6dc34c221a6c1ee62350045983d3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
@@ -95,10 +95,10 @@ public final class Arabic extends LayoutBase {
             return ARABIC_DIACRITICS;
         }
 
-        // U+0623: "ا" ARABIC LETTER ALEF
+        // U+0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
         // U+200C: ZERO WIDTH NON-JOINER
         // U+0628: "ب" ARABIC LETTER BEH
-        // U+062C: "Ù¾" ARABIC LETTER PEH
+        // U+062C: "ج" ARABIC LETTER JEEM
         private static final ExpectedKey ARABIC_ALPHABET_KEY = key(
                 "\u0623\u200C\u0628\u200C\u062C", Constants.CODE_SWITCH_ALPHA_SYMBOL);
         // U+0663: "Ù£" ARABIC-INDIC DIGIT THREE
@@ -107,10 +107,6 @@ public final class Arabic extends LayoutBase {
         // U+061F: "ØŸ" ARABIC QUESTION MARK
         private static final ExpectedKey ARABIC_SYMBOLS_KEY = key(
                 "\u0663\u0662\u0661\u061F", Constants.CODE_SWITCH_ALPHA_SYMBOL);
-        // U+0663: "Ù£" ARABIC-INDIC DIGIT THREE
-        // U+0662: "Ù¢" ARABIC-INDIC DIGIT TWO
-        // U+0661: "Ù¡" ARABIC-INDIC DIGIT ONE
-        // U+061F: "ØŸ" ARABIC QUESTION MARK
         private static final ExpectedKey ARABIC_BACK_TO_SYMBOLS_KEY = key(
                 "\u0663\u0662\u0661\u061F", Constants.CODE_SHIFT);
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
index 7c97df5af8980912a4ca8e68fe131b88d76830b9..fd76708278ff1e9e6bebc89503adce6d3ed24bbd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
@@ -25,7 +25,7 @@ import com.android.inputmethod.keyboard.layout.LayoutBase;
 import java.util.Locale;
 
 /**
- * ar: TestsArabic/arabic
+ * ar: Arabic/arabic
  */
 @SmallTest
 public class TestsArabic extends LayoutTestsBase {
diff --git a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
index d9976858a9fc89481f03a9fe1e223f1cbf67ea9d..4bbe343ce8e1519d8d48da6fc798bb43089954be 100644
--- a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
@@ -19,10 +19,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Label for "switch to alphabetic" key.
-         U+0623: "ا" ARABIC LETTER ALEF
+         U+0623: "Ø£" ARABIC LETTER ALEF WITH HAMZA ABOVE
          U+200C: ZERO WIDTH NON-JOINER
          U+0628: "ب" ARABIC LETTER BEH
-         U+062C: "Ù¾" ARABIC LETTER PEH -->
+         U+062C: "ج" ARABIC LETTER JEEM -->
     <string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>
     <!-- U+0661: "Ù¡" ARABIC-INDIC DIGIT ONE -->
     <string name="keylabel_for_symbols_1">&#x0661;</string>