Rename to Kelar Keyboard (org.kelar.inputmethod.latin)

1138 files changed, 3269 insertions, 3288 deletions

diff --git a/Android.bp b/Android.bp
index 64845db05..232b7a951 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,25 +32,25 @@ license {
 filegroup {
     name: "dicttool_deps",
     srcs: [
-        "java/src/com/android/inputmethod/latin/makedict/**/*.java",
+        "java/src/org/kelar/inputmethod/latin/makedict/**/*.java",
 
         // Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that
         // a significant part of the dependencies are mocked in the compat/ directory, with empty or
         // nearly-empty implementations, for parts that we don't use in Dicttool.
-        "java/src/com/android/inputmethod/latin/BinaryDictionary.java",
-        "java/src/com/android/inputmethod/latin/DicTraverseSession.java",
-        "java/src/com/android/inputmethod/latin/Dictionary.java",
-        "java/src/com/android/inputmethod/latin/NgramContext.java",
-        "java/src/com/android/inputmethod/latin/SuggestedWords.java",
-        "java/src/com/android/inputmethod/latin/settings/SettingsValuesForSuggestion.java",
-        "java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java",
-        "java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java",
-        "java/src/com/android/inputmethod/latin/utils/JniUtils.java",
+        "java/src/org/kelar/inputmethod/latin/BinaryDictionary.java",
+        "java/src/org/kelar/inputmethod/latin/DicTraverseSession.java",
+        "java/src/org/kelar/inputmethod/latin/Dictionary.java",
+        "java/src/org/kelar/inputmethod/latin/NgramContext.java",
+        "java/src/org/kelar/inputmethod/latin/SuggestedWords.java",
+        "java/src/org/kelar/inputmethod/latin/settings/SettingsValuesForSuggestion.java",
+        "java/src/org/kelar/inputmethod/latin/utils/BinaryDictionaryUtils.java",
+        "java/src/org/kelar/inputmethod/latin/utils/CombinedFormatUtils.java",
+        "java/src/org/kelar/inputmethod/latin/utils/JniUtils.java",
 
-        "java/src/com/android/inputmethod/latin/define/DebugFlags.java",
-        "java/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java",
+        "java/src/org/kelar/inputmethod/latin/define/DebugFlags.java",
+        "java/src/org/kelar/inputmethod/latin/define/DecoderSpecificConstants.java",
 
-        "tests/src/com/android/inputmethod/latin/utils/ByteArrayDictBuffer.java",
-        "tests/src/com/android/inputmethod/latin/makedict/**/*.java",
+        "tests/src/org/kelar/inputmethod/latin/utils/ByteArrayDictBuffer.java",
+        "tests/src/org/kelar/inputmethod/latin/makedict/**/*.java",
     ],
 }
diff --git a/build.gradle b/build.gradle
index 67f9a6ade..8fc357bb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,8 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    namespace 'com.android.inputmethod.latin'
+    namespace 'org.kelar.inputmethod.latin'
+    testNamespace = 'org.kelar.inputmethod.latin.tests'
     compileSdk 34
 
     // Required if using classes in android.test.runner
@@ -28,8 +29,8 @@ android {
         targetSdk 34
         versionName "1.0"
 
-        applicationId 'com.android.inputmethod.latin'
-        testApplicationId 'com.android.inputmethod.latin.tests'
+        applicationId 'org.kelar.inputmethod.latin'
+        testApplicationId 'org.kelar.inputmethod.latin.tests'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = false
 
diff --git a/common/src/com/android/inputmethod/annotations/ExternallyReferenced.java b/common/src/org/kelar/inputmethod/annotations/ExternallyReferenced.java
index ea5f12ce2..b3dfc06d7 100644
--- a/common/src/com/android/inputmethod/annotations/ExternallyReferenced.java
+++ b/common/src/org/kelar/inputmethod/annotations/ExternallyReferenced.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.annotations;
+package org.kelar.inputmethod.annotations;
 
 /**
  * Denotes that the class, method or field should not be eliminated by ProGuard,
diff --git a/common/src/com/android/inputmethod/annotations/UsedForTesting.java b/common/src/org/kelar/inputmethod/annotations/UsedForTesting.java
index 2ada091e4..f117f7480 100644
--- a/common/src/com/android/inputmethod/annotations/UsedForTesting.java
+++ b/common/src/org/kelar/inputmethod/annotations/UsedForTesting.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.annotations;
+package org.kelar.inputmethod.annotations;
 
 /**
  * Denotes that the class, method or field should not be eliminated by ProGuard,
diff --git a/common/src/com/android/inputmethod/latin/common/CodePointUtils.java b/common/src/org/kelar/inputmethod/latin/common/CodePointUtils.java
index ec59de850..9f6970526 100644
--- a/common/src/com/android/inputmethod/latin/common/CodePointUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/CodePointUtils.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.Random;
 
diff --git a/common/src/com/android/inputmethod/latin/common/CollectionUtils.java b/common/src/org/kelar/inputmethod/latin/common/CollectionUtils.java
index 80fae5f51..ead46575f 100644
--- a/common/src/com/android/inputmethod/latin/common/CollectionUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/CollectionUtils.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/common/src/com/android/inputmethod/latin/common/ComposedData.java b/common/src/org/kelar/inputmethod/latin/common/ComposedData.java
index 7f0966050..69309456f 100644
--- a/common/src/com/android/inputmethod/latin/common/ComposedData.java
+++ b/common/src/org/kelar/inputmethod/latin/common/ComposedData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import javax.annotation.Nonnull;
 
diff --git a/common/src/com/android/inputmethod/latin/common/Constants.java b/common/src/org/kelar/inputmethod/latin/common/Constants.java
index b491c8cfd..9044d1590 100644
--- a/common/src/com/android/inputmethod/latin/common/Constants.java
+++ b/common/src/org/kelar/inputmethod/latin/common/Constants.java
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.KeyboardActionListener;
+import org.kelar.inputmethod.keyboard.internal.BatchInputArbiter;
+import org.kelar.inputmethod.keyboard.internal.KeyboardCodesSet;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import javax.annotation.Nonnull;
 
@@ -65,7 +69,7 @@ public final class Constants {
         /**
          * The private IME option used to suppress the floating gesture preview for a given text
          * field. This overrides the corresponding keyboard settings preference.
-         * {@link com.android.inputmethod.latin.settings.SettingsValues#mGestureFloatingPreviewTextEnabled}
+         * {@link SettingsValues#mGestureFloatingPreviewTextEnabled}
          */
         public static final String NO_FLOATING_GESTURE_PREVIEW = "noGestureFloatingPreview";
 
@@ -191,7 +195,7 @@ public final class Constants {
 
     /**
      * Custom request code used in
-     * {@link com.android.inputmethod.keyboard.KeyboardActionListener#onCustomRequest(int)}.
+     * {@link KeyboardActionListener#onCustomRequest(int)}.
      */
     // The code to show input method picker.
     public static final int CUSTOM_CODE_SHOW_INPUT_METHOD_PICKER = 1;
@@ -229,7 +233,7 @@ public final class Constants {
     /**
      * Special keys code. Must be negative.
      * These should be aligned with constants in
-     * {@link com.android.inputmethod.keyboard.internal.KeyboardCodesSet}.
+     * {@link KeyboardCodesSet}.
      */
     public static final int CODE_SHIFT = -1;
     public static final int CODE_CAPSLOCK = -2;
@@ -295,7 +299,7 @@ public final class Constants {
 
     /**
      * Screen metrics (a.k.a. Device form factor) constants of
-     * {@link com.android.inputmethod.latin.R.integer#config_screen_metrics}.
+     * {@link org.kelar.inputmethod.latin.R.integer#config_screen_metrics}.
      */
     public static final int SCREEN_METRICS_SMALL_PHONE = 0;
     public static final int SCREEN_METRICS_LARGE_PHONE = 1;
@@ -316,7 +320,7 @@ public final class Constants {
 
     /**
      * Default capacity of gesture points container.
-     * This constant is used by {@link com.android.inputmethod.keyboard.internal.BatchInputArbiter}
+     * This constant is used by {@link BatchInputArbiter}
      * and etc. to preallocate regions that contain gesture event points.
      */
     public static final int DEFAULT_GESTURE_POINTS_CAPACITY = 128;
diff --git a/common/src/com/android/inputmethod/latin/common/CoordinateUtils.java b/common/src/org/kelar/inputmethod/latin/common/CoordinateUtils.java
index 031662411..ec46f743e 100644
--- a/common/src/com/android/inputmethod/latin/common/CoordinateUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/CoordinateUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import javax.annotation.Nonnull;
 
diff --git a/common/src/com/android/inputmethod/latin/common/FileUtils.java b/common/src/org/kelar/inputmethod/latin/common/FileUtils.java
index e593c9932..8696f26c1 100644
--- a/common/src/com/android/inputmethod/latin/common/FileUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/FileUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/common/src/com/android/inputmethod/latin/common/InputPointers.java b/common/src/org/kelar/inputmethod/latin/common/InputPointers.java
index 4b2ae7e76..3ee1dbe92 100644
--- a/common/src/com/android/inputmethod/latin/common/InputPointers.java
+++ b/common/src/org/kelar/inputmethod/latin/common/InputPointers.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import javax.annotation.Nonnull;
 
diff --git a/common/src/com/android/inputmethod/latin/common/LocaleUtils.java b/common/src/org/kelar/inputmethod/latin/common/LocaleUtils.java
index d5878c024..2ed3f1b85 100644
--- a/common/src/com/android/inputmethod/latin/common/LocaleUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/LocaleUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/common/src/com/android/inputmethod/latin/common/NativeSuggestOptions.java b/common/src/org/kelar/inputmethod/latin/common/NativeSuggestOptions.java
index d673442ca..fe7ed9e8e 100644
--- a/common/src/com/android/inputmethod/latin/common/NativeSuggestOptions.java
+++ b/common/src/org/kelar/inputmethod/latin/common/NativeSuggestOptions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 public class NativeSuggestOptions {
     // Need to update suggest_options.h when you add, remove or reorder options.
diff --git a/common/src/com/android/inputmethod/latin/common/ResizableIntArray.java b/common/src/org/kelar/inputmethod/latin/common/ResizableIntArray.java
index 77f5c4cd5..74a1779fe 100644
--- a/common/src/com/android/inputmethod/latin/common/ResizableIntArray.java
+++ b/common/src/org/kelar/inputmethod/latin/common/ResizableIntArray.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.Arrays;
 
diff --git a/common/src/com/android/inputmethod/latin/common/StringUtils.java b/common/src/org/kelar/inputmethod/latin/common/StringUtils.java
index 572f0cd9b..efbecd328 100644
--- a/common/src/com/android/inputmethod/latin/common/StringUtils.java
+++ b/common/src/org/kelar/inputmethod/latin/common/StringUtils.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/common/src/com/android/inputmethod/latin/common/UnicodeSurrogate.java b/common/src/org/kelar/inputmethod/latin/common/UnicodeSurrogate.java
index 10974634d..3221606b2 100644
--- a/common/src/com/android/inputmethod/latin/common/UnicodeSurrogate.java
+++ b/common/src/org/kelar/inputmethod/latin/common/UnicodeSurrogate.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 /**
  * Emojis are supplementary characters expressed as a low+high pair. For instance,
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 633c68be3..03f5fecd8 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -15,13 +15,9 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     coreApp="true"
-     package="com.android.inputmethod.latin"
+     package="org.kelar.inputmethod.latin"
      android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21"
-         android:targetSdkVersion="30"/>
-
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
@@ -37,21 +33,21 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY"/>
 
-    <!-- A signature-protected permission to ask AOSP Keyboard to close the software keyboard.
+    <!-- A signature-protected permission to ask Kelar Keyboard to close the software keyboard.
                  To use this, add the following line into calling application's AndroidManifest.xml
          <pre>
                       {@code
-         <uses-permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"/>
+         <uses-permission android:name="org.kelar.inputmethod.latin.HIDE_SOFT_INPUT"/>
                       }
          </pre>
                       then call {@link android.content.Context#sendBroadcast(Intent)} as follows:
          <pre>
                       {@code
-                      sendBroadcast(new Intent("com.android.inputmethod.latin.HIDE_SOFT_INPUT")
-                              .setPackage("com.android.inputmethod.latin"));
+                      sendBroadcast(new Intent("org.kelar.inputmethod.latin.HIDE_SOFT_INPUT")
+                              .setPackage("org.kelar.inputmethod.latin"));
                       }
          </pre> -->
-    <permission android:name="com.android.inputmethod.latin.HIDE_SOFT_INPUT"
+    <permission android:name="org.kelar.inputmethod.latin.HIDE_SOFT_INPUT"
          android:protectionLevel="signature"/>
 
     <!-- To query enabled input methods. -->
@@ -92,7 +88,7 @@
                  android:resource="@xml/spellchecker"/>
         </service>
 
-        <service android:name="com.android.inputmethod.dictionarypack.DictionaryService"
+        <service android:name="org.kelar.inputmethod.dictionarypack.DictionaryService"
              android:label="@string/dictionary_service_name">
         </service>
 
@@ -144,7 +140,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
+        <activity android:name="org.kelar.inputmethod.dictionarypack.DictionarySettingsActivity"
              android:theme="@style/platformSettingsTheme"
              android:label="@string/dictionary_settings_title"
              android:uiOptions="splitActionBarWhenNarrow"
@@ -154,7 +150,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog"
+        <activity android:name="org.kelar.inputmethod.dictionarypack.DownloadOverMeteredDialog"
              android:theme="@style/platformActivityTheme"
              android:label="@string/dictionary_install_over_metered_network_prompt"
              android:exported="false">
@@ -181,17 +177,17 @@
         <receiver android:name="DictionaryPackInstallBroadcastReceiver"
              android:exported="false">
             <intent-filter>
-                <action android:name="com.android.inputmethod.dictionarypack.aosp.UNKNOWN_CLIENT"/>
+                <action android:name="org.kelar.inputmethod.dictionarypack.aosp.UNKNOWN_CLIENT"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.inputmethod.dictionarypack.EventHandler"
+        <receiver android:name="org.kelar.inputmethod.dictionarypack.EventHandler"
              android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
                 <action android:name="android.intent.action.DATE_CHANGED"/>
-                <action android:name="com.android.inputmethod.dictionarypack.aosp.UPDATE_NOW"/>
-                <action android:name="com.android.inputmethod.dictionarypack.aosp.INIT_AND_UPDATE_NOW"/>
+                <action android:name="org.kelar.inputmethod.dictionarypack.aosp.UPDATE_NOW"/>
+                <action android:name="org.kelar.inputmethod.dictionarypack.aosp.INIT_AND_UPDATE_NOW"/>
             </intent-filter>
         </receiver>
 
@@ -204,7 +200,7 @@
         </receiver>
 
         <!-- Content providers -->
-        <provider android:name="com.android.inputmethod.dictionarypack.DictionaryProvider"
+        <provider android:name="org.kelar.inputmethod.dictionarypack.DictionaryProvider"
              android:grantUriPermissions="true"
              android:exported="false"
              android:authorities="@string/authority"
diff --git a/java/AndroidManifest_SdkVersion.xml b/java/AndroidManifest_SdkVersion.xml
index a843e83bb..2b39fdeac 100644
--- a/java/AndroidManifest_SdkVersion.xml
+++ b/java/AndroidManifest_SdkVersion.xml
@@ -15,6 +15,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.inputmethod.latin">
+        package="org.kelar.inputmethod.latin">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 </manifest>
diff --git a/java/lint-baseline.xml b/java/lint-baseline.xml
index 7e70f0136..c920eb82c 100644
--- a/java/lint-baseline.xml
+++ b/java/lint-baseline.xml
@@ -7,7 +7,7 @@
         errorLine1="            return paint.hasGlyph(switzerland);"
         errorLine2="                         ~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategory.java"
             line="445"
             column="26"/>
     </issue>
@@ -18,7 +18,7 @@
         errorLine1="            return paint.hasGlyph(cheese);"
         errorLine2="                         ~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategory.java"
             line="461"
             column="26"/>
     </issue>
@@ -29,7 +29,7 @@
         errorLine1="        final WindowManager wm = getSystemService(WindowManager.class);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/latin/LatinIME.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/latin/LatinIME.java"
             line="605"
             column="34"/>
     </issue>
@@ -40,7 +40,7 @@
         errorLine1="                ActivityOptions.makeBasic().setLaunchDisplayId(currentDisplayId).toBundle());"
         errorLine2="                                ~~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/latin/LatinIME.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/latin/LatinIME.java"
             line="1857"
             column="33"/>
     </issue>
@@ -51,7 +51,7 @@
         errorLine1="                ActivityOptions.makeBasic().setLaunchDisplayId(currentDisplayId).toBundle());"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/latin/LatinIME.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/latin/LatinIME.java"
             line="1857"
             column="45"/>
     </issue>
@@ -62,9 +62,9 @@
         errorLine1="        final UserManager userManager = context.getSystemService(UserManager.class);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/inputmethods/LatinIME/java/src/com/android/inputmethod/compat/UserManagerCompatUtils.java"
+            file="packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/compat/UserManagerCompatUtils.java"
             line="69"
             column="49"/>
     </issue>
 
-</issues>
\ No newline at end of file
+</issues>
diff --git a/java/proguard.flags b/java/proguard.flags
index 0ebca04de..94d4dbd6e 100644
--- a/java/proguard.flags
+++ b/java/proguard.flags
@@ -1,19 +1,19 @@
 # Keep classes and methods that have the @UsedForTesting annotation
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep @com.android.inputmethod.annotations.UsedForTesting class * {
+-keep @org.kelar.inputmethod.annotations.UsedForTesting class * {
     void <init>();
 }
 -keepclassmembers class * {
-    @com.android.inputmethod.annotations.UsedForTesting *;
+    @org.kelar.inputmethod.annotations.UsedForTesting *;
 }
 
 # Keep classes and methods that have the @ExternallyReferenced annotation
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep @com.android.inputmethod.annotations.ExternallyReferenced class * {
+-keep @org.kelar.inputmethod.annotations.ExternallyReferenced class * {
     void <init>();
 }
 -keepclassmembers class * {
-    @com.android.inputmethod.annotations.ExternallyReferenced *;
+    @org.kelar.inputmethod.annotations.ExternallyReferenced *;
 }
 
 # Keep native methods
@@ -24,26 +24,26 @@
 # Keep classes that are used as a parameter type of methods that are also marked as keep
 # to preserve changing those methods' signature.
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep class com.android.inputmethod.latin.AssetFileAddress {
+-keep class org.kelar.inputmethod.latin.AssetFileAddress {
     void <init>();
 }
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep class com.android.inputmethod.latin.Dictionary {
+-keep class org.kelar.inputmethod.latin.Dictionary {
     void <init>();
 }
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep class com.android.inputmethod.latin.NgramContext {
+-keep class org.kelar.inputmethod.latin.NgramContext {
     void <init>();
 }
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep class com.android.inputmethod.latin.makedict.ProbabilityInfo {
+-keep class org.kelar.inputmethod.latin.makedict.ProbabilityInfo {
     void <init>();
 }
 # TODO(b/373579455): Evaluate if <init> needs to be kept.
--keep class com.android.inputmethod.latin.utils.LanguageModelParam {
+-keep class org.kelar.inputmethod.latin.utils.LanguageModelParam {
     void <init>();
 }
 
 # TODO: remove once used in code.
--keep class com.android.inputmethod.keyboard.KeyboardLayout { *; }
+-keep class org.kelar.inputmethod.keyboard.KeyboardLayout { *; }
 
diff --git a/java/res/drawable/keyboard_key_feedback_ics.xml b/java/res/drawable/keyboard_key_feedback_ics.xml
index b52a61fbf..cd42a1433 100644
--- a/java/res/drawable/keyboard_key_feedback_ics.xml
+++ b/java/res/drawable/keyboard_key_feedback_ics.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/java/res/drawable/keyboard_key_feedback_klp.xml b/java/res/drawable/keyboard_key_feedback_klp.xml
index a38655641..bd197071b 100644
--- a/java/res/drawable/keyboard_key_feedback_klp.xml
+++ b/java/res/drawable/keyboard_key_feedback_klp.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/java/res/drawable/keyboard_key_feedback_lxx_dark.xml b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
index ab1109bcc..dc3a3d3a6 100644
--- a/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
+++ b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/java/res/drawable/keyboard_key_feedback_lxx_light.xml b/java/res/drawable/keyboard_key_feedback_lxx_light.xml
index f4341c9b5..1d5de96df 100644
--- a/java/res/drawable/keyboard_key_feedback_lxx_light.xml
+++ b/java/res/drawable/keyboard_key_feedback_lxx_light.xml
@@ -16,7 +16,7 @@
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Left edge -->
     <item latin:state_left_edge="true" latin:state_has_morekeys="true"
diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml
index bb1843d6c..e6d3ff8f0 100644
--- a/java/res/layout/dictionary_line.xml
+++ b/java/res/layout/dictionary_line.xml
@@ -66,7 +66,7 @@
           android:textColor="?android:attr/textColorSecondary"
           android:maxLines="1" />
 
-      <com.android.inputmethod.dictionarypack.DictionaryDownloadProgressBar
+      <org.kelar.inputmethod.dictionarypack.DictionaryDownloadProgressBar
           android:id="@+id/dictionary_line_progress_bar"
           style="@android:style/Widget.Holo.ProgressBar.Horizontal"
           android:layout_width="match_parent"
@@ -76,7 +76,7 @@
     </FrameLayout>
   </LinearLayout>
 
-  <com.android.inputmethod.dictionarypack.ButtonSwitcher
+  <org.kelar.inputmethod.dictionarypack.ButtonSwitcher
       android:id="@+id/wordlist_button_switcher"
       android:layout_weight="0"
       android:layout_marginStart="13dip"
@@ -107,5 +107,5 @@
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/delete_dict" />
-  </com.android.inputmethod.dictionarypack.ButtonSwitcher>
+  </org.kelar.inputmethod.dictionarypack.ButtonSwitcher>
 </LinearLayout>
diff --git a/java/res/layout/emoji_keyboard_page.xml b/java/res/layout/emoji_keyboard_page.xml
index 0d1086171..67f6f3f3e 100644
--- a/java/res/layout/emoji_keyboard_page.xml
+++ b/java/res/layout/emoji_keyboard_page.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.keyboard.emoji.EmojiPageKeyboardView
+<org.kelar.inputmethod.keyboard.emoji.EmojiPageKeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/emoji_keyboard_page"
     android:layoutDirection="ltr"
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 7c5f6c0a6..69ff74386 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.keyboard.emoji.EmojiPalettesView
+<org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
         android:id="@+id/emoji_keyboard_pager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-    <com.android.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView
+    <org.kelar.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView
         android:id="@+id/emoji_category_page_id_view"
         android:layout_width="match_parent"
         android:layout_height="2dip" />
@@ -129,4 +129,4 @@
             android:hapticFeedbackEnabled="false"
             android:soundEffectsEnabled="false" />
     </LinearLayout>
-</com.android.inputmethod.keyboard.emoji.EmojiPalettesView>
+</org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView>
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index ae3c19db5..3d80533de 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<com.android.inputmethod.latin.InputView
+<org.kelar.inputmethod.latin.InputView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -29,4 +29,4 @@
     <include
         android:id="@+id/emoji_palettes_view"
         layout="@layout/emoji_palettes_view" />
-</com.android.inputmethod.latin.InputView>
+</org.kelar.inputmethod.latin.InputView>
diff --git a/java/res/layout/main_keyboard_frame.xml b/java/res/layout/main_keyboard_frame.xml
index ebf746679..95b36639d 100644
--- a/java/res/layout/main_keyboard_frame.xml
+++ b/java/res/layout/main_keyboard_frame.xml
@@ -27,7 +27,7 @@
 
     <!-- To ensure that key preview popup is correctly placed when the current system locale is
          one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
-    <com.android.inputmethod.latin.suggestions.SuggestionStripView
+    <org.kelar.inputmethod.latin.suggestions.SuggestionStripView
         android:id="@+id/suggestion_strip_view"
         android:layoutDirection="ltr"
         android:layout_width="match_parent"
@@ -37,7 +37,7 @@
 
     <!-- To ensure that key preview popup is correctly placed when the current system locale is
          one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->
-    <com.android.inputmethod.keyboard.MainKeyboardView
+    <org.kelar.inputmethod.keyboard.MainKeyboardView
         android:id="@+id/keyboard_view"
         android:layoutDirection="ltr"
         android:layout_width="match_parent"
diff --git a/java/res/layout/more_keys_keyboard.xml b/java/res/layout/more_keys_keyboard.xml
index 449c00f92..02956a1d3 100644
--- a/java/res/layout/more_keys_keyboard.xml
+++ b/java/res/layout/more_keys_keyboard.xml
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.keyboard.MoreKeysKeyboardView
+    <org.kelar.inputmethod.keyboard.MoreKeysKeyboardView
         android:id="@+id/more_keys_keyboard_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/more_keys_keyboard_for_action_lxx.xml b/java/res/layout/more_keys_keyboard_for_action_lxx.xml
index d23faa4f0..09157c13c 100644
--- a/java/res/layout/more_keys_keyboard_for_action_lxx.xml
+++ b/java/res/layout/more_keys_keyboard_for_action_lxx.xml
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.keyboard.MoreKeysKeyboardView
+    <org.kelar.inputmethod.keyboard.MoreKeysKeyboardView
         android:id="@+id/more_keys_keyboard_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/more_suggestions.xml b/java/res/layout/more_suggestions.xml
index 0869992c9..06dd77aa5 100644
--- a/java/res/layout/more_suggestions.xml
+++ b/java/res/layout/more_suggestions.xml
@@ -24,8 +24,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
 >
-    <com.android.inputmethod.latin.suggestions.MoreSuggestionsView
-        xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    <org.kelar.inputmethod.latin.suggestions.MoreSuggestionsView
+        xmlns:latin="http://schemas.android.com/apk/res-auto"
         android:id="@+id/more_suggestions_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/setup_start_indicator_label.xml b/java/res/layout/setup_start_indicator_label.xml
index 33854bb44..dd5acf09c 100644
--- a/java/res/layout/setup_start_indicator_label.xml
+++ b/java/res/layout/setup_start_indicator_label.xml
@@ -19,14 +19,14 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <view class="com.android.inputmethod.latin.setup.SetupStartIndicatorView$LabelView"
+    <view class="org.kelar.inputmethod.latin.setup.SetupStartIndicatorView$LabelView"
         android:id="@+id/setup_start_label"
         android:text="@string/setup_start_action"
         android:gravity="end|center_vertical"
         android:layout_width="0dp"
         android:layout_weight="1.0"
         style="@style/setupStepActionLabelStyleCommon" />
-    <view class="com.android.inputmethod.latin.setup.SetupStartIndicatorView$IndicatorView"
+    <view class="org.kelar.inputmethod.latin.setup.SetupStartIndicatorView$IndicatorView"
         android:id="@+id/setup_start_indicator"
         style="@style/setupStepStartIndicatorStyle" />
 </merge>
diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml
index 9b03a3e93..06792fae3 100644
--- a/java/res/layout/setup_steps_cards.xml
+++ b/java/res/layout/setup_steps_cards.xml
@@ -38,7 +38,7 @@
             style="@style/setupStepBulletStyle"
             android:text="@string/setup_step3_bullet" />
     </LinearLayout>
-    <com.android.inputmethod.latin.setup.SetupStepIndicatorView
+    <org.kelar.inputmethod.latin.setup.SetupStepIndicatorView
         android:id="@+id/setup_step_indicator"
         style="@style/setupStepIndicatorStyle" />
     <FrameLayout
diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml
index 01c25ea8e..c391561e3 100644
--- a/java/res/layout/setup_welcome_video.xml
+++ b/java/res/layout/setup_welcome_video.xml
@@ -51,7 +51,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp" />
     </LinearLayout>
-    <com.android.inputmethod.latin.setup.SetupStartIndicatorView
+    <org.kelar.inputmethod.latin.setup.SetupStartIndicatorView
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 </merge>
diff --git a/java/res/values-en-rAU/strings-appname.xml b/java/res/values-en-rAU/strings-appname.xml
index f37c98141..810138b08 100644
--- a/java/res/values-en-rAU/strings-appname.xml
+++ b/java/res/values-en-rAU/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"Android Keyboard (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"Android Spell Checker (AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"Android Keyboard Settings (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Android Spell Checker Settings (AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"Kelar Keyboard"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"Kelar Spell Checker"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"Kelar Keyboard Settings"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Kelar Spell Checker Settings"</string>
 </resources>
diff --git a/java/res/values-en-rCA/strings-appname.xml b/java/res/values-en-rCA/strings-appname.xml
index f37c98141..810138b08 100644
--- a/java/res/values-en-rCA/strings-appname.xml
+++ b/java/res/values-en-rCA/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"Android Keyboard (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"Android Spell Checker (AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"Android Keyboard Settings (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Android Spell Checker Settings (AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"Kelar Keyboard"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"Kelar Spell Checker"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"Kelar Keyboard Settings"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Kelar Spell Checker Settings"</string>
 </resources>
diff --git a/java/res/values-en-rGB/strings-appname.xml b/java/res/values-en-rGB/strings-appname.xml
index f37c98141..810138b08 100644
--- a/java/res/values-en-rGB/strings-appname.xml
+++ b/java/res/values-en-rGB/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"Android Keyboard (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"Android Spell Checker (AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"Android Keyboard Settings (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Android Spell Checker Settings (AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"Kelar Keyboard"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"Kelar Spell Checker"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"Kelar Keyboard Settings"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Kelar Spell Checker Settings"</string>
 </resources>
diff --git a/java/res/values-en-rIN/strings-appname.xml b/java/res/values-en-rIN/strings-appname.xml
index f37c98141..810138b08 100644
--- a/java/res/values-en-rIN/strings-appname.xml
+++ b/java/res/values-en-rIN/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"Android Keyboard (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"Android Spell Checker (AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"Android Keyboard Settings (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Android Spell Checker Settings (AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"Kelar Keyboard"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"Kelar Spell Checker"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"Kelar Keyboard Settings"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Kelar Spell Checker Settings"</string>
 </resources>
diff --git a/java/res/values-en-rXC/strings-appname.xml b/java/res/values-en-rXC/strings-appname.xml
index b5412726e..9f311218d 100644
--- a/java/res/values-en-rXC/strings-appname.xml
+++ b/java/res/values-en-rXC/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎Android Keyboard (AOSP)‎‏‎‎‏‎"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎Android Spell Checker (AOSP)‎‏‎‎‏‎"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎Android Keyboard Settings (AOSP)‎‏‎‎‏‎"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎Android Spell Checker Settings (AOSP)‎‏‎‎‏‎"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎Kelar Keyboard‎‏‎‎‏‎"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎Kelar Spell Checker‎‏‎‎‏‎"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎Kelar Keyboard Settings‎‏‎‎‏‎"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎Kelar Spell Checker Settings‎‏‎‎‏‎"</string>
 </resources>
diff --git a/java/res/values-fa/strings-appname.xml b/java/res/values-fa/strings-appname.xml
index 32bbaeda2..9d500476a 100644
--- a/java/res/values-fa/strings-appname.xml
+++ b/java/res/values-fa/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"‏صفحه‌کلید Android ‏(AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"‏غلط‌گیر Android ‏(AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"‏تنظیمات صفحه‌کلید Android ‏(AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"‏تنظیمات غلط‌گیر Android ‏(AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"‏صفحه‌کلید کلار"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"‏غلط‌گیر کلار"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"‏تنظیمات صفحه‌کلید کلار"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"‏تنظیمات غلط‌گیر کلار"</string>
 </resources>
diff --git a/java/res/values-sw600dp/touch-position-correction.xml b/java/res/values-sw600dp/touch-position-correction.xml
index 6aaa605a6..c50ec5bb7 100644
--- a/java/res/values-sw600dp/touch-position-correction.xml
+++ b/java/res/values-sw600dp/touch-position-correction.xml
@@ -18,7 +18,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Note that correctionX is obsolete (See com.android.inputmethod.keyboard.internal.TouchPositionCorrection)
+    <!-- Note that correctionX is obsolete (See org.kelar.inputmethod.keyboard.internal.TouchPositionCorrection)
         An entry of the touch_position_correction word should be:
         1. correctionX: (touch_center_x - hitbox_center_x) / hitbox_width
         2. correctionY: (touch_center_y - hitbox_center_y) / hitbox_height
@@ -29,7 +29,7 @@
         name="touch_position_correction_data_default"
         translatable="false"
     >
-        <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo)
+        <!-- The default touch position data (See org.kelar.inputmethod.keyboard.ProximityInfo)
              correctionX = 0.0f
              correctionY = 0.0f
              correctionR = DEFAULT_TOUCH_POSITION_CORRECTION_RADIUS
@@ -40,7 +40,7 @@
         name="touch_position_correction_data_holo"
         translatable="false"
     >
-        <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo)
+        <!-- The default touch position data (See org.kelar.inputmethod.keyboard.ProximityInfo)
              correctionX = 0.0f
              correctionY = 0.0f
              correctionR = DEFAULT_TOUCH_POSITION_CORRECTION_RADIUS
diff --git a/java/res/values-tl/strings-appname.xml b/java/res/values-tl/strings-appname.xml
index 76e5096eb..b6e9ab026 100644
--- a/java/res/values-tl/strings-appname.xml
+++ b/java/res/values-tl/strings-appname.xml
@@ -20,8 +20,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="english_ime_name" msgid="4475547506953371028">"Android Keyboard (AOSP)"</string>
-    <string name="spell_checker_service_name" msgid="7417621022652876777">"Spell Checker ng Android (AOSP)"</string>
-    <string name="english_ime_settings" msgid="1497566567404939275">"Mga Setting ng Android Keyboard (AOSP)"</string>
-    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Mga Setting ng Spell Checker ng Android (AOSP)"</string>
+    <string name="english_ime_name" msgid="4475547506953371028">"Kelar Keyboard"</string>
+    <string name="spell_checker_service_name" msgid="7417621022652876777">"Kelar Spell Checker"</string>
+    <string name="english_ime_settings" msgid="1497566567404939275">"Mga Setting ng Kelar Keyboard"</string>
+    <string name="android_spell_checker_settings" msgid="2821003654878860820">"Mga Setting ng Kelar Spell Checker"</string>
 </resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 8ff5a87cd..c73c29f68 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -214,7 +214,7 @@
     <declare-styleable name="SuggestionStripView">
         <attr name="suggestionStripOptions" format="integer">
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.latin.suggestions.SuggestionStripLayoutHelper.AUTO_CORRECT_BOLD} etc. -->
+                 {@link org.kelar.inputmethod.latin.suggestions.SuggestionStripLayoutHelper.AUTO_CORRECT_BOLD} etc. -->
             <flag name="autoCorrectBold" value="0x01" />
             <flag name="autoCorrectUnderline" value="0x02" />
             <flag name="validTypedWordBold" value="0x04" />
@@ -233,7 +233,7 @@
     <declare-styleable name="Keyboard">
         <attr name="themeId" format="enum">
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
+                 {@link org.kelar.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
             <enum name="ICS" value="0" />
             <enum name="KLP" value="2" />
             <enum name="LXXLight" value="3" />
@@ -256,7 +256,7 @@
         <!-- More keys keyboard layout template -->
         <attr name="moreKeysTemplate" format="reference" />
         <!-- Icon set for key top and key preview. These should be aligned with
-             {@link com.android.inputmethod.keyboard.internal.KeyboardIconsSet#NAMES_AND_ATTR_IDS} -->
+             {@link org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet#NAMES_AND_ATTR_IDS} -->
         <attr name="iconShiftKey" format="reference" />
         <attr name="iconDeleteKey" format="reference" />
         <attr name="iconSettingsKey" format="reference" />
@@ -303,7 +303,7 @@
         <attr name="maxMoreKeysColumn" format="integer" />
         <attr name="backgroundType" format="enum">
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.keyboard.Key#BACKGROUND_TYPE_NORMAL} etc. -->
+                 {@link org.kelar.inputmethod.keyboard.Key#BACKGROUND_TYPE_NORMAL} etc. -->
             <enum name="empty" value="0" />
             <enum name="normal" value="1" />
             <enum name="functional" value="2" />
@@ -315,7 +315,7 @@
         <!-- The key action flags. -->
         <attr name="keyActionFlags" format="integer">
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.keyboard.Key#ACTION_FLAGS_IS_REPEATABLE} etc. -->
+                 {@link org.kelar.inputmethod.keyboard.Key#ACTION_FLAGS_IS_REPEATABLE} etc. -->
             <flag name="isRepeatable" value="0x01" />
             <flag name="noKeyPreview" value="0x02" />
             <flag name="altCodeWhileTyping" value="0x04" />
@@ -330,7 +330,7 @@
         <!-- The key label flags. -->
         <attr name="keyLabelFlags" format="integer">
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.keyboard.Key#LABEL_FLAGS_FONT_NORMAL} etc. -->
+                 {@link org.kelar.inputmethod.keyboard.Key#LABEL_FLAGS_FONT_NORMAL} etc. -->
             <flag name="alignHintLabelToBottom" value="0x02" />
             <flag name="alignIconToBottom" value="0x04" />
             <flag name="alignLabelOffCenter" value="0x08" />
@@ -376,7 +376,7 @@
              If the value is fillRight, the actual key width will be determined to fill out the
              area up to the right edge of the keyboard. -->
         <!-- This should be aligned with
-             {@link com.android.inputmethod.keyboard.internal.KeyboardRow#KEYWIDTH_FILL_RIGHT}. -->
+             {@link org.kelar.inputmethod.keyboard.internal.KeyboardRow#KEYWIDTH_FILL_RIGHT}. -->
         <attr name="keyWidth" format="fraction|enum">
             <enum name="fillRight" value="-1" />
         </attr>
@@ -410,11 +410,11 @@
         <attr name="keyShiftedLetterHintRatio" format="fraction" />
         <!-- The label's horizontal offset to the center of the key. Negative is to left and
              positive is to right. The value is in proportion of the width of
-             {@link com.android.inputmethod.latin.utils.TypefaceUtils#KEY_LABEL_REFERENCE_CHAR}. -->
+             {@link org.kelar.inputmethod.latin.utils.TypefaceUtils#KEY_LABEL_REFERENCE_CHAR}. -->
         <attr name="keyLabelOffCenterRatio" format="fraction" />
         <!-- The hint label's horizontal offset to the center of the key. Negative is to left and
              positive is to right. The value is in proportion of the width of
-             {@link com.android.inputmethod.latin.utils.TypefaceUtils#KEY_LABEL_REFERENCE_CHAR}. -->
+             {@link org.kelar.inputmethod.latin.utils.TypefaceUtils#KEY_LABEL_REFERENCE_CHAR}. -->
         <attr name="keyHintLabelOffCenterRatio" format="fraction" />
         <!-- Color to use for the label in a key. -->
         <attr name="keyTextColor" format="color" />
@@ -445,7 +445,7 @@
     <declare-styleable name="Keyboard_Case">
         <attr name="keyboardLayoutSet" format="string" />
         <!-- This should be aligned with
-             {@link com.android.inputmethod.keyboard.KeyboardId#ELEMENT_ALPHABET} etc. -->
+             {@link org.kelar.inputmethod.keyboard.KeyboardId#ELEMENT_ALPHABET} etc. -->
         <attr name="keyboardLayoutSetElement" format="enum|string">
             <enum name="alphabet" value="0" />
             <enum name="alphabetManualShifted" value="1" />
@@ -476,7 +476,7 @@
             <enum name="emojiCategory16" value="26" />
         </attr>
         <!-- This should be aligned with Keyboard.themeId and
-             {@link com.android.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
+             {@link org.kelar.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
         <attr name="keyboardTheme" format="enum|string">
             <enum name="ICS" value="0" />
             <enum name="KLP" value="2" />
@@ -484,7 +484,7 @@
             <enum name="LXXDark" value="4" />
         </attr>
         <!-- This should be aligned with
-             {@link com.android.inputmethod.keyboard.KeyboardId#MODE_TEXT} etc. -->
+             {@link org.kelar.inputmethod.keyboard.KeyboardId#MODE_TEXT} etc. -->
         <attr name="mode" format="enum|string">
             <enum name="text" value="0" />
             <enum name="url" value="1" />
@@ -512,7 +512,7 @@
             <enum name="actionDone" value="6" />
             <enum name="actionPrevious" value="7" />
             <!-- This should be aligned with
-                 {@link com.android.inputmethod.latin.utils.InputTypeUtils#IME_ACTION_CUSTOM_LABEL}. -->
+                 {@link org.kelar.inputmethod.latin.utils.InputTypeUtils#IME_ACTION_CUSTOM_LABEL}. -->
             <enum name="actionCustomLabel" value="0x100" />
         </attr>
         <attr name="isIconDefined" format="string" />
@@ -530,7 +530,7 @@
 
     <declare-styleable name="KeyboardLayoutSet_Element">
         <!-- This should be aligned with
-             {@link com.android.inputmethod.keyboard.KeyboardId#ELEMENT_ALPHABET} etc. -->
+             {@link org.kelar.inputmethod.keyboard.KeyboardId#ELEMENT_ALPHABET} etc. -->
         <attr name="elementName" format="enum">
             <enum name="alphabet" value="0" />
             <enum name="alphabetManualShifted" value="1" />
@@ -571,7 +571,7 @@
 
     <declare-styleable name="KeyboardLayoutSet_Feature">
         <!-- This should be aligned with
-             {@link com.android.inputmethod.latin.utils.ScriptUtils#SCRIPT_ARABIC} etc. -->
+             {@link org.kelar.inputmethod.latin.utils.ScriptUtils#SCRIPT_ARABIC} etc. -->
         <attr name="supportedScript" format="enum">
             <enum name="arabic" value="0" />
             <enum name="armenian" value="1" />
diff --git a/java/res/values/dictionary-pack.xml b/java/res/values/dictionary-pack.xml
index 31834b52f..6b7274cce 100644
--- a/java/res/values/dictionary-pack.xml
+++ b/java/res/values/dictionary-pack.xml
@@ -18,10 +18,10 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dictionary_pack_client_id" translatable="false">com.android.inputmethod.latin</string>
+    <string name="dictionary_pack_client_id" translatable="false">org.kelar.inputmethod.latin</string>
     <string name="dictionary_pack_metadata_uri" translatable="false"></string>
-    <string name="dictionary_pack_settings_activity" translatable="false">com.android.inputmethod.dictionarypack.DictionarySettingsActivity</string>
-    <string name="authority" translatable="false">com.android.inputmethod.dictionarypack.aosp</string>
+    <string name="dictionary_pack_settings_activity" translatable="false">org.kelar.inputmethod.dictionarypack.DictionarySettingsActivity</string>
+    <string name="authority" translatable="false">org.kelar.inputmethod.dictionarypack.aosp</string>
     <string name="default_metadata_uri" translatable="false"></string>
     <string name="local_metadata_filename" translatable="false">metadata.json</string>
 </resources>
diff --git a/java/res/values/donottranslate-debug-settings.xml b/java/res/values/donottranslate-debug-settings.xml
index 9df73ae4f..53d8bb3e5 100644
--- a/java/res/values/donottranslate-debug-settings.xml
+++ b/java/res/values/donottranslate-debug-settings.xml
@@ -18,8 +18,8 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Title for Android keyboard debug settings activity / dialog -->
-    <string name="english_ime_debug_settings">Android Keyboard Debug settings</string>
+    <!-- Title for Kelar Keyboard debug settings activity / dialog -->
+    <string name="english_ime_debug_settings">Kelar Keyboard Debug settings</string>
     <string name="prefs_debug_mode">Debug Mode</string>
     <string name="prefs_force_non_distinct_multitouch">Force non-distinct multitouch</string>
     <string name="prefs_should_show_lxx_suggestion_ui">Show LXX suggestion UI</string>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 08d8bb260..3e6fe870a 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- For backward compatibility.
-         @see com.android.inputmethod.latin.settings.SettingsValues#needsToShowVoiceInputKey(android.content.SharedPreferences,android.content.res.Resources) -->
+         @see org.kelar.inputmethod.latin.settings.SettingsValues#needsToShowVoiceInputKey(android.content.SharedPreferences,android.content.res.Resources) -->
     <string name="voice_mode_main">0</string>
 
     <!-- Subtype locale display name exceptions.
diff --git a/java/res/values/keyboard-themes.xml b/java/res/values/keyboard-themes.xml
index 26b258227..3fa3fbf01 100644
--- a/java/res/values/keyboard-themes.xml
+++ b/java/res/values/keyboard-themes.xml
@@ -26,7 +26,7 @@
         <item>@string/keyboard_theme_holo_blue</item>
     </string-array>
     <!-- An element must be a keyboard theme id of
-         {@link com.android.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
+         {@link org.kelar.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
     <integer-array name="keyboard_theme_ids" translatable="false">
         <item>3</item>
         <item>4</item>
diff --git a/java/res/values/phantom-sudden-move-event-device-list.xml b/java/res/values/phantom-sudden-move-event-device-list.xml
index 4f91cd389..955824cd5 100644
--- a/java/res/values/phantom-sudden-move-event-device-list.xml
+++ b/java/res/values/phantom-sudden-move-event-device-list.xml
@@ -20,7 +20,7 @@
 <resources>
     <string-array name="phantom_sudden_move_event_device_list" translatable="false">
         <!-- "Build condition,true" that needs "phantom sudden move event" hack.
-             See {@link com.android.inputmethod.keyboard.PointerTracker}. -->
+             See {@link org.kelar.inputmethod.keyboard.PointerTracker}. -->
         <!-- Xoom -->
         <item>HARDWARE=stingray,true</item>
     </string-array>
diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml
index 46d8c44ac..77b80d274 100644
--- a/java/res/values/strings-appname.xml
+++ b/java/res/values/strings-appname.xml
@@ -19,19 +19,19 @@
 -->
 
 <resources>
-    <!-- Application name for opensource Android keyboard. AOSP(Android Open Source Project) should not be translated.
+    <!-- Application name for free software Kelar keyboard.
          This resource should be copied from msgid="8250992613616792321" -->
-    <string name="english_ime_name">Android Keyboard (AOSP)</string>
+    <string name="english_ime_name">Kelar Keyboard</string>
 
-    <!-- Name of Android spell checker service. AOSP(Android Open Source Project) should not be translated.
+    <!-- Name of Kelar spell checker service.
          This resource should be copied from msgid="511950477199948048" -->
-    <string name="spell_checker_service_name">Android Spell Checker (AOSP)</string>
+    <string name="spell_checker_service_name">Kelar Spell Checker</string>
 
-    <!-- Title for Android Keyboard settings screen. AOSP(Android Open Source Project) should not be translated.
+    <!-- Title for Kelar Keyboard settings screen.
          This resource should be copied from msgid="423615877174850267" -->
-    <string name="english_ime_settings">Android Keyboard Settings (AOSP)</string>
+    <string name="english_ime_settings">Kelar Keyboard Settings</string>
 
-    <!-- Title for the spell checking service settings screen. AOSP(Android Open Source Project) should not be translated.
+    <!-- Title for the spell checking service settings screen.
          This resource should be copied from msgid="2970535894327288421" -->
-    <string name="android_spell_checker_settings">Android Spell Checker Settings (AOSP)</string>
+    <string name="android_spell_checker_settings">Kelar Spell Checker Settings</string>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 6b985cec9..853dcb5c7 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -117,7 +117,7 @@
     <string name="use_personalized_dicts">Personalized suggestions</string>
 
     <!-- Option to enable sending usage statistics -->
-    <string name="enable_metrics_logging">"Improve <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
+    <string name="enable_metrics_logging">"Improve <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>"</string>
 
     <!-- Option name for enabling or disabling the double-space period feature that lets double tap on spacebar insert a period followed by a space [CHAR LIMIT=30] -->
     <string name="use_double_space_period">Double-space period</string>
@@ -394,7 +394,7 @@ mobile devices. [CHAR LIMIT=25] -->
     <string name="button_default">Default</string>
 
     <!-- Title of the setup wizard welcome screen. [CHAR LIMT=40] -->
-    <string name="setup_welcome_title">"Welcome to <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
+    <string name="setup_welcome_title">"Welcome to <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>"</string>
     <!-- Additional title of the setup wizard welcome screen, just below the setup_welcome_title. [CHAR_LIMIT=64] -->
     <string name="setup_welcome_additional_description">with Gesture Typing</string>
     <!-- The label of the button that starts the setup wizard. [CHAR_LIMIT=64] -->
@@ -402,23 +402,23 @@ mobile devices. [CHAR LIMIT=25] -->
     <!-- The label of the button that navigates the user to the next step of the setup wizard. [CHAR_LIMIT=64] -->
     <string name="setup_next_action">Next step</string>
     <!-- Title of the setup wizard. [CHAR LIMT=40] -->
-    <string name="setup_steps_title">"Setting up <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
+    <string name="setup_steps_title">"Setting up <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>"</string>
     <!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] -->
     <string name="setup_step1_bullet" translatable="false">1</string>
     <!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] -->
-    <string name="setup_step1_title">"Enable <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
+    <string name="setup_step1_title">"Enable <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>"</string>
     <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=120] -->
-    <string name="setup_step1_instruction">"Please check \"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\" in your Languages&#160;&amp; input settings. This will authorize it to run on your device."</string>
+    <string name="setup_step1_instruction">"Please check \"<xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>\" in your Languages&#160;&amp; input settings. This will authorize it to run on your device."</string>
     <!-- Detailed instruction of the already finished 1st step in the setup wizard. [CHAR LIMIT=120] -->
-    <string name="setup_step1_finished_instruction">"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> is already enabled in your Languages&#160;&amp; input settings, so this step is done. On to the next one!"</string>
+    <string name="setup_step1_finished_instruction">"<xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g> is already enabled in your Languages&#160;&amp; input settings, so this step is done. On to the next one!"</string>
     <!-- The label of the button that triggers the Languages & input settings in order to enable the keyboard. [CHAR_LIMIT=64] -->
     <string name="setup_step1_action">Enable in Settings</string>
     <!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] -->
     <string name="setup_step2_bullet" translatable="false">2</string>
     <!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] -->
-    <string name="setup_step2_title">"Switch to <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>"</string>
+    <string name="setup_step2_title">"Switch to <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>"</string>
     <!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=120] -->
-    <string name="setup_step2_instruction">"Next, select \"<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\" as your active text-input method."</string>
+    <string name="setup_step2_instruction">"Next, select \"<xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>\" as your active text-input method."</string>
     <!-- The label of the button that triggers the choose input method dialog in order to select the keyboard. [CHAR_LIMIT=64] -->
     <string name="setup_step2_action">Switch input methods</string>
     <!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] -->
@@ -426,7 +426,7 @@ mobile devices. [CHAR LIMIT=25] -->
     <!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] -->
     <string name="setup_step3_title">"Congratulations, you're all set!"</string>
     <!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=120] -->
-    <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>.</string>
+    <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="APPLICATION_NAME" example="Kelar Keyboard">%s</xliff:g>.</string>
     <!-- The label of the button that triggers the screen for configuaring additional languages of the keyboard. [CHAR_LIMIT=64] -->
     <string name="setup_step3_action">Configure additional languages</string>
     <!-- The label of the button that finishes the setup wizard. [CHAR_LIMIT=64] -->
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 2f768de71..7d49cb03c 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -105,9 +105,9 @@
     <style
         name="MainKeyboardView"
         parent="KeyboardView" />
-    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
+    <!-- Though {@link org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.kelar.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.kelar.inputmethod.keyboard.KeyboardView}
          attributes. -->
     <style name="EmojiPalettesView" />
     <style name="MoreKeysKeyboard" />
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 1a15b0e97..1298e11b2 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -73,9 +73,9 @@
         <item name="languageOnSpacebarTextShadowRadius">1.0</item>
         <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
     </style>
-    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
+    <!-- Though {@link org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.kelar.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.kelar.inputmethod.keyboard.KeyboardView}
          attributes. -->
     <style
         name="EmojiPalettesView.ICS"
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index 32884dba0..06f4a1a60 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -73,9 +73,9 @@
         <item name="languageOnSpacebarTextShadowRadius">1.0</item>
         <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
     </style>
-    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
+    <!-- Though {@link org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.kelar.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.kelar.inputmethod.keyboard.KeyboardView}
          attributes. -->
     <style
         name="EmojiPalettesView.KLP"
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index ae8dd1de2..726e4cca8 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -73,9 +73,9 @@
         <!-- A negative value to disable text shadow layer. -->
         <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
     </style>
-    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
+    <!-- Though {@link org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.kelar.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.kelar.inputmethod.keyboard.KeyboardView}
          attributes. -->
     <style
         name="EmojiPalettesView.LXX_Dark"
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index eecd191a3..007c50181 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -73,9 +73,9 @@
         <!-- A negative value to disable text shadow layer. -->
         <item name="languageOnSpacebarTextShadowRadius">-1.0</item>
     </style>
-    <!-- Though {@link com.android.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link com.android.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link com.android.inputmethod.keyboard.KeyboardView}
+    <!-- Though {@link org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
+         {@link org.kelar.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
+         delete button, need themed {@link org.kelar.inputmethod.keyboard.KeyboardView}
          attributes. -->
     <style
         name="EmojiPalettesView.LXX_Light"
diff --git a/java/res/values/touch-position-correction.xml b/java/res/values/touch-position-correction.xml
index e090d106b..bc3d17ccd 100644
--- a/java/res/values/touch-position-correction.xml
+++ b/java/res/values/touch-position-correction.xml
@@ -18,7 +18,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Note that correctionX is obsolete (See com.android.inputmethod.keyboard.internal.TouchPositionCorrection)
+    <!-- Note that correctionX is obsolete (See org.kelar.inputmethod.keyboard.internal.TouchPositionCorrection)
         An entry of the touch_position_correction word should be:
         1. correctionX: (touch_center_x - hitbox_center_x) / hitbox_width
         2. correctionY: (touch_center_y - hitbox_center_y) / hitbox_height
@@ -29,7 +29,7 @@
         name="touch_position_correction_data_default"
         translatable="false"
     >
-        <!-- The default touch position data (See com.android.inputmethod.keyboard.ProximityInfo)
+        <!-- The default touch position data (See org.kelar.inputmethod.keyboard.ProximityInfo)
              correctionX = 0.0f
              correctionY = 0.0f
              correctionR = DEFAULT_TOUCH_POSITION_CORRECTION_RADIUS
diff --git a/java/res/xml-land/kbd_number.xml b/java/res/xml-land/kbd_number.xml
index 0dced28ac..0cc244ac0 100644
--- a/java/res/xml-land/kbd_number.xml
+++ b/java/res/xml-land/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/java/res/xml-land/kbd_phone.xml b/java/res/xml-land/kbd_phone.xml
index e5d7b443f..6755468e3 100644
--- a/java/res/xml-land/kbd_phone.xml
+++ b/java/res/xml-land/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/java/res/xml-land/kbd_phone_symbols.xml b/java/res/xml-land/kbd_phone_symbols.xml
index b881e6234..7528b3e77 100644
--- a/java/res/xml-land/kbd_phone_symbols.xml
+++ b/java/res/xml-land/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="26.67%p"
diff --git a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
index c7d446014..b606dbdf6 100644
--- a/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="5%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/java/res/xml-sw600dp-land/kbd_number.xml b/java/res/xml-sw600dp-land/kbd_number.xml
index a9e812171..de02deebc 100644
--- a/java/res/xml-sw600dp-land/kbd_number.xml
+++ b/java/res/xml-sw600dp-land/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/java/res/xml-sw600dp-land/kbd_phone.xml b/java/res/xml-sw600dp-land/kbd_phone.xml
index 4cabdeb5a..6a8acaf35 100644
--- a/java/res/xml-sw600dp-land/kbd_phone.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
index 9c3e8259e..6314c097b 100644
--- a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyboardLeftPadding="10%p"
     latin:keyboardRightPadding="10%p"
     latin:keyWidth="18%p"
diff --git a/java/res/xml-sw600dp-land/key_space_3kw.xml b/java/res/xml-sw600dp-land/key_space_3kw.xml
index 47c4e4809..1e74496ec 100644
--- a/java/res/xml-sw600dp-land/key_space_3kw.xml
+++ b/java/res/xml-sw600dp-land/key_space_3kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- TODO: Consolidate the layout specification between protrait and landscape.
          Ideally just the keyWidth should be different -->
diff --git a/java/res/xml-sw600dp-land/row_qwerty4.xml b/java/res/xml-sw600dp-land/row_qwerty4.xml
index 0fdb5c6f5..41300c5bc 100644
--- a/java/res/xml-sw600dp-land/row_qwerty4.xml
+++ b/java/res/xml-sw600dp-land/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <!-- Split the 4th row for split layouts -->
diff --git a/java/res/xml-sw600dp-land/rows_qwerty.xml b/java/res/xml-sw600dp-land/rows_qwerty.xml
index b580dcf6a..c5264feca 100644
--- a/java/res/xml-sw600dp-land/rows_qwerty.xml
+++ b/java/res/xml-sw600dp-land/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
index fbe8cfcc0..cbed0e010 100644
--- a/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="8%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 71d662267..d46a575ef 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 5fdbea27b..dcfa1af1a 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index ce24d2b39..9af3c8aec 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="18%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml-sw600dp/key_comma.xml b/java/res/xml-sw600dp/key_comma.xml
index e616a8d70..84ac7f981 100644
--- a/java/res/xml-sw600dp/key_comma.xml
+++ b/java/res/xml-sw600dp/key_comma.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/key_period.xml b/java/res/xml-sw600dp/key_period.xml
index 3045cbc63..554f7ab07 100644
--- a/java/res/xml-sw600dp/key_period.xml
+++ b/java/res/xml-sw600dp/key_period.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The table period key which may have different label depending on locale -->
     <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
diff --git a/java/res/xml-sw600dp/key_settings.xml b/java/res/xml-sw600dp/key_settings.xml
index 45915e948..a11efe1a5 100644
--- a/java/res/xml-sw600dp/key_settings.xml
+++ b/java/res/xml-sw600dp/key_settings.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/key_space_3kw.xml b/java/res/xml-sw600dp/key_space_3kw.xml
index 8cc3a38a5..0cfce9301 100644
--- a/java/res/xml-sw600dp/key_space_3kw.xml
+++ b/java/res/xml-sw600dp/key_space_3kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/key_space_7kw.xml b/java/res/xml-sw600dp/key_space_7kw.xml
index 61e076534..4be7713da 100644
--- a/java/res/xml-sw600dp/key_space_7kw.xml
+++ b/java/res/xml-sw600dp/key_space_7kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/key_space_symbols.xml b/java/res/xml-sw600dp/key_space_symbols.xml
index b3cb5ac78..43270970b 100644
--- a/java/res/xml-sw600dp/key_space_symbols.xml
+++ b/java/res/xml-sw600dp/key_space_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="spaceKeyStyle"
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 3d25f4295..f708509f2 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 63ef2f8f9..14536cb5b 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Navigate more keys style -->
     <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 87ca1055e..baeb98044 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
diff --git a/java/res/xml-sw600dp/keys_dvorak_123.xml b/java/res/xml-sw600dp/keys_dvorak_123.xml
index 91ceb1c43..11842f8b6 100644
--- a/java/res/xml-sw600dp/keys_dvorak_123.xml
+++ b/java/res/xml-sw600dp/keys_dvorak_123.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index cf2c61ead..3651fddfe 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!"
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index c832d5542..396a4be26 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
     <Key
diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
index 76ac6bbdd..02e8a971d 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
index f18fb507c..a0ad182a9 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 9ac718cd8..05f03f9df 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
index 4dcae1455..aef0a9df0 100644
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/java/res/xml-sw600dp/row_pcqwerty5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="7.0%p"
diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index bcfd2cb7f..7eb6da8a9 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <!-- Split the 4th row for split layouts -->
diff --git a/java/res/xml-sw600dp/rowkeys_dvorak3.xml b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
index e58d6dbef..ce98a9733 100644
--- a/java/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q" />
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index e4b824f80..094d1c6ab 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 1b7b4161e..df2b1891f 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_armenian_phonetic.xml b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
index ebd16cba0..188c841a1 100644
--- a/java/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.0%p"
diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index cdc91857f..d047c729f 100644
--- a/java/res/xml-sw600dp/rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_bengali.xml b/java/res/xml-sw600dp/rows_bengali.xml
index 10b3e4fb5..9dfe32139 100644
--- a/java/res/xml-sw600dp/rows_bengali.xml
+++ b/java/res/xml-sw600dp/rows_bengali.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_bengali_akkhor.xml b/java/res/xml-sw600dp/rows_bengali_akkhor.xml
index 3e81a1438..d51cbb296 100644
--- a/java/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ b/java/res/xml-sw600dp/rows_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyLabelFlags="fontNormal"
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
index c73aa1c1a..e575ead56 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_bulgarian_bds.xml b/java/res/xml-sw600dp/rows_bulgarian_bds.xml
index bc773ee58..e290a8c18 100644
--- a/java/res/xml-sw600dp/rows_bulgarian_bds.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_colemak.xml b/java/res/xml-sw600dp/rows_colemak.xml
index 7559bfb96..f3f32d159 100644
--- a/java/res/xml-sw600dp/rows_colemak.xml
+++ b/java/res/xml-sw600dp/rows_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_dvorak.xml b/java/res/xml-sw600dp/rows_dvorak.xml
index c8f5e3aa2..9fb3e649d 100644
--- a/java/res/xml-sw600dp/rows_dvorak.xml
+++ b/java/res/xml-sw600dp/rows_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
index c5045fffc..8c08bbff6 100644
--- a/java/res/xml-sw600dp/rows_east_slavic.xml
+++ b/java/res/xml-sw600dp/rows_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index 1d098df9a..2849df58a 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
index 891cbc109..7874c7531 100644
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ b/java/res/xml-sw600dp/rows_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 60ee478d8..b2ed3e3a2 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 86b34202f..fe582aff6 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index 42b92a72a..7608acf7a 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
index 649345169..d4a247e4e 100644
--- a/java/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/java/res/xml-sw600dp/rows_hindi_compact.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_kannada.xml b/java/res/xml-sw600dp/rows_kannada.xml
index 55eedc559..dc755a14c 100644
--- a/java/res/xml-sw600dp/rows_kannada.xml
+++ b/java/res/xml-sw600dp/rows_kannada.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_khmer.xml b/java/res/xml-sw600dp/rows_khmer.xml
index 800a3ee57..3af0b2077 100644
--- a/java/res/xml-sw600dp/rows_khmer.xml
+++ b/java/res/xml-sw600dp/rows_khmer.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/java/res/xml-sw600dp/rows_lao.xml b/java/res/xml-sw600dp/rows_lao.xml
index 264e2d9ed..77a12c264 100644
--- a/java/res/xml-sw600dp/rows_lao.xml
+++ b/java/res/xml-sw600dp/rows_lao.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/java/res/xml-sw600dp/rows_malayalam.xml b/java/res/xml-sw600dp/rows_malayalam.xml
index 1df7e6ea6..f7f425f20 100644
--- a/java/res/xml-sw600dp/rows_malayalam.xml
+++ b/java/res/xml-sw600dp/rows_malayalam.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
index c77bea567..f127e1a86 100644
--- a/java/res/xml-sw600dp/rows_marathi.xml
+++ b/java/res/xml-sw600dp/rows_marathi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_mongolian.xml b/java/res/xml-sw600dp/rows_mongolian.xml
index 8e39e625a..39e67eb0f 100644
--- a/java/res/xml-sw600dp/rows_mongolian.xml
+++ b/java/res/xml-sw600dp/rows_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml
index 41cd2f9b4..1f4eb5a35 100644
--- a/java/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/java/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml
index d23ca24e4..7b0678bf2 100644
--- a/java/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/java/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
index 56fa4066f..f2242dd95 100644
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index e6fdf73ec..c364a33c6 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <Key
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
index 37e63383e..543cf7d77 100644
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml
index 73b7e473e..2075c62c0 100644
--- a/java/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/java/res/xml-sw600dp/rows_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index fc86a7670..9a9c9b9a2 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index 51df4b0cc..259a6f003 100644
--- a/java/res/xml-sw600dp/rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index 3b59dec54..efd534bb5 100644
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_serbian_qwertz.xml b/java/res/xml-sw600dp/rows_serbian_qwertz.xml
index a3fb62523..5fd48c617 100644
--- a/java/res/xml-sw600dp/rows_serbian_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="8.182%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index 278602820..2fe89792e 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
index 5053988cc..cfe5c5757 100644
--- a/java/res/xml-sw600dp/rows_south_slavic.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 1092c268e..27be76c9d 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_swiss.xml b/java/res/xml-sw600dp/rows_swiss.xml
index 4f4ca85b4..e057f5fba 100644
--- a/java/res/xml-sw600dp/rows_swiss.xml
+++ b/java/res/xml-sw600dp/rows_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index 05e7c685e..664a87e91 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 70ac42eb9..ac9ca2eec 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml-sw600dp/rows_tamil.xml b/java/res/xml-sw600dp/rows_tamil.xml
index 785e751c8..569a634c3 100644
--- a/java/res/xml-sw600dp/rows_tamil.xml
+++ b/java/res/xml-sw600dp/rows_tamil.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_telugu.xml b/java/res/xml-sw600dp/rows_telugu.xml
index c9aeb7ef2..c782969f8 100644
--- a/java/res/xml-sw600dp/rows_telugu.xml
+++ b/java/res/xml-sw600dp/rows_telugu.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index 2006056a4..df3cca7b0 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="7.5%p"
diff --git a/java/res/xml-sw600dp/rows_uzbek.xml b/java/res/xml-sw600dp/rows_uzbek.xml
index 3cd9940f6..06e51a00d 100644
--- a/java/res/xml-sw600dp/rows_uzbek.xml
+++ b/java/res/xml-sw600dp/rows_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="8.182%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index d5491d29d..439fda00d 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
index ef8dec37c..1c114b7d7 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
index 734d0600a..b7eccfc1b 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
index e28ad53b3..996a061a5 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
index ea64a1009..71befd936 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
index 1e638507a..076db679f 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
index acb289406..91d1de25a 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
index e2c367784..50cfd6500 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
index 75ad44f34..805446a2c 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
index e1a4c613c..5e446c012 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
index 6a99eace0..bed052e9b 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
index b66149d28..60d27119f 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
index 97e500713..3e3b56c51 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
index 7cec76d43..608a0980d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
index c14f920bc..acb60710c 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
index 3134de7c8..1adc3bb55 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
index da510c1f5..268c7d8f9 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
diff --git a/java/res/xml/kbd_arabic.xml b/java/res/xml/kbd_arabic.xml
index ce5f30b2f..4686a4c5b 100644
--- a/java/res/xml/kbd_arabic.xml
+++ b/java/res/xml/kbd_arabic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_arabic" />
diff --git a/java/res/xml/kbd_armenian_phonetic.xml b/java/res/xml/kbd_armenian_phonetic.xml
index da12870ed..11d8f9124 100644
--- a/java/res/xml/kbd_armenian_phonetic.xml
+++ b/java/res/xml/kbd_armenian_phonetic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/java/res/xml/kbd_azerty.xml b/java/res/xml/kbd_azerty.xml
index 7bafe5bca..4b95b0109 100644
--- a/java/res/xml/kbd_azerty.xml
+++ b/java/res/xml/kbd_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_azerty" />
diff --git a/java/res/xml/kbd_bengali.xml b/java/res/xml/kbd_bengali.xml
index 879a897df..5684fb886 100644
--- a/java/res/xml/kbd_bengali.xml
+++ b/java/res/xml/kbd_bengali.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bengali" />
diff --git a/java/res/xml/kbd_bengali_akkhor.xml b/java/res/xml/kbd_bengali_akkhor.xml
index 6c81d5313..b57926036 100644
--- a/java/res/xml/kbd_bengali_akkhor.xml
+++ b/java/res/xml/kbd_bengali_akkhor.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_bengali_akkhor" />
 </Keyboard>
diff --git a/java/res/xml/kbd_bulgarian.xml b/java/res/xml/kbd_bulgarian.xml
index a651991c0..6f09d03e8 100644
--- a/java/res/xml/kbd_bulgarian.xml
+++ b/java/res/xml/kbd_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bulgarian" />
diff --git a/java/res/xml/kbd_bulgarian_bds.xml b/java/res/xml/kbd_bulgarian_bds.xml
index a8d770c04..7005eddf1 100644
--- a/java/res/xml/kbd_bulgarian_bds.xml
+++ b/java/res/xml/kbd_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_bulgarian_bds" />
diff --git a/java/res/xml/kbd_colemak.xml b/java/res/xml/kbd_colemak.xml
index ee1d5e86e..28ce857cd 100644
--- a/java/res/xml/kbd_colemak.xml
+++ b/java/res/xml/kbd_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_colemak" />
diff --git a/java/res/xml/kbd_dvorak.xml b/java/res/xml/kbd_dvorak.xml
index 27c6a5084..a8f1d0e25 100644
--- a/java/res/xml/kbd_dvorak.xml
+++ b/java/res/xml/kbd_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_dvorak" />
diff --git a/java/res/xml/kbd_east_slavic.xml b/java/res/xml/kbd_east_slavic.xml
index 3bc233953..372938e84 100644
--- a/java/res/xml/kbd_east_slavic.xml
+++ b/java/res/xml/kbd_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_east_slavic" />
diff --git a/java/res/xml/kbd_emoji_category1.xml b/java/res/xml/kbd_emoji_category1.xml
index 5145ea9d3..ade946b17 100644
--- a/java/res/xml/kbd_emoji_category1.xml
+++ b/java/res/xml/kbd_emoji_category1.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category10.xml b/java/res/xml/kbd_emoji_category10.xml
index 44c2defea..9188f6f64 100644
--- a/java/res/xml/kbd_emoji_category10.xml
+++ b/java/res/xml/kbd_emoji_category10.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category11.xml b/java/res/xml/kbd_emoji_category11.xml
index bf014b38d..fb5ddf594 100644
--- a/java/res/xml/kbd_emoji_category11.xml
+++ b/java/res/xml/kbd_emoji_category11.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category12.xml b/java/res/xml/kbd_emoji_category12.xml
index dc6592a6f..110cfb4af 100644
--- a/java/res/xml/kbd_emoji_category12.xml
+++ b/java/res/xml/kbd_emoji_category12.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category13.xml b/java/res/xml/kbd_emoji_category13.xml
index 9c1ec8b38..cd3bcc70c 100644
--- a/java/res/xml/kbd_emoji_category13.xml
+++ b/java/res/xml/kbd_emoji_category13.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category14.xml b/java/res/xml/kbd_emoji_category14.xml
index 6838a8b96..e427cb175 100644
--- a/java/res/xml/kbd_emoji_category14.xml
+++ b/java/res/xml/kbd_emoji_category14.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category15.xml b/java/res/xml/kbd_emoji_category15.xml
index a41a586ed..dfdf124c0 100644
--- a/java/res/xml/kbd_emoji_category15.xml
+++ b/java/res/xml/kbd_emoji_category15.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category16.xml b/java/res/xml/kbd_emoji_category16.xml
index 1a0a7420c..ece0ef0e4 100644
--- a/java/res/xml/kbd_emoji_category16.xml
+++ b/java/res/xml/kbd_emoji_category16.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category2.xml b/java/res/xml/kbd_emoji_category2.xml
index ac8784f4b..5aa8420ae 100644
--- a/java/res/xml/kbd_emoji_category2.xml
+++ b/java/res/xml/kbd_emoji_category2.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category3.xml b/java/res/xml/kbd_emoji_category3.xml
index 88c4db92b..2fa40861c 100644
--- a/java/res/xml/kbd_emoji_category3.xml
+++ b/java/res/xml/kbd_emoji_category3.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category4.xml b/java/res/xml/kbd_emoji_category4.xml
index 262384d80..56b954a4d 100644
--- a/java/res/xml/kbd_emoji_category4.xml
+++ b/java/res/xml/kbd_emoji_category4.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category5.xml b/java/res/xml/kbd_emoji_category5.xml
index bf823f978..7034454ae 100644
--- a/java/res/xml/kbd_emoji_category5.xml
+++ b/java/res/xml/kbd_emoji_category5.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category6.xml b/java/res/xml/kbd_emoji_category6.xml
index edb82fc64..64033ad5d 100644
--- a/java/res/xml/kbd_emoji_category6.xml
+++ b/java/res/xml/kbd_emoji_category6.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:keyLabelSize="60%p"
diff --git a/java/res/xml/kbd_emoji_category7.xml b/java/res/xml/kbd_emoji_category7.xml
index 022ff92bc..24eded61a 100644
--- a/java/res/xml/kbd_emoji_category7.xml
+++ b/java/res/xml/kbd_emoji_category7.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category8.xml b/java/res/xml/kbd_emoji_category8.xml
index eee645b9a..e0d64451d 100644
--- a/java/res/xml/kbd_emoji_category8.xml
+++ b/java/res/xml/kbd_emoji_category8.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_category9.xml b/java/res/xml/kbd_emoji_category9.xml
index c3b992239..93958497f 100644
--- a/java/res/xml/kbd_emoji_category9.xml
+++ b/java/res/xml/kbd_emoji_category9.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="90%p"
     latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
diff --git a/java/res/xml/kbd_emoji_recents.xml b/java/res/xml/kbd_emoji_recents.xml
index edf3872c1..3a353dbcf 100644
--- a/java/res/xml/kbd_emoji_recents.xml
+++ b/java/res/xml/kbd_emoji_recents.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
     latin:keyLetterSize="@fraction/config_emoji_keyboard_key_letter_size"
     latin:keyLabelSize="60%p"
diff --git a/java/res/xml/kbd_farsi.xml b/java/res/xml/kbd_farsi.xml
index 1af4e61ca..f36e04b91 100644
--- a/java/res/xml/kbd_farsi.xml
+++ b/java/res/xml/kbd_farsi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_farsi" />
diff --git a/java/res/xml/kbd_georgian.xml b/java/res/xml/kbd_georgian.xml
index 2dc6bf0ee..49785731a 100644
--- a/java/res/xml/kbd_georgian.xml
+++ b/java/res/xml/kbd_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_georgian" />
diff --git a/java/res/xml/kbd_greek.xml b/java/res/xml/kbd_greek.xml
index 7056efb00..748ca2c49 100644
--- a/java/res/xml/kbd_greek.xml
+++ b/java/res/xml/kbd_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_greek" />
diff --git a/java/res/xml/kbd_hebrew.xml b/java/res/xml/kbd_hebrew.xml
index 74836f342..4152ea862 100644
--- a/java/res/xml/kbd_hebrew.xml
+++ b/java/res/xml/kbd_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hebrew" />
diff --git a/java/res/xml/kbd_hindi.xml b/java/res/xml/kbd_hindi.xml
index 0e69e3ae2..da1672ac6 100644
--- a/java/res/xml/kbd_hindi.xml
+++ b/java/res/xml/kbd_hindi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hindi" />
diff --git a/java/res/xml/kbd_hindi_compact.xml b/java/res/xml/kbd_hindi_compact.xml
index 7502bba9e..be1c0f7b8 100644
--- a/java/res/xml/kbd_hindi_compact.xml
+++ b/java/res/xml/kbd_hindi_compact.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_hindi_compact" />
diff --git a/java/res/xml/kbd_kannada.xml b/java/res/xml/kbd_kannada.xml
index 0c5922899..69a99cd67 100644
--- a/java/res/xml/kbd_kannada.xml
+++ b/java/res/xml/kbd_kannada.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_kannada" />
diff --git a/java/res/xml/kbd_khmer.xml b/java/res/xml/kbd_khmer.xml
index d703e78f7..a6c73f2ff 100644
--- a/java/res/xml/kbd_khmer.xml
+++ b/java/res/xml/kbd_khmer.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/java/res/xml/kbd_lao.xml b/java/res/xml/kbd_lao.xml
index 6f7709562..489901e00 100644
--- a/java/res/xml/kbd_lao.xml
+++ b/java/res/xml/kbd_lao.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/java/res/xml/kbd_malayalam.xml b/java/res/xml/kbd_malayalam.xml
index 000b23f82..85e0159aa 100644
--- a/java/res/xml/kbd_malayalam.xml
+++ b/java/res/xml/kbd_malayalam.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_malayalam" />
diff --git a/java/res/xml/kbd_marathi.xml b/java/res/xml/kbd_marathi.xml
index 4328cd6d3..e0ae2225d 100644
--- a/java/res/xml/kbd_marathi.xml
+++ b/java/res/xml/kbd_marathi.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_marathi" />
diff --git a/java/res/xml/kbd_mongolian.xml b/java/res/xml/kbd_mongolian.xml
index 1d0352175..57a5d15c3 100644
--- a/java/res/xml/kbd_mongolian.xml
+++ b/java/res/xml/kbd_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_mongolian" />
diff --git a/java/res/xml/kbd_more_keys_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml
index 7104ec7e0..0aa68d262 100644
--- a/java/res/xml/kbd_more_keys_keyboard_template.xml
+++ b/java/res/xml/kbd_more_keys_keyboard_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="10%p"
     latin:rowHeight="@dimen/config_more_keys_keyboard_key_height"
     style="?attr/moreKeysKeyboardStyle"
diff --git a/java/res/xml/kbd_nepali_romanized.xml b/java/res/xml/kbd_nepali_romanized.xml
index 9e4381364..d1b5a277d 100644
--- a/java/res/xml/kbd_nepali_romanized.xml
+++ b/java/res/xml/kbd_nepali_romanized.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nepali_romanized" />
diff --git a/java/res/xml/kbd_nepali_traditional.xml b/java/res/xml/kbd_nepali_traditional.xml
index 6854e32bd..ace0cdc5b 100644
--- a/java/res/xml/kbd_nepali_traditional.xml
+++ b/java/res/xml/kbd_nepali_traditional.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nepali_traditional" />
diff --git a/java/res/xml/kbd_nordic.xml b/java/res/xml/kbd_nordic.xml
index a2196c926..109c254d6 100644
--- a/java/res/xml/kbd_nordic.xml
+++ b/java/res/xml/kbd_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_nordic" />
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index aa8872f26..37598a1f3 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml
index 045696451..74e4a55f4 100644
--- a/java/res/xml/kbd_pcqwerty.xml
+++ b/java/res/xml/kbd_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index dab3d494a..9ca88e205 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index ba4e4646d..db90b2810 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="26.67%p"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 2f49b943a..6909874cc 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_qwerty" />
diff --git a/java/res/xml/kbd_qwertz.xml b/java/res/xml/kbd_qwertz.xml
index 9f7e9019c..609e3e151 100644
--- a/java/res/xml/kbd_qwertz.xml
+++ b/java/res/xml/kbd_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_qwertz" />
diff --git a/java/res/xml/kbd_serbian_qwertz.xml b/java/res/xml/kbd_serbian_qwertz.xml
index 4f763b861..0410376d0 100644
--- a/java/res/xml/kbd_serbian_qwertz.xml
+++ b/java/res/xml/kbd_serbian_qwertz.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_serbian_qwertz" />
 </Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kbd_sinhala.xml b/java/res/xml/kbd_sinhala.xml
index 6c0f4bc05..fa407dd92 100644
--- a/java/res/xml/kbd_sinhala.xml
+++ b/java/res/xml/kbd_sinhala.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_sinhala" />
diff --git a/java/res/xml/kbd_south_slavic.xml b/java/res/xml/kbd_south_slavic.xml
index f3ad02c7b..71b760139 100644
--- a/java/res/xml/kbd_south_slavic.xml
+++ b/java/res/xml/kbd_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_south_slavic" />
diff --git a/java/res/xml/kbd_spanish.xml b/java/res/xml/kbd_spanish.xml
index 6ce2b5d24..a8b9c1e7f 100644
--- a/java/res/xml/kbd_spanish.xml
+++ b/java/res/xml/kbd_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_spanish" />
diff --git a/java/res/xml/kbd_suggestions_pane_template.xml b/java/res/xml/kbd_suggestions_pane_template.xml
index 5b4f60673..a8f9a87d5 100644
--- a/java/res/xml/kbd_suggestions_pane_template.xml
+++ b/java/res/xml/kbd_suggestions_pane_template.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:keyWidth="10%p"
     latin:rowHeight="@dimen/config_more_suggestions_row_height"
     >
diff --git a/java/res/xml/kbd_swiss.xml b/java/res/xml/kbd_swiss.xml
index c64ad1103..3a1d1a6c3 100644
--- a/java/res/xml/kbd_swiss.xml
+++ b/java/res/xml/kbd_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_swiss" />
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 47e08d57f..6bca4dce5 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
     <include
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 932ec017e..01d6156d5 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
 >
     <include
diff --git a/java/res/xml/kbd_tamil.xml b/java/res/xml/kbd_tamil.xml
index 617e4de47..7456ff99c 100644
--- a/java/res/xml/kbd_tamil.xml
+++ b/java/res/xml/kbd_tamil.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_tamil" />
diff --git a/java/res/xml/kbd_telugu.xml b/java/res/xml/kbd_telugu.xml
index b4fc337d1..19fdf9545 100644
--- a/java/res/xml/kbd_telugu.xml
+++ b/java/res/xml/kbd_telugu.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rows_telugu" />
diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml
index 7e65217f9..081b6fc6a 100644
--- a/java/res/xml/kbd_thai.xml
+++ b/java/res/xml/kbd_thai.xml
@@ -19,7 +19,7 @@
 -->
 
 <Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     latin:rowHeight="20%p"
     latin:verticalGap="@fraction/config_key_vertical_gap_5row"
     latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
diff --git a/java/res/xml/kbd_uzbek.xml b/java/res/xml/kbd_uzbek.xml
index 84486a70e..d577a8e52 100644
--- a/java/res/xml/kbd_uzbek.xml
+++ b/java/res/xml/kbd_uzbek.xml
@@ -18,6 +18,6 @@
 */
 -->
 
-<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rows_uzbek" />
 </Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
index 111d4263b..05779bb04 100644
--- a/java/res/xml/key_armenian_sha.xml
+++ b/java/res/xml/key_armenian_sha.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0577: "շ" ARMENIAN SMALL LETTER SHA -->
     <Key
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
index 3bbc405dc..72861c9ff 100644
--- a/java/res/xml/key_armenian_xeh.xml
+++ b/java/res/xml/key_armenian_xeh.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+056D: "խ" ARMENIAN SMALL LETTER XEH -->
     <Key
diff --git a/java/res/xml/key_comma.xml b/java/res/xml/key_comma.xml
index cf919a85d..a1da51713 100644
--- a/java/res/xml/key_comma.xml
+++ b/java/res/xml/key_comma.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/key_emoji.xml b/java/res/xml/key_emoji.xml
index 473dd210a..2d56c90a1 100644
--- a/java/res/xml/key_emoji.xml
+++ b/java/res/xml/key_emoji.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/key_period.xml b/java/res/xml/key_period.xml
index 5b59cff19..9a138f218 100644
--- a/java/res/xml/key_period.xml
+++ b/java/res/xml/key_period.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/key_space_5kw.xml b/java/res/xml/key_space_5kw.xml
index 692c245ff..a58701787 100644
--- a/java/res/xml/key_space_5kw.xml
+++ b/java/res/xml/key_space_5kw.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/key_space_symbols.xml b/java/res/xml/key_space_symbols.xml
index 047de9f24..d84783d3a 100644
--- a/java/res/xml/key_space_symbols.xml
+++ b/java/res/xml/key_space_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="spaceKeyStyle"
diff --git a/java/res/xml/key_styles_actions.xml b/java/res/xml/key_styles_actions.xml
index 83901cad9..b35391ae1 100644
--- a/java/res/xml/key_styles_actions.xml
+++ b/java/res/xml/key_styles_actions.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Go key -->
     <switch>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index fbc44da38..0b3e1f436 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml
index de5e6f2f0..22451c302 100644
--- a/java/res/xml/key_styles_currency.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:passwordInput="true">
             <include latin:keyboardLayout="@xml/key_styles_currency_dollar" />
diff --git a/java/res/xml/key_styles_currency_dollar.xml b/java/res/xml/key_styles_currency_dollar.xml
index d3211bd69..9a2f1d005 100644
--- a/java/res/xml/key_styles_currency_dollar.xml
+++ b/java/res/xml/key_styles_currency_dollar.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+00A3: "£" POUND SIGN
          U+00A2: "¢" CENT SIGN
          U+20AC: "€" EURO SIGN
diff --git a/java/res/xml/key_styles_currency_euro.xml b/java/res/xml/key_styles_currency_euro.xml
index c2ae87bea..dfae2017f 100644
--- a/java/res/xml/key_styles_currency_euro.xml
+++ b/java/res/xml/key_styles_currency_euro.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+20AC: "€" EURO SIGN
          U+00A2: "¢" CENT SIGN
          U+00A3: "£" POUND SIGN
diff --git a/java/res/xml/key_styles_currency_generic.xml b/java/res/xml/key_styles_currency_generic.xml
index 888b5b2c9..2f005255a 100644
--- a/java/res/xml/key_styles_currency_generic.xml
+++ b/java/res/xml/key_styles_currency_generic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+00A3: "£" POUND SIGN
          U+20AC: "€" EURO SIGN
          U+00A2: "¢" CENT SIGN -->
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 564f465e9..abdb5b77c 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Navigate more keys style -->
     <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
diff --git a/java/res/xml/key_styles_less_greater.xml b/java/res/xml/key_styles_less_greater.xml
index db4c7984b..716838b0b 100644
--- a/java/res/xml/key_styles_less_greater.xml
+++ b/java/res/xml/key_styles_less_greater.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The less and greater keys' style which may have different label depending on locale. -->
     <!-- Kept as a separate file for cleaner overriding by an overlay.  -->
diff --git a/java/res/xml/key_styles_navigate_more_keys.xml b/java/res/xml/key_styles_navigate_more_keys.xml
index f97114db9..67230e126 100644
--- a/java/res/xml/key_styles_navigate_more_keys.xml
+++ b/java/res/xml/key_styles_navigate_more_keys.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case latin:keyboardTheme="ICS|KLP">
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 911c2763d..b670998c6 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <key-style
         latin:styleName="numKeyBaseStyle"
diff --git a/java/res/xml/key_styles_settings.xml b/java/res/xml/key_styles_settings.xml
index 43ee601e6..07f4ac30f 100644
--- a/java/res/xml/key_styles_settings.xml
+++ b/java/res/xml/key_styles_settings.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- Key style for the key which may have settings key as more keys. -->
     <switch>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
index a43a87ccd..d5b333b54 100644
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/keyboard_layout_set_arabic.xml b/java/res/xml/keyboard_layout_set_arabic.xml
index 1bf8c6295..9ce9af70d 100644
--- a/java/res/xml/keyboard_layout_set_arabic.xml
+++ b/java/res/xml/keyboard_layout_set_arabic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="arabic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml b/java/res/xml/keyboard_layout_set_armenian_phonetic.xml
index c3a11898d..a727fe29f 100644
--- a/java/res/xml/keyboard_layout_set_armenian_phonetic.xml
+++ b/java/res/xml/keyboard_layout_set_armenian_phonetic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="armenian" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_azerty.xml b/java/res/xml/keyboard_layout_set_azerty.xml
index 38797f91a..f793a21fc 100644
--- a/java/res/xml/keyboard_layout_set_azerty.xml
+++ b/java/res/xml/keyboard_layout_set_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_azerty"
diff --git a/java/res/xml/keyboard_layout_set_bengali.xml b/java/res/xml/keyboard_layout_set_bengali.xml
index de48a0ceb..da03bc510 100644
--- a/java/res/xml/keyboard_layout_set_bengali.xml
+++ b/java/res/xml/keyboard_layout_set_bengali.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="bengali" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
index 267064d46..15a6c93d8 100644
--- a/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
+++ b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Feature latin:supportedScript="bengali" />
     <Element
         latin:elementKeyboard="@xml/kbd_bengali_akkhor"
diff --git a/java/res/xml/keyboard_layout_set_bulgarian.xml b/java/res/xml/keyboard_layout_set_bulgarian.xml
index 3f53865d4..6cb1efa63 100644
--- a/java/res/xml/keyboard_layout_set_bulgarian.xml
+++ b/java/res/xml/keyboard_layout_set_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml
index 8e92f7054..91d7ff4c8 100644
--- a/java/res/xml/keyboard_layout_set_bulgarian_bds.xml
+++ b/java/res/xml/keyboard_layout_set_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_colemak.xml b/java/res/xml/keyboard_layout_set_colemak.xml
index 3061872a8..ef3260b9a 100644
--- a/java/res/xml/keyboard_layout_set_colemak.xml
+++ b/java/res/xml/keyboard_layout_set_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_colemak"
diff --git a/java/res/xml/keyboard_layout_set_dvorak.xml b/java/res/xml/keyboard_layout_set_dvorak.xml
index 31aeec525..b35951c40 100644
--- a/java/res/xml/keyboard_layout_set_dvorak.xml
+++ b/java/res/xml/keyboard_layout_set_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_dvorak"
diff --git a/java/res/xml/keyboard_layout_set_east_slavic.xml b/java/res/xml/keyboard_layout_set_east_slavic.xml
index ef080643b..4490d6e7c 100644
--- a/java/res/xml/keyboard_layout_set_east_slavic.xml
+++ b/java/res/xml/keyboard_layout_set_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_emoji.xml b/java/res/xml/keyboard_layout_set_emoji.xml
index 120b92b87..ef9fb3164 100644
--- a/java/res/xml/keyboard_layout_set_emoji.xml
+++ b/java/res/xml/keyboard_layout_set_emoji.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="emojiRecents"
         latin:elementKeyboard="@xml/kbd_emoji_recents" />
diff --git a/java/res/xml/keyboard_layout_set_farsi.xml b/java/res/xml/keyboard_layout_set_farsi.xml
index 9b44b7b8b..20fe42a1d 100644
--- a/java/res/xml/keyboard_layout_set_farsi.xml
+++ b/java/res/xml/keyboard_layout_set_farsi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="arabic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_georgian.xml b/java/res/xml/keyboard_layout_set_georgian.xml
index a0a060832..35986ff92 100644
--- a/java/res/xml/keyboard_layout_set_georgian.xml
+++ b/java/res/xml/keyboard_layout_set_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="georgian" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_greek.xml b/java/res/xml/keyboard_layout_set_greek.xml
index a1e738f3a..fefc618ef 100644
--- a/java/res/xml/keyboard_layout_set_greek.xml
+++ b/java/res/xml/keyboard_layout_set_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="greek" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_hebrew.xml b/java/res/xml/keyboard_layout_set_hebrew.xml
index d3d4b7633..ac83d1655 100644
--- a/java/res/xml/keyboard_layout_set_hebrew.xml
+++ b/java/res/xml/keyboard_layout_set_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="hebrew" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_hindi.xml b/java/res/xml/keyboard_layout_set_hindi.xml
index ee41b2ae7..a522af7c0 100644
--- a/java/res/xml/keyboard_layout_set_hindi.xml
+++ b/java/res/xml/keyboard_layout_set_hindi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_hindi_compact.xml b/java/res/xml/keyboard_layout_set_hindi_compact.xml
index 147b2993f..1ce1d2026 100644
--- a/java/res/xml/keyboard_layout_set_hindi_compact.xml
+++ b/java/res/xml/keyboard_layout_set_hindi_compact.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_kannada.xml b/java/res/xml/keyboard_layout_set_kannada.xml
index 14323e7ef..72bca7cf9 100644
--- a/java/res/xml/keyboard_layout_set_kannada.xml
+++ b/java/res/xml/keyboard_layout_set_kannada.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="kannada" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_khmer.xml b/java/res/xml/keyboard_layout_set_khmer.xml
index 752c8520a..f6889d9de 100644
--- a/java/res/xml/keyboard_layout_set_khmer.xml
+++ b/java/res/xml/keyboard_layout_set_khmer.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="khmer" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_lao.xml b/java/res/xml/keyboard_layout_set_lao.xml
index 6285f87f9..860e39601 100644
--- a/java/res/xml/keyboard_layout_set_lao.xml
+++ b/java/res/xml/keyboard_layout_set_lao.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="lao" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_malayalam.xml b/java/res/xml/keyboard_layout_set_malayalam.xml
index f6086f6cb..10931fcbb 100644
--- a/java/res/xml/keyboard_layout_set_malayalam.xml
+++ b/java/res/xml/keyboard_layout_set_malayalam.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="malayalam" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_marathi.xml b/java/res/xml/keyboard_layout_set_marathi.xml
index 6aea17546..5822b7b52 100644
--- a/java/res/xml/keyboard_layout_set_marathi.xml
+++ b/java/res/xml/keyboard_layout_set_marathi.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_mongolian.xml b/java/res/xml/keyboard_layout_set_mongolian.xml
index 977fc687b..a476109dd 100644
--- a/java/res/xml/keyboard_layout_set_mongolian.xml
+++ b/java/res/xml/keyboard_layout_set_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_nepali_romanized.xml b/java/res/xml/keyboard_layout_set_nepali_romanized.xml
index 5bad83537..195429be3 100644
--- a/java/res/xml/keyboard_layout_set_nepali_romanized.xml
+++ b/java/res/xml/keyboard_layout_set_nepali_romanized.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_nepali_traditional.xml b/java/res/xml/keyboard_layout_set_nepali_traditional.xml
index 6f11dee58..9ca13645a 100644
--- a/java/res/xml/keyboard_layout_set_nepali_traditional.xml
+++ b/java/res/xml/keyboard_layout_set_nepali_traditional.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="devanagari" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_nordic.xml b/java/res/xml/keyboard_layout_set_nordic.xml
index eb3d45be0..9e37bf988 100644
--- a/java/res/xml/keyboard_layout_set_nordic.xml
+++ b/java/res/xml/keyboard_layout_set_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_nordic"
diff --git a/java/res/xml/keyboard_layout_set_pcqwerty.xml b/java/res/xml/keyboard_layout_set_pcqwerty.xml
index 67fbd9159..87fdb16b8 100644
--- a/java/res/xml/keyboard_layout_set_pcqwerty.xml
+++ b/java/res/xml/keyboard_layout_set_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_pcqwerty"
diff --git a/java/res/xml/keyboard_layout_set_qwerty.xml b/java/res/xml/keyboard_layout_set_qwerty.xml
index 7c9a1403e..a95c5b6a8 100644
--- a/java/res/xml/keyboard_layout_set_qwerty.xml
+++ b/java/res/xml/keyboard_layout_set_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_qwerty"
diff --git a/java/res/xml/keyboard_layout_set_qwertz.xml b/java/res/xml/keyboard_layout_set_qwertz.xml
index f9e87a66f..968f5275d 100644
--- a/java/res/xml/keyboard_layout_set_qwertz.xml
+++ b/java/res/xml/keyboard_layout_set_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_qwertz"
diff --git a/java/res/xml/keyboard_layout_set_serbian_qwertz.xml b/java/res/xml/keyboard_layout_set_serbian_qwertz.xml
index 2c7e28b50..ee6353dbb 100644
--- a/java/res/xml/keyboard_layout_set_serbian_qwertz.xml
+++ b/java/res/xml/keyboard_layout_set_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Element
         latin:allowRedundantMoreKeys="false"
         latin:elementKeyboard="@xml/kbd_serbian_qwertz"
diff --git a/java/res/xml/keyboard_layout_set_sinhala.xml b/java/res/xml/keyboard_layout_set_sinhala.xml
index 1955d218f..a72d39130 100644
--- a/java/res/xml/keyboard_layout_set_sinhala.xml
+++ b/java/res/xml/keyboard_layout_set_sinhala.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="sinhala" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_south_slavic.xml b/java/res/xml/keyboard_layout_set_south_slavic.xml
index b851a999e..c51b37102 100644
--- a/java/res/xml/keyboard_layout_set_south_slavic.xml
+++ b/java/res/xml/keyboard_layout_set_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="cyrillic" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_spanish.xml b/java/res/xml/keyboard_layout_set_spanish.xml
index c454de3b4..78a3d0ff6 100644
--- a/java/res/xml/keyboard_layout_set_spanish.xml
+++ b/java/res/xml/keyboard_layout_set_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_spanish"
diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml
index f925b83f1..ec7d0d0f6 100644
--- a/java/res/xml/keyboard_layout_set_swiss.xml
+++ b/java/res/xml/keyboard_layout_set_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_swiss"
diff --git a/java/res/xml/keyboard_layout_set_tamil.xml b/java/res/xml/keyboard_layout_set_tamil.xml
index 27f4a3266..7a89a10fc 100644
--- a/java/res/xml/keyboard_layout_set_tamil.xml
+++ b/java/res/xml/keyboard_layout_set_tamil.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="tamil" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_telugu.xml b/java/res/xml/keyboard_layout_set_telugu.xml
index 2bf65bcbd..56d5b5a7b 100644
--- a/java/res/xml/keyboard_layout_set_telugu.xml
+++ b/java/res/xml/keyboard_layout_set_telugu.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="telugu" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_thai.xml b/java/res/xml/keyboard_layout_set_thai.xml
index f69dfa6bd..22ccd4e13 100644
--- a/java/res/xml/keyboard_layout_set_thai.xml
+++ b/java/res/xml/keyboard_layout_set_thai.xml
@@ -19,7 +19,7 @@
 -->
 
 <KeyboardLayoutSet
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Feature
         latin:supportedScript="thai" />
     <Element
diff --git a/java/res/xml/keyboard_layout_set_uzbek.xml b/java/res/xml/keyboard_layout_set_uzbek.xml
index 8251b01fd..16b84331d 100644
--- a/java/res/xml/keyboard_layout_set_uzbek.xml
+++ b/java/res/xml/keyboard_layout_set_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Element
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_uzbek"
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
index 05ba6d8f3..309a15fca 100644
--- a/java/res/xml/keys_arabic3_left.xml
+++ b/java/res/xml/keys_arabic3_left.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0630: "ذ" ARABIC LETTER THAL -->
     <Key
diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml
index 596516af3..20e4604c9 100644
--- a/java/res/xml/keys_curly_brackets.xml
+++ b/java/res/xml/keys_curly_brackets.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_curly_bracket" />
diff --git a/java/res/xml/keys_dvorak_123.xml b/java/res/xml/keys_dvorak_123.xml
index 6efc7f2c5..02419c1f6 100644
--- a/java/res/xml/keys_dvorak_123.xml
+++ b/java/res/xml/keys_dvorak_123.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
index 867c02143..72607de1c 100644
--- a/java/res/xml/keys_farsi3_right.xml
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml
index 320b109a8..98919d4c9 100644
--- a/java/res/xml/keys_parentheses.xml
+++ b/java/res/xml/keys_parentheses.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_parenthesis"
diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml
index b188cffab..aec7e4093 100644
--- a/java/res/xml/keys_pcqwerty2_right3.xml
+++ b/java/res/xml/keys_pcqwerty2_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml
index 8a1f60fae..147c87a45 100644
--- a/java/res/xml/keys_pcqwerty3_right2.xml
+++ b/java/res/xml/keys_pcqwerty3_right2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml
index a87f550f7..75bfd0892 100644
--- a/java/res/xml/keys_pcqwerty4_right3.xml
+++ b/java/res/xml/keys_pcqwerty4_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml
index 076b2c2d9..af78ffbe5 100644
--- a/java/res/xml/keys_square_brackets.xml
+++ b/java/res/xml/keys_square_brackets.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_left_square_bracket" />
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
index 2517ac562..f42e525e5 100644
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
index 3eb6ca0c0..be48eef04 100644
--- a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
index e12848c6c..66e2997a5 100644
--- a/java/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index 7863ca48f..50900e139 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
index d66e8e244..bd90b24bf 100644
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+25CC: "◌" DOTTED CIRCLE
          U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 6a62a1f1c..e91696cba 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index 53f831725..1b4731ee7 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 04f84562d..743ab00ca 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index 2f2998fb8..02d89710e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index c36e3fbac..0454a5daa 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 481e53eb4..4e15e1cb1 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 4b3a240b9..a25d01b3b 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index 8ade6efc8..8399a70f2 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 3afded426..374cb599c 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 1eb19b573..e0b1e0e06 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 0bb3426e4..abdc4d6fd 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 688826a43..1381b3f0e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,7 +22,7 @@
      API version 16 can't automatically render dotted circle for incomplete combining letter
      of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
      counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
             <!-- U+25CC: "◌" DOTTED CIRCLE
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 3ab254307..81ed238cf 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -113,7 +113,7 @@
 <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
      subtype.-->
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
-        android:settingsActivity="com.android.inputmethod.latin.settings.SettingsActivity"
+        android:settingsActivity="org.kelar.inputmethod.latin.settings.SettingsActivity"
         android:isDefault="@bool/im_is_default"
         android:supportsSwitchingToNextInputMethod="true">
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index f01909f37..e30a5e9a0 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -16,30 +16,30 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:key="english_ime_settings">
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.PreferencesSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.PreferencesSettingsFragment"
         android:title="@string/settings_screen_preferences"
         android:key="screen_preferences" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.AccountsSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.AccountsSettingsFragment"
         android:title="@string/settings_screen_accounts"
         android:key="screen_accounts" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.AppearanceSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.AppearanceSettingsFragment"
         android:title="@string/settings_screen_appearance"
         android:key="screen_appearance" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.GestureSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.GestureSettingsFragment"
         android:title="@string/settings_screen_gesture"
         android:key="screen_gesture" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.CorrectionSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.CorrectionSettingsFragment"
         android:title="@string/settings_screen_correction"
         android:key="screen_correction" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.AdvancedSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.AdvancedSettingsFragment"
         android:title="@string/settings_screen_advanced"
         android:key="screen_advanced" />
 </PreferenceScreen>
diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml
index 415b0b4e1..f874b627e 100644
--- a/java/res/xml/prefs_screen_accounts.xml
+++ b/java/res/xml/prefs_screen_accounts.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_accounts">
 
     <!-- This preference is a fake view of the underlying preference.
diff --git a/java/res/xml/prefs_screen_advanced.xml b/java/res/xml/prefs_screen_advanced.xml
index b27104a2c..ff76b77fa 100644
--- a/java/res/xml/prefs_screen_advanced.xml
+++ b/java/res/xml/prefs_screen_advanced.xml
@@ -16,22 +16,22 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_advanced"
     android:key="screen_advanced">
     <!-- TODO: consolidate key preview dismiss delay with the key preview animation parameters. -->
     <ListPreference
         android:key="pref_key_preview_popup_dismiss_delay"
         android:title="@string/key_preview_popup_dismiss_delay" />
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:key="pref_vibration_duration_settings"
         android:title="@string/prefs_keypress_vibration_duration_settings"
         latin:maxValue="@integer/config_max_vibration_duration" />
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:key="pref_keypress_sound_volume"
         android:title="@string/prefs_keypress_sound_volume_settings"
         latin:maxValue="100" /> <!-- percent -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:key="pref_key_longpress_timeout"
         android:title="@string/prefs_key_longpress_timeout_settings"
         latin:minValue="@integer/config_min_longpress_timeout"
@@ -49,7 +49,7 @@
         android:summary="@string/show_setup_wizard_icon_summary"
         android:persistent="true" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.DebugSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.DebugSettingsFragment"
         android:key="screen_debug"
         android:title="Debug settings"
         android:defaultValue="false"
diff --git a/java/res/xml/prefs_screen_appearance.xml b/java/res/xml/prefs_screen_appearance.xml
index 036b66553..c10d22ecd 100644
--- a/java/res/xml/prefs_screen_appearance.xml
+++ b/java/res/xml/prefs_screen_appearance.xml
@@ -19,11 +19,11 @@
     android:key="screen_appearance"
     android:title="@string/settings_screen_appearance">
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.ThemeSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.ThemeSettingsFragment"
         android:key="screen_theme"
         android:title="@string/settings_screen_theme" />
     <PreferenceScreen
-        android:fragment="com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment"
+        android:fragment="org.kelar.inputmethod.latin.settings.CustomInputStyleSettingsFragment"
         android:key="custom_input_styles"
         android:title="@string/custom_input_styles_title" />
     <CheckBoxPreference
diff --git a/java/res/xml/prefs_screen_correction.xml b/java/res/xml/prefs_screen_correction.xml
index a943dc1a3..22ff6246c 100644
--- a/java/res/xml/prefs_screen_correction.xml
+++ b/java/res/xml/prefs_screen_correction.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_correction"
     android:key="screen_correction">
     <PreferenceScreen
diff --git a/java/res/xml/prefs_screen_debug.xml b/java/res/xml/prefs_screen_debug.xml
index 1ae2d0e9f..a437fa0c6 100644
--- a/java/res/xml/prefs_screen_debug.xml
+++ b/java/res/xml/prefs_screen_debug.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/prefs_debug_mode"
     android:key="english_ime_debug_settings"
 >
@@ -46,32 +46,32 @@
         android:title="@string/prefs_customize_key_preview_animation"
         android:defaultValue="false"
         android:persistent="true" />
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_show_up_start_x_scale"
         android:title="@string/prefs_key_popup_show_up_start_x_scale_settings"
         latin:maxValue="100" /> <!-- percent -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_show_up_start_y_scale"
         android:title="@string/prefs_key_popup_show_up_start_y_scale_settings"
         latin:maxValue="100" /> <!-- percent -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_dismiss_end_x_scale"
         android:title="@string/prefs_key_popup_dismiss_end_x_scale_settings"
         latin:maxValue="100" /> <!-- percent -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_dismiss_end_y_scale"
         android:title="@string/prefs_key_popup_dismiss_end_y_scale_settings"
         latin:maxValue="100" /> <!-- percent -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_show_up_duration"
         android:title="@string/prefs_key_popup_show_up_duration_settings"
         latin:maxValue="100" /> <!-- milliseconds -->
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_has_custom_key_preview_animation_params"
         android:key="pref_key_preview_dismiss_duration"
         android:title="@string/prefs_key_popup_dismiss_duration_settings"
@@ -81,7 +81,7 @@
         android:title="@string/prefs_resize_keyboard"
         android:defaultValue="false"
         android:persistent="true" />
-    <com.android.inputmethod.latin.settings.SeekBarDialogPreference
+    <org.kelar.inputmethod.latin.settings.SeekBarDialogPreference
         android:dependency="pref_resize_keyboard"
         android:key="pref_keyboard_height_scale"
         android:title="@string/prefs_keyboard_height_scale"
diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml
index 101edc855..0bc69ac41 100644
--- a/java/res/xml/prefs_screen_preferences.xml
+++ b/java/res/xml/prefs_screen_preferences.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_preferences">
     <CheckBoxPreference
         android:key="auto_cap"
diff --git a/java/res/xml/prefs_screen_theme.xml b/java/res/xml/prefs_screen_theme.xml
index 677a6ea3b..edad53324 100644
--- a/java/res/xml/prefs_screen_theme.xml
+++ b/java/res/xml/prefs_screen_theme.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
     android:title="@string/settings_screen_theme"
     android:key="screen_theme">
     <!-- Keyboard theme list will be populated programmatically here. -->
diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml
index 32c5389cc..accf64d16 100644
--- a/java/res/xml/row_pcqwerty5.xml
+++ b/java/res/xml/row_pcqwerty5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="7.692%p"
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index 5bc104f69..15f0b38db 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row
         latin:keyWidth="10%p"
diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index 2be03bd6d..5d63403d9 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <Key
         latin:keySpec="!text/keyspec_comma" />
     <Key
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 4fc63c2c5..c0e4194c6 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -17,7 +17,7 @@
 ** limitations under the License.
 */
 -->
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include
         latin:keyboardLayout="@xml/key_styles_less_greater" />
     <Key
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 9f83fef50..211186146 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+0661: "١" ARABIC-INDIC DIGIT ONE -->
     <Key
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index 4f401e8bc..1f0b42f3d 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0634: "ش" ARABIC LETTER SHEEN
          U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
     <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 8b178013e..c6abfb800 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/keys_arabic3_left" />
     <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
     <Key latin:keySpec="&#x0621;" />
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
index 8d54b179c..6289d3c1b 100644
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
     <Key
         latin:keySpec="&#x0567;"
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
index cb1b932b9..174468e53 100644
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0584: "ք" ARMENIAN SMALL LETTER KEH -->
     <Key latin:keySpec="&#x0584;" />
     <!-- U+0578: "ո" ARMENIAN SMALL LETTER VO -->
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
index 33db4529f..fe911b5c3 100644
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
     <Key latin:keySpec="&#x0561;" />
     <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
index c7db25b73..4436dc428 100644
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0566: "զ" ARMENIAN SMALL LETTER ZA -->
     <Key latin:keySpec="&#x0566;" />
     <!-- U+0572: "ղ" ARMENIAN SMALL LETTER GHAD -->
diff --git a/java/res/xml/rowkeys_azerty1.xml b/java/res/xml/rowkeys_azerty1.xml
index 67be342c0..b5c1171bb 100644
--- a/java/res/xml/rowkeys_azerty1.xml
+++ b/java/res/xml/rowkeys_azerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml
index 116417f08..c03b6b602 100644
--- a/java/res/xml/rowkeys_azerty2.xml
+++ b/java/res/xml/rowkeys_azerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q" />
diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml
index 48d3a5280..5c63569ca 100644
--- a/java/res/xml/rowkeys_azerty3.xml
+++ b/java/res/xml/rowkeys_azerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="w"
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index 971fff61f..a1530262b 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0994: "ঔ" BENGALI LETTER AU
          U+09CC: "ৌ" BENGALI VOWEL SIGN AU
          U+09E7: "১" BENGALI DIGIT ONE -->
diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml
index 44b361797..8908201e0 100644
--- a/java/res/xml/rowkeys_bengali2.xml
+++ b/java/res/xml/rowkeys_bengali2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0993: "ও" BENGALI LETTER O
          U+09CB: "ো" BENGALI VOWEL SIGN O -->
     <Key
diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml
index 5222b096b..12fad6d12 100644
--- a/java/res/xml/rowkeys_bengali3.xml
+++ b/java/res/xml/rowkeys_bengali3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU
          U+0983: "ঃ" BENGALI SIGN VISARGA
          U+0982: "ং" BENGALI SIGN ANUSVARA -->
diff --git a/java/res/xml/rowkeys_bengali_akkhor1.xml b/java/res/xml/rowkeys_bengali_akkhor1.xml
index bc612bec9..30b09da71 100644
--- a/java/res/xml/rowkeys_bengali_akkhor1.xml
+++ b/java/res/xml/rowkeys_bengali_akkhor1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+09A2: "ঢ" BENGALI LETTER DDHA -->
diff --git a/java/res/xml/rowkeys_bengali_akkhor2.xml b/java/res/xml/rowkeys_bengali_akkhor2.xml
index 1dbab5560..743dec0d4 100644
--- a/java/res/xml/rowkeys_bengali_akkhor2.xml
+++ b/java/res/xml/rowkeys_bengali_akkhor2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0985: "অ" BENGALI LETTER A -->
diff --git a/java/res/xml/rowkeys_bengali_akkhor3.xml b/java/res/xml/rowkeys_bengali_akkhor3.xml
index eb9e8362f..d5bb4d1db 100644
--- a/java/res/xml/rowkeys_bengali_akkhor3.xml
+++ b/java/res/xml/rowkeys_bengali_akkhor3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0964: "।" DEVANAGARI DANDA
diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml
index e84719302..86e5d4777 100644
--- a/java/res/xml/rowkeys_bulgarian1.xml
+++ b/java/res/xml/rowkeys_bulgarian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml
index e572a221d..f48b4cdc9 100644
--- a/java/res/xml/rowkeys_bulgarian2.xml
+++ b/java/res/xml/rowkeys_bulgarian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml
index 2509793b2..c14aabdcd 100644
--- a/java/res/xml/rowkeys_bulgarian3.xml
+++ b/java/res/xml/rowkeys_bulgarian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
     <Key
diff --git a/java/res/xml/rowkeys_bulgarian_bds1.xml b/java/res/xml/rowkeys_bulgarian_bds1.xml
index 9d6428268..70fa2b271 100644
--- a/java/res/xml/rowkeys_bulgarian_bds1.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
     <Key
diff --git a/java/res/xml/rowkeys_bulgarian_bds2.xml b/java/res/xml/rowkeys_bulgarian_bds2.xml
index e078ae7d3..e61ee5919 100644
--- a/java/res/xml/rowkeys_bulgarian_bds2.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
     <Key
diff --git a/java/res/xml/rowkeys_bulgarian_bds3.xml b/java/res/xml/rowkeys_bulgarian_bds3.xml
index 8302d6922..82f0bfe95 100644
--- a/java/res/xml/rowkeys_bulgarian_bds3.xml
+++ b/java/res/xml/rowkeys_bulgarian_bds3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
     <Key
diff --git a/java/res/xml/rowkeys_colemak1.xml b/java/res/xml/rowkeys_colemak1.xml
index 199d285f9..33b4ae56d 100644
--- a/java/res/xml/rowkeys_colemak1.xml
+++ b/java/res/xml/rowkeys_colemak1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q"
diff --git a/java/res/xml/rowkeys_colemak2.xml b/java/res/xml/rowkeys_colemak2.xml
index a8e93bf0e..d405d6643 100644
--- a/java/res/xml/rowkeys_colemak2.xml
+++ b/java/res/xml/rowkeys_colemak2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/java/res/xml/rowkeys_colemak3.xml b/java/res/xml/rowkeys_colemak3.xml
index df4d9936e..d902da4e5 100644
--- a/java/res/xml/rowkeys_colemak3.xml
+++ b/java/res/xml/rowkeys_colemak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="z"
diff --git a/java/res/xml/rowkeys_dvorak1.xml b/java/res/xml/rowkeys_dvorak1.xml
index 170e31664..edf5bee07 100644
--- a/java/res/xml/rowkeys_dvorak1.xml
+++ b/java/res/xml/rowkeys_dvorak1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/keys_dvorak_123" />
diff --git a/java/res/xml/rowkeys_dvorak2.xml b/java/res/xml/rowkeys_dvorak2.xml
index 0840a6cfc..cf72c10d5 100644
--- a/java/res/xml/rowkeys_dvorak2.xml
+++ b/java/res/xml/rowkeys_dvorak2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/java/res/xml/rowkeys_dvorak3.xml b/java/res/xml/rowkeys_dvorak3.xml
index e53908c91..3558620bb 100644
--- a/java/res/xml/rowkeys_dvorak3.xml
+++ b/java/res/xml/rowkeys_dvorak3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="j"
diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
index 88d95fffb..4147a88a8 100644
--- a/java/res/xml/rowkeys_east_slavic1.xml
+++ b/java/res/xml/rowkeys_east_slavic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
     <Key
diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
index 21463fb7d..5c663a22c 100644
--- a/java/res/xml/rowkeys_east_slavic2.xml
+++ b/java/res/xml/rowkeys_east_slavic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
     <Key
diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
index 54802e878..e487ef146 100644
--- a/java/res/xml/rowkeys_east_slavic3.xml
+++ b/java/res/xml/rowkeys_east_slavic3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index abc2c9614..363c28e28 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
     <Key
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index 82f1903c7..bec654d54 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0634: "ش" ARABIC LETTER SHEEN -->
     <Key latin:keySpec="&#x0634;" />
     <!-- U+0633: "س" ARABIC LETTER SEEN -->
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index b825a36d5..e82a1d5df 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
     <Key latin:keySpec="&#x0638;" />
     <!-- U+0637: "ط" ARABIC LETTER TAH -->
diff --git a/java/res/xml/rowkeys_georgian1.xml b/java/res/xml/rowkeys_georgian1.xml
index c412aa3fa..4bdf3488b 100644
--- a/java/res/xml/rowkeys_georgian1.xml
+++ b/java/res/xml/rowkeys_georgian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_georgian2.xml b/java/res/xml/rowkeys_georgian2.xml
index 162960d75..1d4b8ae89 100644
--- a/java/res/xml/rowkeys_georgian2.xml
+++ b/java/res/xml/rowkeys_georgian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_georgian3.xml b/java/res/xml/rowkeys_georgian3.xml
index a16acf8d3..106f140a4 100644
--- a/java/res/xml/rowkeys_georgian3.xml
+++ b/java/res/xml/rowkeys_georgian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
index 45895a579..5027ddbba 100644
--- a/java/res/xml/rowkeys_greek1.xml
+++ b/java/res/xml/rowkeys_greek1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_greek2.xml b/java/res/xml/rowkeys_greek2.xml
index 97dde5b42..81c1347eb 100644
--- a/java/res/xml/rowkeys_greek2.xml
+++ b/java/res/xml/rowkeys_greek2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_greek3.xml b/java/res/xml/rowkeys_greek3.xml
index 0c2667be1..0d11f6172 100644
--- a/java/res/xml/rowkeys_greek3.xml
+++ b/java/res/xml/rowkeys_greek3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->
     <Key
diff --git a/java/res/xml/rowkeys_hebrew1.xml b/java/res/xml/rowkeys_hebrew1.xml
index e888977ae..d55b7cfac 100644
--- a/java/res/xml/rowkeys_hebrew1.xml
+++ b/java/res/xml/rowkeys_hebrew1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_hebrew2.xml b/java/res/xml/rowkeys_hebrew2.xml
index d43f5a8f2..4c692f122 100644
--- a/java/res/xml/rowkeys_hebrew2.xml
+++ b/java/res/xml/rowkeys_hebrew2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
     <Key
diff --git a/java/res/xml/rowkeys_hebrew3.xml b/java/res/xml/rowkeys_hebrew3.xml
index 928e6b255..6db9bacf0 100644
--- a/java/res/xml/rowkeys_hebrew3.xml
+++ b/java/res/xml/rowkeys_hebrew3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
          U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index cd08e1600..d1ae43515 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index fec93f3c6..57f9d5cd5 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index 2e6d6864e..016930a5a 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
index 06a014162..a8235df92 100644
--- a/java/res/xml/rowkeys_hindi_compact1.xml
+++ b/java/res/xml/rowkeys_hindi_compact1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
index 94aaaf2f3..9d7d795fb 100644
--- a/java/res/xml/rowkeys_hindi_compact2.xml
+++ b/java/res/xml/rowkeys_hindi_compact2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
index 394eb23e7..41b480812 100644
--- a/java/res/xml/rowkeys_hindi_compact3.xml
+++ b/java/res/xml/rowkeys_hindi_compact3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_kannada1.xml b/java/res/xml/rowkeys_kannada1.xml
index e7aecd867..d3f825cbc 100644
--- a/java/res/xml/rowkeys_kannada1.xml
+++ b/java/res/xml/rowkeys_kannada1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CCC: "ೌ" KANNADA VOWEL SIGN AU
          U+0C94: "ಔ" KANNADA LETTER AU
          U+0CE7: "೧" KANNADA DIGIT ONE -->
diff --git a/java/res/xml/rowkeys_kannada2.xml b/java/res/xml/rowkeys_kannada2.xml
index f3e6c187b..89d2cfc14 100644
--- a/java/res/xml/rowkeys_kannada2.xml
+++ b/java/res/xml/rowkeys_kannada2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CCB: "ೋ" KANNADA VOWEL SIGN OO
          U+0C93: "ಓ" KANNADA LETTER OO -->
     <Key
diff --git a/java/res/xml/rowkeys_kannada3.xml b/java/res/xml/rowkeys_kannada3.xml
index 03fa05551..8cdaa256b 100644
--- a/java/res/xml/rowkeys_kannada3.xml
+++ b/java/res/xml/rowkeys_kannada3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0CC6: "ೆ" KANNADA VOWEL SIGN E
          U+0C92: "ಒ" KANNADA LETTER O -->
     <Key
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
index 79fd231a0..c70b74814 100644
--- a/java/res/xml/rowkeys_khmer1.xml
+++ b/java/res/xml/rowkeys_khmer1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+200D: ZERO WIDTH JOINER -->
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index 04ca1e0df..eb45c1faf 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+1788: "ឈ" KHMER LETTER CHO
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index c2db36449..1201c0fed 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
index 70bdcf1bb..8f1ce82ee 100644
--- a/java/res/xml/rowkeys_khmer4.xml
+++ b/java/res/xml/rowkeys_khmer4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+178D: "ឍ" KHMER LETTER TTHO -->
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index f88d5fd66..020e4b9ff 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0ED1: "໑" LAO DIGIT ONE -->
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
index 46b6395d7..56b6f26fe 100644
--- a/java/res/xml/rowkeys_lao2.xml
+++ b/java/res/xml/rowkeys_lao2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index ab3e25131..f59e0dcd0 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index 5beb1cbcb..1b18a120d 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+20AD: "₭" KIP SIGN -->
diff --git a/java/res/xml/rowkeys_malayalam1.xml b/java/res/xml/rowkeys_malayalam1.xml
index 79d96cbb7..f7d996767 100644
--- a/java/res/xml/rowkeys_malayalam1.xml
+++ b/java/res/xml/rowkeys_malayalam1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <!-- U+0D4D: "്" MALAYALAM SIGN VIRAMA
          U+0D05: "അ" MALAYALAM LETTER A -->
     <Key
diff --git a/java/res/xml/rowkeys_malayalam2.xml b/java/res/xml/rowkeys_malayalam2.xml
index f0f9df025..0c9dd3915 100644
--- a/java/res/xml/rowkeys_malayalam2.xml
+++ b/java/res/xml/rowkeys_malayalam2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0D15: "ക" MALAYALAM LETTER KA
          U+0D16: "ഖ" MALAYALAM LETTER KHA -->
     <Key
diff --git a/java/res/xml/rowkeys_malayalam3.xml b/java/res/xml/rowkeys_malayalam3.xml
index 6959ccda1..5485f1472 100644
--- a/java/res/xml/rowkeys_malayalam3.xml
+++ b/java/res/xml/rowkeys_malayalam3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0D2A: "പ" MALAYALAM LETTER PA
          U+0D2B: "ഫ" MALAYALAM LETTER PHA -->
     <Key
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
index 596664bc6..b18042d2a 100644
--- a/java/res/xml/rowkeys_marathi1.xml
+++ b/java/res/xml/rowkeys_marathi1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
index 060822ee5..7517c49a6 100644
--- a/java/res/xml/rowkeys_marathi2.xml
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
index 661e79672..9529ba1fa 100644
--- a/java/res/xml/rowkeys_marathi3.xml
+++ b/java/res/xml/rowkeys_marathi3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- Because the font rendering system prior to API version 16 can't automatically
          render dotted circle for incomplete combining letter of some scripts, different
          set of Key definitions are needed based on the API version. -->
diff --git a/java/res/xml/rowkeys_mongolian1.xml b/java/res/xml/rowkeys_mongolian1.xml
index 2bd8097e2..14108b404 100644
--- a/java/res/xml/rowkeys_mongolian1.xml
+++ b/java/res/xml/rowkeys_mongolian1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
     <Key
diff --git a/java/res/xml/rowkeys_mongolian2.xml b/java/res/xml/rowkeys_mongolian2.xml
index f11f4f230..3426771a3 100644
--- a/java/res/xml/rowkeys_mongolian2.xml
+++ b/java/res/xml/rowkeys_mongolian2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
     <Key
diff --git a/java/res/xml/rowkeys_mongolian3.xml b/java/res/xml/rowkeys_mongolian3.xml
index cf57d1c2a..5300b2ce4 100644
--- a/java/res/xml/rowkeys_mongolian3.xml
+++ b/java/res/xml/rowkeys_mongolian3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
     <Key
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
index 67be51bb0..b471f5dd5 100644
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ b/java/res/xml/rowkeys_nepali_romanized1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
index 2e2583cca..2f3ee14c2 100644
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ b/java/res/xml/rowkeys_nepali_romanized2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml
index c6a1e283e..552c9a989 100644
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ b/java/res/xml/rowkeys_nepali_romanized3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
index 73b2275ef..761590697 100644
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ b/java/res/xml/rowkeys_nepali_traditional1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0924/U+094D/U+0924: "त्त" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
index c443daf5d..d55692dea 100644
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ b/java/res/xml/rowkeys_nepali_traditional2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
diff --git a/java/res/xml/rowkeys_nepali_traditional3.xml b/java/res/xml/rowkeys_nepali_traditional3.xml
index c43c59386..1057aac05 100644
--- a/java/res/xml/rowkeys_nepali_traditional3.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
diff --git a/java/res/xml/rowkeys_nordic1.xml b/java/res/xml/rowkeys_nordic1.xml
index ff589cc4a..89f4358e2 100644
--- a/java/res/xml/rowkeys_nordic1.xml
+++ b/java/res/xml/rowkeys_nordic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty1" />
diff --git a/java/res/xml/rowkeys_nordic2.xml b/java/res/xml/rowkeys_nordic2.xml
index 0330c0f67..5cd8152a3 100644
--- a/java/res/xml/rowkeys_nordic2.xml
+++ b/java/res/xml/rowkeys_nordic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml
index 564468a9a..2e4067ff8 100644
--- a/java/res/xml/rowkeys_pcqwerty1.xml
+++ b/java/res/xml/rowkeys_pcqwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_pcqwerty1_shift.xml b/java/res/xml/rowkeys_pcqwerty1_shift.xml
index c72040f8a..c925a86bd 100644
--- a/java/res/xml/rowkeys_pcqwerty1_shift.xml
+++ b/java/res/xml/rowkeys_pcqwerty1_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="~" />
diff --git a/java/res/xml/rowkeys_pcqwerty2.xml b/java/res/xml/rowkeys_pcqwerty2.xml
index 8db704d71..781aec8bf 100644
--- a/java/res/xml/rowkeys_pcqwerty2.xml
+++ b/java/res/xml/rowkeys_pcqwerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row2 consist of the letters of QWERTY layout row1 and
          some symbols keys. -->
diff --git a/java/res/xml/rowkeys_pcqwerty3.xml b/java/res/xml/rowkeys_pcqwerty3.xml
index ad122d30c..f888fe2b6 100644
--- a/java/res/xml/rowkeys_pcqwerty3.xml
+++ b/java/res/xml/rowkeys_pcqwerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row3 consist of the letters of QWERTY layout row2 and
          some symbols keys. -->
diff --git a/java/res/xml/rowkeys_pcqwerty4.xml b/java/res/xml/rowkeys_pcqwerty4.xml
index b558f4142..7e46828a1 100644
--- a/java/res/xml/rowkeys_pcqwerty4.xml
+++ b/java/res/xml/rowkeys_pcqwerty4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- The keys on this PC layout row4 consist of the letters of QWERTY layout row3 and
          some symbols keys. -->
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
index b8e4a4c78..35c34fad1 100644
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ b/java/res/xml/rowkeys_qwerty1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- q,w,e,r,t -->
     <include
diff --git a/java/res/xml/rowkeys_qwerty1_left5.xml b/java/res/xml/rowkeys_qwerty1_left5.xml
index ff9f1b2b5..3655e3881 100644
--- a/java/res/xml/rowkeys_qwerty1_left5.xml
+++ b/java/res/xml/rowkeys_qwerty1_left5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_q"
diff --git a/java/res/xml/rowkeys_qwerty1_right5.xml b/java/res/xml/rowkeys_qwerty1_right5.xml
index 2b3cae2e8..5fb548bd4 100644
--- a/java/res/xml/rowkeys_qwerty1_right5.xml
+++ b/java/res/xml/rowkeys_qwerty1_right5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_y"
diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml
index 550db3b3f..794bb82a4 100644
--- a/java/res/xml/rowkeys_qwerty2.xml
+++ b/java/res/xml/rowkeys_qwerty2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- a,s,d,f,g -->
     <include
diff --git a/java/res/xml/rowkeys_qwerty2_left5.xml b/java/res/xml/rowkeys_qwerty2_left5.xml
index 1803bf203..6c2306a23 100644
--- a/java/res/xml/rowkeys_qwerty2_left5.xml
+++ b/java/res/xml/rowkeys_qwerty2_left5.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="a"
diff --git a/java/res/xml/rowkeys_qwerty2_right4.xml b/java/res/xml/rowkeys_qwerty2_right4.xml
index 99936b7a2..1ac949585 100644
--- a/java/res/xml/rowkeys_qwerty2_right4.xml
+++ b/java/res/xml/rowkeys_qwerty2_right4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="h"
diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml
index 7a523f1f6..97f46b741 100644
--- a/java/res/xml/rowkeys_qwerty3.xml
+++ b/java/res/xml/rowkeys_qwerty3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- z,x,c,v -->
     <include
diff --git a/java/res/xml/rowkeys_qwerty3_left4.xml b/java/res/xml/rowkeys_qwerty3_left4.xml
index 6043c3bba..6691b8d52 100644
--- a/java/res/xml/rowkeys_qwerty3_left4.xml
+++ b/java/res/xml/rowkeys_qwerty3_left4.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="z"
diff --git a/java/res/xml/rowkeys_qwerty3_right3.xml b/java/res/xml/rowkeys_qwerty3_right3.xml
index f69910344..173d47b22 100644
--- a/java/res/xml/rowkeys_qwerty3_right3.xml
+++ b/java/res/xml/rowkeys_qwerty3_right3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="b" />
diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml
index c4edae339..28f6a2c7c 100644
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ b/java/res/xml/rowkeys_qwertz1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="q"
diff --git a/java/res/xml/rowkeys_qwertz3.xml b/java/res/xml/rowkeys_qwertz3.xml
index a66c34868..959d4fba2 100644
--- a/java/res/xml/rowkeys_qwertz3.xml
+++ b/java/res/xml/rowkeys_qwertz3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="y"
diff --git a/java/res/xml/rowkeys_serbian_qwertz1.xml b/java/res/xml/rowkeys_serbian_qwertz1.xml
index 1615701d3..4cc58cac8 100644
--- a/java/res/xml/rowkeys_serbian_qwertz1.xml
+++ b/java/res/xml/rowkeys_serbian_qwertz1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwertz1" />
     <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
     <Key latin:keySpec="&#x0161;" />
diff --git a/java/res/xml/rowkeys_serbian_qwertz2.xml b/java/res/xml/rowkeys_serbian_qwertz2.xml
index 83ec92d29..b008f805b 100644
--- a/java/res/xml/rowkeys_serbian_qwertz2.xml
+++ b/java/res/xml/rowkeys_serbian_qwertz2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
     <Key latin:keySpec="&#x010D;" />
diff --git a/java/res/xml/rowkeys_serbian_qwertz3.xml b/java/res/xml/rowkeys_serbian_qwertz3.xml
index 30ba7afa2..8bf69d901 100644
--- a/java/res/xml/rowkeys_serbian_qwertz3.xml
+++ b/java/res/xml/rowkeys_serbian_qwertz3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwertz3" />
     <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
     <Key latin:keySpec="&#x0111;" />
diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
index 2ecb47eee..8affb37aa 100644
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ b/java/res/xml/rowkeys_sinhala1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml
index 92c1e0892..1e1fffc1e 100644
--- a/java/res/xml/rowkeys_sinhala2.xml
+++ b/java/res/xml/rowkeys_sinhala2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0DDF: "ෟ" SINHALA VOWEL SIGN GAYANUKITTA -->
diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml
index 872787517..fae9f5ef9 100644
--- a/java/res/xml/rowkeys_sinhala3.xml
+++ b/java/res/xml/rowkeys_sinhala3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
diff --git a/java/res/xml/rowkeys_south_slavic1.xml b/java/res/xml/rowkeys_south_slavic1.xml
index 064f164e8..a289bfa0f 100644
--- a/java/res/xml/rowkeys_south_slavic1.xml
+++ b/java/res/xml/rowkeys_south_slavic1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
     <Key
diff --git a/java/res/xml/rowkeys_south_slavic2.xml b/java/res/xml/rowkeys_south_slavic2.xml
index 3b98001b2..4a5e67dc1 100644
--- a/java/res/xml/rowkeys_south_slavic2.xml
+++ b/java/res/xml/rowkeys_south_slavic2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
diff --git a/java/res/xml/rowkeys_south_slavic3.xml b/java/res/xml/rowkeys_south_slavic3.xml
index 31df9b96e..de580b2a3 100644
--- a/java/res/xml/rowkeys_south_slavic3.xml
+++ b/java/res/xml/rowkeys_south_slavic3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_south_slavic_row3_1" />
diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml
index 5c7f67cdd..8866d3279 100644
--- a/java/res/xml/rowkeys_spanish2.xml
+++ b/java/res/xml/rowkeys_spanish2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/java/res/xml/rowkeys_swiss1.xml b/java/res/xml/rowkeys_swiss1.xml
index 2b82c81bd..9c8e3bb72 100644
--- a/java/res/xml/rowkeys_swiss1.xml
+++ b/java/res/xml/rowkeys_swiss1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwertz1" />
diff --git a/java/res/xml/rowkeys_swiss2.xml b/java/res/xml/rowkeys_swiss2.xml
index 770911179..b4f2c8eb1 100644
--- a/java/res/xml/rowkeys_swiss2.xml
+++ b/java/res/xml/rowkeys_swiss2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/rowkeys_qwerty2" />
diff --git a/java/res/xml/rowkeys_symbols1.xml b/java/res/xml/rowkeys_symbols1.xml
index daf9087b2..93937cff1 100644
--- a/java/res/xml/rowkeys_symbols1.xml
+++ b/java/res/xml/rowkeys_symbols1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="!text/keyspec_symbols_1"
diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index e55b1b835..40d4817b6 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <switch>
         <case
diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
index 8093081f8..7b52b1f63 100644
--- a/java/res/xml/rowkeys_symbols3.xml
+++ b/java/res/xml/rowkeys_symbols3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="*"
diff --git a/java/res/xml/rowkeys_symbols_shift1.xml b/java/res/xml/rowkeys_symbols_shift1.xml
index f232a7de2..93992091a 100644
--- a/java/res/xml/rowkeys_symbols_shift1.xml
+++ b/java/res/xml/rowkeys_symbols_shift1.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="~" />
diff --git a/java/res/xml/rowkeys_symbols_shift2.xml b/java/res/xml/rowkeys_symbols_shift2.xml
index 39a58030b..990a95043 100644
--- a/java/res/xml/rowkeys_symbols_shift2.xml
+++ b/java/res/xml/rowkeys_symbols_shift2.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keyStyle="moreCurrency1KeyStyle" />
diff --git a/java/res/xml/rowkeys_symbols_shift3.xml b/java/res/xml/rowkeys_symbols_shift3.xml
index 92ff97bb0..4d1818e42 100644
--- a/java/res/xml/rowkeys_symbols_shift3.xml
+++ b/java/res/xml/rowkeys_symbols_shift3.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
         latin:keySpec="\\" />
diff --git a/java/res/xml/rowkeys_tamil1.xml b/java/res/xml/rowkeys_tamil1.xml
index d6a5cfaf9..8f723bdbc 100644
--- a/java/res/xml/rowkeys_tamil1.xml
+++ b/java/res/xml/rowkeys_tamil1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B94: "ஔ" TAMIL LETTER AU
          U+0BCC: "ௌ" TAMIL VOWEL SIGN AU -->
     <Key
diff --git a/java/res/xml/rowkeys_tamil2.xml b/java/res/xml/rowkeys_tamil2.xml
index ec0b2a83c..ccf98b365 100644
--- a/java/res/xml/rowkeys_tamil2.xml
+++ b/java/res/xml/rowkeys_tamil2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B93: "ஓ" TAMIL LETTER OO
          U+0BCB: "ோ" TAMIL VOWEL SIGN OO
          U+0BD0: "ௐ" TAMIL OM -->
diff --git a/java/res/xml/rowkeys_tamil3.xml b/java/res/xml/rowkeys_tamil3.xml
index e517e142b..281314ddf 100644
--- a/java/res/xml/rowkeys_tamil3.xml
+++ b/java/res/xml/rowkeys_tamil3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0B92: "ஒ" TAMIL LETTER O
          U+0BCA: "ொ" TAMIL VOWEL SIGN O -->
     <Key
diff --git a/java/res/xml/rowkeys_telugu1.xml b/java/res/xml/rowkeys_telugu1.xml
index 8a5c8506f..20bc695bd 100644
--- a/java/res/xml/rowkeys_telugu1.xml
+++ b/java/res/xml/rowkeys_telugu1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4C: "ౌ" TELUGU VOWEL SIGN AU
          U+0C14: "ఔ" TELUGU LETTER AU -->
     <Key
diff --git a/java/res/xml/rowkeys_telugu2.xml b/java/res/xml/rowkeys_telugu2.xml
index f1ce459e5..c3c4a6b81 100644
--- a/java/res/xml/rowkeys_telugu2.xml
+++ b/java/res/xml/rowkeys_telugu2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4B: "ో" TELUGU VOWEL SIGN OO
          U+0C13: "ఓ" TELUGU LETTER OO -->
     <Key
diff --git a/java/res/xml/rowkeys_telugu3.xml b/java/res/xml/rowkeys_telugu3.xml
index 2e3730ac7..e42eaa503 100644
--- a/java/res/xml/rowkeys_telugu3.xml
+++ b/java/res/xml/rowkeys_telugu3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <!-- U+0C4A: "ొ" TELUGU VOWEL SIGN O
          U+0C12: "ఒ" TELUGU LETTER O -->
     <Key
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index 864bca876..2211994b5 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index f43d31fff..4aee1cd17 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E50: "๐" THAI DIGIT ZERO -->
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 03959b9aa..fd2191339 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index db665bed5..3e70d7e82 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <Key
diff --git a/java/res/xml/rowkeys_uzbek1.xml b/java/res/xml/rowkeys_uzbek1.xml
index 967e9a76b..1a12d3379 100644
--- a/java/res/xml/rowkeys_uzbek1.xml
+++ b/java/res/xml/rowkeys_uzbek1.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty1" />
     <!-- U+006F/U+02BB: "oʻ" LATIN SMALL LETTER O/MODIFIER LETTER TURNED COMMA -->
     <Key
diff --git a/java/res/xml/rowkeys_uzbek2.xml b/java/res/xml/rowkeys_uzbek2.xml
index b768a12a4..171482b67 100644
--- a/java/res/xml/rowkeys_uzbek2.xml
+++ b/java/res/xml/rowkeys_uzbek2.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/rowkeys_qwerty2" />
     <!-- U+0067/U+02BB: "gʻ" LATIN SMALL LETTER G/MODIFIER LETTER TURNED COMMA -->
     <Key
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 3f765f347..cff4a153b 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml
index 198436ca1..d997f12d5 100644
--- a/java/res/xml/rows_armenian_phonetic.xml
+++ b/java/res/xml/rows_armenian_phonetic.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
index a52504c4f..13bc25922 100644
--- a/java/res/xml/rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
index 4e4223b03..e4a4b922b 100644
--- a/java/res/xml/rows_bengali.xml
+++ b/java/res/xml/rows_bengali.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_bengali_akkhor.xml b/java/res/xml/rows_bengali_akkhor.xml
index 1c7e77262..6ace80038 100644
--- a/java/res/xml/rows_bengali_akkhor.xml
+++ b/java/res/xml/rows_bengali_akkhor.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyLabelFlags="fontNormal"
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 883c2833d..9f892e077 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_bulgarian_bds.xml b/java/res/xml/rows_bulgarian_bds.xml
index b4f3f1207..871e73ba6 100644
--- a/java/res/xml/rows_bulgarian_bds.xml
+++ b/java/res/xml/rows_bulgarian_bds.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
index ec553c244..6b0365217 100644
--- a/java/res/xml/rows_colemak.xml
+++ b/java/res/xml/rows_colemak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_dvorak.xml b/java/res/xml/rows_dvorak.xml
index f656613ec..3a2be744b 100644
--- a/java/res/xml/rows_dvorak.xml
+++ b/java/res/xml/rows_dvorak.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_east_slavic.xml b/java/res/xml/rows_east_slavic.xml
index 5d3d768f3..deed06759 100644
--- a/java/res/xml/rows_east_slavic.xml
+++ b/java/res/xml/rows_east_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index b78048c9d..4c24772ba 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_georgian.xml b/java/res/xml/rows_georgian.xml
index 8c81dd007..455107687 100644
--- a/java/res/xml/rows_georgian.xml
+++ b/java/res/xml/rows_georgian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index e00b927a0..906219168 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index f12380a7d..aa2d2f145 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index da869b144..c6b6135c9 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
index d21fada1c..5055c412f 100644
--- a/java/res/xml/rows_hindi_compact.xml
+++ b/java/res/xml/rows_hindi_compact.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_kannada.xml b/java/res/xml/rows_kannada.xml
index 5dc6271f0..ccc782835 100644
--- a/java/res/xml/rows_kannada.xml
+++ b/java/res/xml/rows_kannada.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
index 69334f33e..0347bad6c 100644
--- a/java/res/xml/rows_khmer.xml
+++ b/java/res/xml/rows_khmer.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml
index b3fbf56c5..f1fbaca34 100644
--- a/java/res/xml/rows_lao.xml
+++ b/java/res/xml/rows_lao.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/java/res/xml/rows_malayalam.xml b/java/res/xml/rows_malayalam.xml
index 5e7a4916c..5bbae9444 100644
--- a/java/res/xml/rows_malayalam.xml
+++ b/java/res/xml/rows_malayalam.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
index ff11adb75..1f9aa2745 100644
--- a/java/res/xml/rows_marathi.xml
+++ b/java/res/xml/rows_marathi.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_mongolian.xml b/java/res/xml/rows_mongolian.xml
index a6a890a9b..7eb19418b 100644
--- a/java/res/xml/rows_mongolian.xml
+++ b/java/res/xml/rows_mongolian.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
index 26737ec8a..3e0f9d2f7 100644
--- a/java/res/xml/rows_nepali_romanized.xml
+++ b/java/res/xml/rows_nepali_romanized.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml
index e2e710ce8..deb42b670 100644
--- a/java/res/xml/rows_nepali_traditional.xml
+++ b/java/res/xml/rows_nepali_traditional.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
     <Row
diff --git a/java/res/xml/rows_nordic.xml b/java/res/xml/rows_nordic.xml
index 3068917f5..083af21e9 100644
--- a/java/res/xml/rows_nordic.xml
+++ b/java/res/xml/rows_nordic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml
index 96564e8ff..0312b04ab 100644
--- a/java/res/xml/rows_number.xml
+++ b/java/res/xml/rows_number.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
index 0f92ac605..dbe77f174 100644
--- a/java/res/xml/rows_number_normal.xml
+++ b/java/res/xml/rows_number_normal.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <Key
diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml
index 65736c430..a59b8ef78 100644
--- a/java/res/xml/rows_number_password.xml
+++ b/java/res/xml/rows_number_password.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml
index a5ed74518..2417fc9bf 100644
--- a/java/res/xml/rows_pcqwerty.xml
+++ b/java/res/xml/rows_pcqwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
index bb5590d4e..3ac9acf9a 100644
--- a/java/res/xml/rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml
index 195a183a3..e8ca7f0cf 100644
--- a/java/res/xml/rows_phone_symbols.xml
+++ b/java/res/xml/rows_phone_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
index cdd420361..41e410fa4 100644
--- a/java/res/xml/rows_qwerty.xml
+++ b/java/res/xml/rows_qwerty.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
index 31a147c12..3762c328d 100644
--- a/java/res/xml/rows_qwertz.xml
+++ b/java/res/xml/rows_qwertz.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_serbian_qwertz.xml b/java/res/xml/rows_serbian_qwertz.xml
index 4be2abf1a..5dd2a92d6 100644
--- a/java/res/xml/rows_serbian_qwertz.xml
+++ b/java/res/xml/rows_serbian_qwertz.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index a2ba0bb8b..13d583a39 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_south_slavic.xml b/java/res/xml/rows_south_slavic.xml
index 05442848d..f46c457a1 100644
--- a/java/res/xml/rows_south_slavic.xml
+++ b/java/res/xml/rows_south_slavic.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
index ecda4a4a6..9234fddbc 100644
--- a/java/res/xml/rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_swiss.xml b/java/res/xml/rows_swiss.xml
index 03e412940..459c07f84 100644
--- a/java/res/xml/rows_swiss.xml
+++ b/java/res/xml/rows_swiss.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index 6fd876f4e..fcedf05b8 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 64f6e6114..28646375d 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -19,7 +19,7 @@
 -->
 
 <merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
diff --git a/java/res/xml/rows_tamil.xml b/java/res/xml/rows_tamil.xml
index 3aa2c8dc4..e0dc48ccf 100644
--- a/java/res/xml/rows_tamil.xml
+++ b/java/res/xml/rows_tamil.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_telugu.xml b/java/res/xml/rows_telugu.xml
index 4a31d5dc3..5ce333fca 100644
--- a/java/res/xml/rows_telugu.xml
+++ b/java/res/xml/rows_telugu.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
index fffdb4415..ef56a9a8c 100644
--- a/java/res/xml/rows_thai.xml
+++ b/java/res/xml/rows_thai.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.3333%p"
diff --git a/java/res/xml/rows_uzbek.xml b/java/res/xml/rows_uzbek.xml
index ae655d814..fbbdba367 100644
--- a/java/res/xml/rows_uzbek.xml
+++ b/java/res/xml/rows_uzbek.xml
@@ -18,7 +18,7 @@
 */
 -->
 
-<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" >
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
diff --git a/java/res/xml/spellchecker.xml b/java/res/xml/spellchecker.xml
index 13e6132f1..770bc8695 100644
--- a/java/res/xml/spellchecker.xml
+++ b/java/res/xml/spellchecker.xml
@@ -22,7 +22,7 @@
 
 <spell-checker xmlns:android="http://schemas.android.com/apk/res/android"
         android:label="@string/spell_checker_service_name"
-        android:settingsActivity="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity">
+        android:settingsActivity="org.kelar.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity">
     <subtype
             android:label="@string/subtype_generic"
             android:subtypeLocale="en"
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityLongPressTimer.java b/java/src/org/kelar/inputmethod/accessibility/AccessibilityLongPressTimer.java
index 37d910edb..bafa94167 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityLongPressTimer.java
+++ b/java/src/org/kelar/inputmethod/accessibility/AccessibilityLongPressTimer.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.latin.R;
 
 // Handling long press timer to show a more keys keyboard.
 final class AccessibilityLongPressTimer extends Handler {
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/org/kelar/inputmethod/accessibility/AccessibilityUtils.java
index 31e142e72..03daeb260 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
+++ b/java/src/org/kelar/inputmethod/accessibility/AccessibilityUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.content.Context;
 import android.media.AudioManager;
@@ -32,10 +32,10 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.compat.SettingsSecureCompatUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.compat.SettingsSecureCompatUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.utils.InputTypeUtils;
 
 public final class AccessibilityUtils {
     private static final String TAG = AccessibilityUtils.class.getSimpleName();
diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/org/kelar/inputmethod/accessibility/KeyCodeDescriptionMapper.java
index bbda9f8e2..972324092 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
+++ b/java/src/org/kelar/inputmethod/accessibility/KeyCodeDescriptionMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -23,12 +23,12 @@ import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityDelegate.java b/java/src/org/kelar/inputmethod/accessibility/KeyboardAccessibilityDelegate.java
index 5c03d26a9..9e6275d56 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityDelegate.java
+++ b/java/src/org/kelar/inputmethod/accessibility/KeyboardAccessibilityDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -27,10 +27,10 @@ import android.view.View;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyDetector;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardView;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyDetector;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardView;
 
 /**
  * This class represents a delegate that can be registered in a class that extends
diff --git a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java b/java/src/org/kelar/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
index cc244c305..b50835eee 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
+++ b/java/src/org/kelar/inputmethod/accessibility/KeyboardAccessibilityNodeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -28,12 +28,12 @@ import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardView;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardView;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import java.util.List;
 
diff --git a/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java b/java/src/org/kelar/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java
index 3234993cf..0275162b6 100644
--- a/java/src/com/android/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java
+++ b/java/src/org/kelar/inputmethod/accessibility/MainKeyboardAccessibilityDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -23,14 +23,14 @@ import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.MotionEvent;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyDetector;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.MainKeyboardView;
-import com.android.inputmethod.keyboard.PointerTracker;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyDetector;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.MainKeyboardView;
+import org.kelar.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 /**
  * This class represents a delegate that can be registered in {@link MainKeyboardView} to enhance
diff --git a/java/src/com/android/inputmethod/accessibility/MoreKeysKeyboardAccessibilityDelegate.java b/java/src/org/kelar/inputmethod/accessibility/MoreKeysKeyboardAccessibilityDelegate.java
index 4022da343..b0a6f8bed 100644
--- a/java/src/com/android/inputmethod/accessibility/MoreKeysKeyboardAccessibilityDelegate.java
+++ b/java/src/org/kelar/inputmethod/accessibility/MoreKeysKeyboardAccessibilityDelegate.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.accessibility;
+package org.kelar.inputmethod.accessibility;
 
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.MotionEvent;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyDetector;
-import com.android.inputmethod.keyboard.MoreKeysKeyboardView;
-import com.android.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyDetector;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboardView;
+import org.kelar.inputmethod.keyboard.PointerTracker;
 
 /**
  * This class represents a delegate that can be registered in {@link MoreKeysKeyboardView} to
diff --git a/java/src/com/android/inputmethod/compat/ActivityManagerCompatUtils.java b/java/src/org/kelar/inputmethod/compat/ActivityManagerCompatUtils.java
index 385e3e025..b39d274d7 100644
--- a/java/src/com/android/inputmethod/compat/ActivityManagerCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/ActivityManagerCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.app.ActivityManager;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java b/java/src/org/kelar/inputmethod/compat/AppWorkaroundsHelper.java
index f5e56eb4b..42fbd62c4 100644
--- a/java/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java
+++ b/java/src/org/kelar/inputmethod/compat/AppWorkaroundsHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.pm.PackageInfo;
 
diff --git a/java/src/com/android/inputmethod/compat/AppWorkaroundsUtils.java b/java/src/org/kelar/inputmethod/compat/AppWorkaroundsUtils.java
index 6e43cc9a7..5e0187813 100644
--- a/java/src/com/android/inputmethod/compat/AppWorkaroundsUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/AppWorkaroundsUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.pm.PackageInfo;
 import android.os.Build.VERSION_CODES;
diff --git a/java/src/com/android/inputmethod/compat/BuildCompatUtils.java b/java/src/org/kelar/inputmethod/compat/BuildCompatUtils.java
index 5d56f12ae..c1080eb4c 100644
--- a/java/src/com/android/inputmethod/compat/BuildCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/BuildCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.os.Build;
 
diff --git a/java/src/com/android/inputmethod/compat/CharacterCompat.java b/java/src/org/kelar/inputmethod/compat/CharacterCompat.java
index 609fe1638..601a5dcf6 100644
--- a/java/src/com/android/inputmethod/compat/CharacterCompat.java
+++ b/java/src/org/kelar/inputmethod/compat/CharacterCompat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import java.lang.reflect.Method;
 
diff --git a/java/src/com/android/inputmethod/compat/CompatUtils.java b/java/src/org/kelar/inputmethod/compat/CompatUtils.java
index 5db80190c..475685927 100644
--- a/java/src/com/android/inputmethod/compat/CompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/CompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/java/src/com/android/inputmethod/compat/ConnectivityManagerCompatUtils.java b/java/src/org/kelar/inputmethod/compat/ConnectivityManagerCompatUtils.java
index b561f7a14..469c8d590 100644
--- a/java/src/com/android/inputmethod/compat/ConnectivityManagerCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/ConnectivityManagerCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.net.ConnectivityManager;
 
diff --git a/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java b/java/src/org/kelar/inputmethod/compat/CursorAnchorInfoCompatWrapper.java
index 01a9e6712..203f99109 100644
--- a/java/src/com/android/inputmethod/compat/CursorAnchorInfoCompatWrapper.java
+++ b/java/src/org/kelar/inputmethod/compat/CursorAnchorInfoCompatWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.annotation.TargetApi;
 import android.graphics.Matrix;
diff --git a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java b/java/src/org/kelar/inputmethod/compat/EditorInfoCompatUtils.java
index 56ce8f5e6..307f6891a 100644
--- a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/EditorInfoCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.view.inputmethod.EditorInfo;
 
diff --git a/java/src/com/android/inputmethod/compat/InputConnectionCompatUtils.java b/java/src/org/kelar/inputmethod/compat/InputConnectionCompatUtils.java
index a5c71b22f..e9eecc511 100644
--- a/java/src/com/android/inputmethod/compat/InputConnectionCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/InputConnectionCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/org/kelar/inputmethod/compat/InputMethodManagerCompatWrapper.java
index aa20c0336..ce081a3f8 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
+++ b/java/src/org/kelar/inputmethod/compat/InputMethodManagerCompatWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.Context;
 import android.os.IBinder;
diff --git a/java/src/com/android/inputmethod/compat/InputMethodServiceCompatUtils.java b/java/src/org/kelar/inputmethod/compat/InputMethodServiceCompatUtils.java
index 48047ddbf..8549f9e1b 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodServiceCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/InputMethodServiceCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.inputmethodservice.InputMethodService;
 
diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java b/java/src/org/kelar/inputmethod/compat/InputMethodSubtypeCompatUtils.java
index d123a1799..31d257ffe 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/InputMethodSubtypeCompatUtils.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.os.Build;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/java/src/com/android/inputmethod/compat/IntentCompatUtils.java b/java/src/org/kelar/inputmethod/compat/IntentCompatUtils.java
index 965a2a891..efe3e9ccc 100644
--- a/java/src/com/android/inputmethod/compat/IntentCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/IntentCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.Intent;
 
diff --git a/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java b/java/src/org/kelar/inputmethod/compat/LocaleListCompatUtils.java
index 81ff0f994..44d485f13 100644
--- a/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/LocaleListCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import java.lang.reflect.Method;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java b/java/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtils.java
index 58e5a36b6..431507f89 100644
--- a/java/src/com/android/inputmethod/compat/LocaleSpanCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtils.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.text.Spannable;
 import android.text.Spanned;
 import android.text.style.LocaleSpan;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/java/src/com/android/inputmethod/compat/LooperCompatUtils.java b/java/src/org/kelar/inputmethod/compat/LooperCompatUtils.java
index d647dbbd3..a48f4c1ab 100644
--- a/java/src/com/android/inputmethod/compat/LooperCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/LooperCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.os.Looper;
 
diff --git a/java/src/com/android/inputmethod/compat/NotificationCompatUtils.java b/java/src/org/kelar/inputmethod/compat/NotificationCompatUtils.java
index 70ab972c5..7797edacf 100644
--- a/java/src/com/android/inputmethod/compat/NotificationCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/NotificationCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.app.Notification;
 import android.os.Build;
diff --git a/java/src/com/android/inputmethod/compat/SettingsSecureCompatUtils.java b/java/src/org/kelar/inputmethod/compat/SettingsSecureCompatUtils.java
index cfaf7ec77..2b47ee274 100644
--- a/java/src/com/android/inputmethod/compat/SettingsSecureCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/SettingsSecureCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import java.lang.reflect.Field;
 
diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/org/kelar/inputmethod/compat/SuggestionSpanUtils.java
index 3f621913c..080d4754b 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/SuggestionSpanUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.Context;
 import android.text.Spannable;
@@ -23,11 +23,11 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.SuggestionSpan;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/compat/SuggestionsInfoCompatUtils.java b/java/src/org/kelar/inputmethod/compat/SuggestionsInfoCompatUtils.java
index d8d2be04c..fd7210726 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionsInfoCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/SuggestionsInfoCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.view.textservice.SuggestionsInfo;
 
diff --git a/java/src/com/android/inputmethod/compat/TextInfoCompatUtils.java b/java/src/org/kelar/inputmethod/compat/TextInfoCompatUtils.java
index 09f39a756..d5b97b75e 100644
--- a/java/src/com/android/inputmethod/compat/TextInfoCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/TextInfoCompatUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.view.textservice.TextInfo;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
diff --git a/java/src/com/android/inputmethod/compat/TextViewCompatUtils.java b/java/src/org/kelar/inputmethod/compat/TextViewCompatUtils.java
index f8e1902c0..dfad0e3a8 100644
--- a/java/src/com/android/inputmethod/compat/TextViewCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/TextViewCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.graphics.drawable.Drawable;
 import android.widget.TextView;
diff --git a/java/src/com/android/inputmethod/compat/UserDictionaryCompatUtils.java b/java/src/org/kelar/inputmethod/compat/UserDictionaryCompatUtils.java
index 3633d667d..0a4635c86 100644
--- a/java/src/com/android/inputmethod/compat/UserDictionaryCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/UserDictionaryCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/compat/UserManagerCompatUtils.java b/java/src/org/kelar/inputmethod/compat/UserManagerCompatUtils.java
index a0ca2c9f2..f72e28726 100644
--- a/java/src/com/android/inputmethod/compat/UserManagerCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/UserManagerCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.content.Context;
 import android.os.Build;
diff --git a/java/src/com/android/inputmethod/compat/ViewCompatUtils.java b/java/src/org/kelar/inputmethod/compat/ViewCompatUtils.java
index a584625e2..9b91897e5 100644
--- a/java/src/com/android/inputmethod/compat/ViewCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/ViewCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.view.View;
 
diff --git a/java/src/com/android/inputmethod/compat/ViewOutlineProviderCompatUtils.java b/java/src/org/kelar/inputmethod/compat/ViewOutlineProviderCompatUtils.java
index 0c8e5b77d..64f4230ba 100644
--- a/java/src/com/android/inputmethod/compat/ViewOutlineProviderCompatUtils.java
+++ b/java/src/org/kelar/inputmethod/compat/ViewOutlineProviderCompatUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.inputmethodservice.InputMethodService;
 import android.os.Build;
diff --git a/java/src/com/android/inputmethod/compat/ViewOutlineProviderCompatUtilsLXX.java b/java/src/org/kelar/inputmethod/compat/ViewOutlineProviderCompatUtilsLXX.java
index 5bbb5ce99..8049d7d04 100644
--- a/java/src/com/android/inputmethod/compat/ViewOutlineProviderCompatUtilsLXX.java
+++ b/java/src/org/kelar/inputmethod/compat/ViewOutlineProviderCompatUtilsLXX.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import android.annotation.TargetApi;
 import android.graphics.Outline;
@@ -23,7 +23,7 @@ import android.os.Build;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
-import com.android.inputmethod.compat.ViewOutlineProviderCompatUtils.InsetsUpdater;
+import org.kelar.inputmethod.compat.ViewOutlineProviderCompatUtils.InsetsUpdater;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 class ViewOutlineProviderCompatUtilsLXX {
diff --git a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java b/java/src/org/kelar/inputmethod/dictionarypack/ActionBatch.java
index 1b526d453..06bebc8da 100644
--- a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/ActionBatch.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.DownloadManager.Request;
 import android.content.ContentValues;
@@ -25,11 +25,11 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.latin.BinaryDictionaryFileDumper;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
-import com.android.inputmethod.latin.utils.DebugLogUtils;
+import org.kelar.inputmethod.latin.BinaryDictionaryFileDumper;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.utils.DebugLogUtils;
 
 import java.util.LinkedList;
 import java.util.Queue;
@@ -487,11 +487,11 @@ public final class ActionBatch {
      * An action that sets the word list for deletion as soon as possible.
      *
      * This is triggered when the user requests deletion of a word list. This will mark it as
-     * deleted in the database, and fire an intent for Android Keyboard to take notice and
+     * deleted in the database, and fire an intent for Kelar Keyboard to take notice and
      * reload its dictionaries right away if it is up. If it is not up now, then it will
      * delete the actual file the next time it gets up.
      * A file marked as deleted causes the content provider to supply a zero-sized file to
-     * Android Keyboard, which will overwrite any existing file and provide no words for this
+     * Kelar Keyboard, which will overwrite any existing file and provide no words for this
      * word list. This is not exactly a "deletion", since there is an actual file which takes up
      * a few bytes on the disk, but this allows to override a default dictionary with an empty
      * dictionary. This way, there is no need for the user to make a distinction between
diff --git a/java/src/com/android/inputmethod/dictionarypack/AssetFileAddress.java b/java/src/org/kelar/inputmethod/dictionarypack/AssetFileAddress.java
index bebb59fc0..dd81acfaf 100644
--- a/java/src/com/android/inputmethod/dictionarypack/AssetFileAddress.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/AssetFileAddress.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import java.io.File;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/BadFormatException.java b/java/src/org/kelar/inputmethod/dictionarypack/BadFormatException.java
index d3090ddb0..de884d10a 100644
--- a/java/src/com/android/inputmethod/dictionarypack/BadFormatException.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/BadFormatException.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 /**
  * Exception thrown when the metadata for the dictionary does not comply to a known format.
diff --git a/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java b/java/src/org/kelar/inputmethod/dictionarypack/ButtonSwitcher.java
index 0fa72c3fd..46692559e 100644
--- a/java/src/com/android/inputmethod/dictionarypack/ButtonSwitcher.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/ButtonSwitcher.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -25,7 +25,7 @@ import android.view.ViewPropertyAnimator;
 import android.widget.Button;
 import android.widget.FrameLayout;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * A view that handles buttons inside it according to a status.
diff --git a/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java b/java/src/org/kelar/inputmethod/dictionarypack/CommonPreferences.java
index 3d0e29ed0..e4676b186 100644
--- a/java/src/com/android/inputmethod/dictionarypack/CommonPreferences.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/CommonPreferences.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/java/src/com/android/inputmethod/dictionarypack/CompletedDownloadInfo.java b/java/src/org/kelar/inputmethod/dictionarypack/CompletedDownloadInfo.java
index ff198756e..aa55b4fe2 100644
--- a/java/src/com/android/inputmethod/dictionarypack/CompletedDownloadInfo.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/CompletedDownloadInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.DownloadManager;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
index 759852025..f0a591eca 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryDownloadProgressBar.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.DownloadManager;
 import android.app.DownloadManager.Query;
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryListInterfaceState.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryListInterfaceState.java
index 836340a75..3e469bd2c 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryListInterfaceState.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryListInterfaceState.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.view.View;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryPackConstants.java
index 13caea403..6f9b5be7d 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryPackConstants.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 /**
  * A class to group constants for dictionary pack usage.
@@ -28,7 +28,7 @@ public class DictionaryPackConstants {
      * The root domain for the dictionary pack, upon which authorities and actions will append
      * their own distinctive strings.
      */
-    private static final String DICTIONARY_DOMAIN = "com.android.inputmethod.dictionarypack.aosp";
+    private static final String DICTIONARY_DOMAIN = "org.kelar.inputmethod.dictionarypack.aosp";
 
     /**
      * Authority for the ContentProvider protocol.
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryProvider.java
index 308b123e1..fb3a4a391 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentProvider;
 import android.content.ContentResolver;
@@ -30,9 +30,9 @@ import android.os.ParcelFileDescriptor;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.utils.DebugLogUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.utils.DebugLogUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -307,7 +307,7 @@ public final class DictionaryProvider extends ContentProvider {
             final int status = wordList.getAsInteger(MetadataDbHelper.STATUS_COLUMN);
             if (MetadataDbHelper.STATUS_DELETING == status) {
                 // This will return an empty file (R.raw.empty points at an empty dictionary)
-                // This is how we "delete" the files. It allows Android Keyboard to fake deleting
+                // This is how we "delete" the files. It allows Kelar Keyboard to fake deleting
                 // a default dictionary - which is actually in its assets and can't be really
                 // deleted.
                 final AssetFileDescriptor afd = getContext().getResources().openRawResourceFd(
@@ -398,7 +398,7 @@ public final class DictionaryProvider extends ContentProvider {
                         // If the file does not exist, it has been deleted and the IME should
                         // already have it. Do not return it. However, this only applies if the
                         // word list is INSTALLED, for if it is DELETING we should return it always
-                        // so that Android Keyboard can perform the actual deletion.
+                        // so that Kelar Keyboard can perform the actual deletion.
                         final File f = getContext().getFileStreamPath(wordListLocalFilename);
                         if (!f.isFile()) {
                             continue;
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionaryService.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryService.java
index 5ab55bc44..851a1d925 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionaryService.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionaryService.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -25,9 +25,9 @@ import android.os.IBinder;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.inputmethod.latin.BinaryDictionaryFileDumper;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.BinaryDictionaryFileDumper;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import java.util.Locale;
 import java.util.Random;
@@ -60,7 +60,7 @@ public final class DictionaryService extends Service {
     /**
      * The package name, to use in the intent actions.
      */
-    private static final String PACKAGE_NAME = "com.android.inputmethod.latin";
+    private static final String PACKAGE_NAME = "org.kelar.inputmethod.latin";
 
     /**
      * The action of the date changing, used to schedule a periodic freshness check
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionarySettingsActivity.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionarySettingsActivity.java
index 284032beb..f86eda177 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionarySettingsActivity.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionarySettingsActivity.java
@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
-import com.android.inputmethod.latin.utils.FragmentUtils;
+import org.kelar.inputmethod.latin.utils.FragmentUtils;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
diff --git a/java/src/com/android/inputmethod/dictionarypack/DictionarySettingsFragment.java b/java/src/org/kelar/inputmethod/dictionarypack/DictionarySettingsFragment.java
index 35b46a978..a4783a78f 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DictionarySettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DictionarySettingsFragment.java
@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -43,7 +43,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -281,7 +281,7 @@ public final class DictionarySettingsFragment extends PreferenceFragment
         // any regular client would do.
         // Considering the respective value of the respective constants used here for each path,
         // segment, the url generated by this is of the form (assuming "clientId" as a clientId)
-        // content://com.android.inputmethod.latin.dictionarypack/clientId/list?procotol=2
+        // content://org.kelar.inputmethod.latin.dictionarypack/clientId/list?procotol=2
         final Uri contentUri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
                 .authority(getString(R.string.authority))
                 .appendPath(clientId)
diff --git a/java/src/com/android/inputmethod/dictionarypack/DownloadIdAndStartDate.java b/java/src/org/kelar/inputmethod/dictionarypack/DownloadIdAndStartDate.java
index 6247a15e2..cb58abfd5 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DownloadIdAndStartDate.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DownloadIdAndStartDate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 /**
  * A simple container of download ID and download start date.
diff --git a/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java b/java/src/org/kelar/inputmethod/dictionarypack/DownloadManagerWrapper.java
index e2e9a7e44..5881cecf1 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DownloadManagerWrapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.DownloadManager;
 import android.app.DownloadManager.Query;
diff --git a/java/src/com/android/inputmethod/dictionarypack/DownloadOverMeteredDialog.java b/java/src/org/kelar/inputmethod/dictionarypack/DownloadOverMeteredDialog.java
index 908d931a0..48564535a 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DownloadOverMeteredDialog.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DownloadOverMeteredDialog.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -24,9 +24,9 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import javax.annotation.Nullable;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/DownloadRecord.java b/java/src/org/kelar/inputmethod/dictionarypack/DownloadRecord.java
index c26299027..1dddc6042 100644
--- a/java/src/com/android/inputmethod/dictionarypack/DownloadRecord.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/DownloadRecord.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentValues;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/EventHandler.java b/java/src/org/kelar/inputmethod/dictionarypack/EventHandler.java
index 859f1b35b..c62597eff 100644
--- a/java/src/com/android/inputmethod/dictionarypack/EventHandler.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/EventHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/dictionarypack/LogProblemReporter.java b/java/src/org/kelar/inputmethod/dictionarypack/LogProblemReporter.java
index c9e128d70..1f1f9dc58 100644
--- a/java/src/com/android/inputmethod/dictionarypack/LogProblemReporter.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/LogProblemReporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/MD5Calculator.java b/java/src/org/kelar/inputmethod/dictionarypack/MD5Calculator.java
index ccd054c84..80d81c090 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MD5Calculator.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/MD5Calculator.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import java.io.InputStream;
 import java.io.IOException;
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java b/java/src/org/kelar/inputmethod/dictionarypack/MetadataDbHelper.java
index 94dd7a1c9..b8e093997 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/MetadataDbHelper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,8 +25,8 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.DebugLogUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.DebugLogUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -629,7 +629,7 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
     /**
      * Gets the info about an installed OR deleting word list with a specified id.
      *
-     * Basically, this is the word list that we want to return to Android Keyboard when
+     * Basically, this is the word list that we want to return to Kelar Keyboard when
      * it asks for a specific id.
      *
      * @param db the database to get the information from.
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataHandler.java b/java/src/org/kelar/inputmethod/dictionarypack/MetadataHandler.java
index e5d632fbe..0dcd33e2d 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MetadataHandler.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/MetadataHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataParser.java b/java/src/org/kelar/inputmethod/dictionarypack/MetadataParser.java
index 2b67ae9ff..131667f87 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MetadataParser.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/MetadataParser.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.text.TextUtils;
 import android.util.JsonReader;
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java b/java/src/org/kelar/inputmethod/dictionarypack/MetadataUriGetter.java
index 512d426aa..e8a79f6ca 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/MetadataUriGetter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.Context;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/PrivateLog.java b/java/src/org/kelar/inputmethod/dictionarypack/PrivateLog.java
index bb64721d5..227b4831c 100644
--- a/java/src/com/android/inputmethod/dictionarypack/PrivateLog.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/PrivateLog.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/dictionarypack/ProblemReporter.java b/java/src/org/kelar/inputmethod/dictionarypack/ProblemReporter.java
index 632819aa3..6690a79c1 100644
--- a/java/src/com/android/inputmethod/dictionarypack/ProblemReporter.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/ProblemReporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 /**
  * A simple interface to report problems.
diff --git a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java b/java/src/org/kelar/inputmethod/dictionarypack/UpdateHandler.java
index bdea3e919..c2c785560 100644
--- a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/UpdateHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.app.DownloadManager;
 import android.app.DownloadManager.Query;
@@ -26,17 +26,16 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
-import com.android.inputmethod.latin.utils.DebugLogUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.utils.DebugLogUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -561,7 +560,7 @@ public final class UpdateHandler {
     }
 
     /**
-     * Warn Android Keyboard that the state of dictionaries changed and it should refresh its data.
+     * Warn Kelar Keyboard that the state of dictionaries changed and it should refresh its data.
      */
     private static void signalNewDictionaryState(final Context context) {
         // TODO: Also provide the locale of the updated dictionary so that the LatinIme
@@ -782,7 +781,7 @@ public final class UpdateHandler {
                 // Pass false to ForgetAction: this may be installed and we still want to apply
                 // a forget-like action (remove the URL) if it is, so we want to turn off the
                 // status == AVAILABLE check. If it's DELETING, this is the right thing to do,
-                // as we want to leave the record as long as Android Keyboard has not deleted it ;
+                // as we want to leave the record as long as Kelar Keyboard has not deleted it ;
                 // the record will be removed when the file is actually deleted.
                 actions.add(new ActionBatch.ForgetAction(clientId, currentInfo, false));
             } else {
@@ -809,7 +808,7 @@ public final class UpdateHandler {
                         // Pass true to ForgetAction: this is indeed an update to a non-installed
                         // word list, so activate status == AVAILABLE check
                         // In case the status is DELETING, this is the right thing to do. It will
-                        // leave the entry as DELETING and remove its URL so that Android Keyboard
+                        // leave the entry as DELETING and remove its URL so that Kelar Keyboard
                         // can delete it the next time it starts up.
                         actions.add(new ActionBatch.ForgetAction(clientId, currentInfo, true));
                     }
@@ -994,7 +993,7 @@ public final class UpdateHandler {
     /**
      * Marks the word list with the passed id as deleting.
      *
-     * This basically means that on the next chance there is (right away if Android Keyboard
+     * This basically means that on the next chance there is (right away if Kelar Keyboard
      * happens to be up, or the next time it gets up otherwise) the dictionary pack will
      * supply an empty dictionary to it that will replace whatever dictionary is installed.
      * This allows to release the space taken by a dictionary (except for the few bytes the
diff --git a/java/src/com/android/inputmethod/dictionarypack/WordListMetadata.java b/java/src/org/kelar/inputmethod/dictionarypack/WordListMetadata.java
index 99cffb816..276077a80 100644
--- a/java/src/com/android/inputmethod/dictionarypack/WordListMetadata.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/WordListMetadata.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.ContentValues;
 
diff --git a/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java b/java/src/org/kelar/inputmethod/dictionarypack/WordListPreference.java
index 500e39e0e..8c8a3fd99 100644
--- a/java/src/com/android/inputmethod/dictionarypack/WordListPreference.java
+++ b/java/src/org/kelar/inputmethod/dictionarypack/WordListPreference.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.android.inputmethod.dictionarypack;
+package org.kelar.inputmethod.dictionarypack;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -26,7 +26,7 @@ import android.view.ViewParent;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import java.util.Locale;
 
@@ -114,7 +114,7 @@ public final class WordListPreference extends Preference {
         switch (status) {
         // If we are deleting the word list, for the user it's like it's already deleted.
         // It should be reinstallable. Exposing to the user the whole complexity of
-        // the delayed deletion process between the dictionary pack and Android Keyboard
+        // the delayed deletion process between the dictionary pack and Kelar Keyboard
         // would only be confusing.
         case MetadataDbHelper.STATUS_DELETING:
         case MetadataDbHelper.STATUS_AVAILABLE:
@@ -191,7 +191,7 @@ public final class WordListPreference extends Preference {
             setStatus(MetadataDbHelper.STATUS_DOWNLOADING);
         } else if (MetadataDbHelper.STATUS_DISABLED == mStatus
                 || MetadataDbHelper.STATUS_DELETING == mStatus) {
-            // If the status is DELETING, it means Android Keyboard
+            // If the status is DELETING, it means Kelar Keyboard
             // has not deleted the word list yet, so we can safely
             // turn it to 'installed'. The status DISABLED is still supported internally to
             // avoid breaking older installations and all but there should not be a way to
diff --git a/java/src/com/android/inputmethod/event/Combiner.java b/java/src/org/kelar/inputmethod/event/Combiner.java
index fee93f0c6..45945d460 100644
--- a/java/src/com/android/inputmethod/event/Combiner.java
+++ b/java/src/org/kelar/inputmethod/event/Combiner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/event/CombinerChain.java b/java/src/org/kelar/inputmethod/event/CombinerChain.java
index d77ece8e6..afd992e62 100644
--- a/java/src/com/android/inputmethod/event/CombinerChain.java
+++ b/java/src/org/kelar/inputmethod/event/CombinerChain.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/org/kelar/inputmethod/event/DeadKeyCombiner.java
index 1a28bb1d5..562fc2761 100644
--- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
+++ b/java/src/org/kelar/inputmethod/event/DeadKeyCombiner.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 import android.text.TextUtils;
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.text.Normalizer;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/event/Event.java b/java/src/org/kelar/inputmethod/event/Event.java
index 58d878fbe..17c9717c5 100644
--- a/java/src/com/android/inputmethod/event/Event.java
+++ b/java/src/org/kelar/inputmethod/event/Event.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/event/EventDecoder.java b/java/src/org/kelar/inputmethod/event/EventDecoder.java
index 7ff0166a3..3826f0608 100644
--- a/java/src/com/android/inputmethod/event/EventDecoder.java
+++ b/java/src/org/kelar/inputmethod/event/EventDecoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 /**
  * A generic interface for event decoders.
diff --git a/java/src/com/android/inputmethod/event/HardwareEventDecoder.java b/java/src/org/kelar/inputmethod/event/HardwareEventDecoder.java
index 6a6bd7bc5..0b75ab8b3 100644
--- a/java/src/com/android/inputmethod/event/HardwareEventDecoder.java
+++ b/java/src/org/kelar/inputmethod/event/HardwareEventDecoder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 import android.view.KeyEvent;
 
diff --git a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java b/java/src/org/kelar/inputmethod/event/HardwareKeyboardEventDecoder.java
index 3a4097d7f..c8cfbc2cc 100644
--- a/java/src/com/android/inputmethod/event/HardwareKeyboardEventDecoder.java
+++ b/java/src/org/kelar/inputmethod/event/HardwareKeyboardEventDecoder.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 /**
  * A hardware event decoder for a hardware qwerty-ish keyboard.
diff --git a/java/src/com/android/inputmethod/event/InputTransaction.java b/java/src/org/kelar/inputmethod/event/InputTransaction.java
index 5bc9111de..096ae68f5 100644
--- a/java/src/com/android/inputmethod/event/InputTransaction.java
+++ b/java/src/org/kelar/inputmethod/event/InputTransaction.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.event;
+package org.kelar.inputmethod.event;
 
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 /**
  * An object encapsulating a single transaction for input.
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/org/kelar/inputmethod/keyboard/Key.java
index 299d1b7c5..492cec9df 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/org/kelar/inputmethod/keyboard/Key.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
-import static com.android.inputmethod.latin.common.Constants.CODE_SHIFT;
-import static com.android.inputmethod.latin.common.Constants.CODE_SWITCH_ALPHA_SYMBOL;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_SHIFT;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_SWITCH_ALPHA_SYMBOL;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import android.content.res.TypedArray;
 import android.graphics.Rect;
@@ -28,17 +28,17 @@ import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 
-import com.android.inputmethod.keyboard.internal.KeyDrawParams;
-import com.android.inputmethod.keyboard.internal.KeySpecParser;
-import com.android.inputmethod.keyboard.internal.KeyStyle;
-import com.android.inputmethod.keyboard.internal.KeyVisualAttributes;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
-import com.android.inputmethod.keyboard.internal.KeyboardRow;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyDrawParams;
+import org.kelar.inputmethod.keyboard.internal.KeySpecParser;
+import org.kelar.inputmethod.keyboard.internal.KeyStyle;
+import org.kelar.inputmethod.keyboard.internal.KeyVisualAttributes;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardParams;
+import org.kelar.inputmethod.keyboard.internal.KeyboardRow;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyDetector.java b/java/src/org/kelar/inputmethod/keyboard/KeyDetector.java
index 87368d4ef..9fa18ee3f 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyDetector.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 /**
  * This class handles key detection.
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/org/kelar/inputmethod/keyboard/Keyboard.java
index 7318d4738..bac7587db 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/org/kelar/inputmethod/keyboard/Keyboard.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.util.SparseArray;
 
-import com.android.inputmethod.keyboard.internal.KeyVisualAttributes;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyVisualAttributes;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardParams;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardActionListener.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardActionListener.java
index cdd632bc8..38ec5b808 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardActionListener.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardActionListener.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
 
 public interface KeyboardActionListener {
     /**
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardId.java
index 7352f911b..f8e98d2b1 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardId.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
 
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.compat.EditorInfoCompatUtils;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.compat.EditorInfoCompatUtils;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.utils.InputTypeUtils;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardLayout.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardLayout.java
index d0f32078e..677a3560c 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardLayout.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardLayout.java
@@ -14,9 +14,9 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSet.java
index 26ff051bb..0350336a9 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSet.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import static com.android.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_SETTINGS_KEY;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_SETTINGS_KEY;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -30,20 +30,19 @@ import android.util.Xml;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.compat.EditorInfoCompatUtils;
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.compat.UserManagerCompatUtils;
-import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
-import com.android.inputmethod.keyboard.internal.UniqueKeysCache;
-import com.android.inputmethod.latin.InputAttributes;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.utils.InputTypeUtils;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
-import com.android.inputmethod.latin.utils.XmlParseUtils;
+import org.kelar.inputmethod.compat.EditorInfoCompatUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.compat.UserManagerCompatUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardBuilder;
+import org.kelar.inputmethod.keyboard.internal.KeyboardParams;
+import org.kelar.inputmethod.keyboard.internal.UniqueKeysCache;
+import org.kelar.inputmethod.latin.InputAttributes;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.XmlParseUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardSwitcher.java
index d398ab8c5..5b3494aa7 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardSwitcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,25 +26,25 @@ import android.view.inputmethod.EditorInfo;
 
 import androidx.annotation.NonNull;
 
-import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;
-import com.android.inputmethod.keyboard.emoji.EmojiPalettesView;
-import com.android.inputmethod.keyboard.internal.KeyboardState;
-import com.android.inputmethod.keyboard.internal.KeyboardTextsSet;
-import com.android.inputmethod.latin.InputView;
-import com.android.inputmethod.latin.LatinIME;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.WordComposer;
-import com.android.inputmethod.latin.define.ProductionFlags;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.settings.SettingsValues;
-import com.android.inputmethod.latin.utils.CapsModeUtils;
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.RecapitalizeStatus;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.compat.InputMethodServiceCompatUtils;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet.KeyboardLayoutSetException;
+import org.kelar.inputmethod.keyboard.emoji.EmojiPalettesView;
+import org.kelar.inputmethod.keyboard.internal.KeyboardState;
+import org.kelar.inputmethod.keyboard.internal.KeyboardTextsSet;
+import org.kelar.inputmethod.latin.InputView;
+import org.kelar.inputmethod.latin.LatinIME;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.WordComposer;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.utils.CapsModeUtils;
+import org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils;
+import org.kelar.inputmethod.latin.utils.RecapitalizeStatus;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardTheme.java
index 006d08696..e3a14fc25 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardTheme.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardTheme.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -23,8 +23,8 @@ import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.latin.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/org/kelar/inputmethod/keyboard/KeyboardView.java
index a42108477..a81e1cb9e 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/KeyboardView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -32,11 +32,11 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.inputmethod.keyboard.internal.KeyDrawParams;
-import com.android.inputmethod.keyboard.internal.KeyVisualAttributes;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.TypefaceUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyDrawParams;
+import org.kelar.inputmethod.keyboard.internal.KeyVisualAttributes;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.TypefaceUtils;
 
 import java.util.HashSet;
 
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/org/kelar/inputmethod/keyboard/MainKeyboardView.java
index fc8744ec6..48878e3ea 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/MainKeyboardView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.animation.AnimatorInflater;
 import android.animation.ObjectAnimator;
@@ -28,7 +28,6 @@ import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Typeface;
 import android.preference.PreferenceManager;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -36,31 +35,30 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.keyboard.internal.DrawingPreviewPlacerView;
-import com.android.inputmethod.keyboard.internal.DrawingProxy;
-import com.android.inputmethod.keyboard.internal.GestureFloatingTextDrawingPreview;
-import com.android.inputmethod.keyboard.internal.GestureTrailsDrawingPreview;
-import com.android.inputmethod.keyboard.internal.KeyDrawParams;
-import com.android.inputmethod.keyboard.internal.KeyPreviewChoreographer;
-import com.android.inputmethod.keyboard.internal.KeyPreviewDrawParams;
-import com.android.inputmethod.keyboard.internal.KeyPreviewView;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.keyboard.internal.NonDistinctMultitouchHelper;
-import com.android.inputmethod.keyboard.internal.SlidingKeyInputDrawingPreview;
-import com.android.inputmethod.keyboard.internal.TimerHandler;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.settings.DebugSettings;
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.TypefaceUtils;
-
-import java.util.Locale;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.accessibility.MainKeyboardAccessibilityDelegate;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.keyboard.internal.DrawingPreviewPlacerView;
+import org.kelar.inputmethod.keyboard.internal.DrawingProxy;
+import org.kelar.inputmethod.keyboard.internal.GestureFloatingTextDrawingPreview;
+import org.kelar.inputmethod.keyboard.internal.GestureTrailsDrawingPreview;
+import org.kelar.inputmethod.keyboard.internal.KeyDrawParams;
+import org.kelar.inputmethod.keyboard.internal.KeyPreviewChoreographer;
+import org.kelar.inputmethod.keyboard.internal.KeyPreviewDrawParams;
+import org.kelar.inputmethod.keyboard.internal.KeyPreviewView;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.keyboard.internal.NonDistinctMultitouchHelper;
+import org.kelar.inputmethod.keyboard.internal.SlidingKeyInputDrawingPreview;
+import org.kelar.inputmethod.keyboard.internal.TimerHandler;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.settings.DebugSettings;
+import org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils;
+import org.kelar.inputmethod.latin.utils.TypefaceUtils;
+
 import java.util.WeakHashMap;
 
 import javax.annotation.Nonnull;
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysDetector.java b/java/src/org/kelar/inputmethod/keyboard/MoreKeysDetector.java
index 5a9d4755f..d07314c25 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysDetector.java
+++ b/java/src/org/kelar/inputmethod/keyboard/MoreKeysDetector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 public final class MoreKeysDetector extends KeyDetector {
     private final int mSlideAllowanceSquare;
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java b/java/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboard.java
index a021e5e2d..d24b9f87d 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
+++ b/java/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.graphics.Paint;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.utils.TypefaceUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.internal.KeyboardBuilder;
+import org.kelar.inputmethod.keyboard.internal.KeyboardParams;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.utils.TypefaceUtils;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardView.java
index 3acc11b59..ee66b8618 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -26,12 +26,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.accessibility.MoreKeysKeyboardAccessibilityDelegate;
-import com.android.inputmethod.keyboard.internal.KeyDrawParams;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.accessibility.MoreKeysKeyboardAccessibilityDelegate;
+import org.kelar.inputmethod.keyboard.internal.KeyDrawParams;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 /**
  * A view that renders a virtual {@link MoreKeysKeyboard}. It handles rendering of keys and
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java b/java/src/org/kelar/inputmethod/keyboard/MoreKeysPanel.java
index 7bddd09f6..d58d542db 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysPanel.java
+++ b/java/src/org/kelar/inputmethod/keyboard/MoreKeysPanel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/org/kelar/inputmethod/keyboard/PointerTracker.java
index c0ac1c054..468f50775 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/org/kelar/inputmethod/keyboard/PointerTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -22,24 +22,24 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 
-import com.android.inputmethod.keyboard.internal.BatchInputArbiter;
-import com.android.inputmethod.keyboard.internal.BatchInputArbiter.BatchInputArbiterListener;
-import com.android.inputmethod.keyboard.internal.BogusMoveEventDetector;
-import com.android.inputmethod.keyboard.internal.DrawingProxy;
-import com.android.inputmethod.keyboard.internal.GestureEnabler;
-import com.android.inputmethod.keyboard.internal.GestureStrokeDrawingParams;
-import com.android.inputmethod.keyboard.internal.GestureStrokeDrawingPoints;
-import com.android.inputmethod.keyboard.internal.GestureStrokeRecognitionParams;
-import com.android.inputmethod.keyboard.internal.PointerTrackerQueue;
-import com.android.inputmethod.keyboard.internal.TimerProxy;
-import com.android.inputmethod.keyboard.internal.TypingTimeRecorder;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.keyboard.internal.BatchInputArbiter;
+import org.kelar.inputmethod.keyboard.internal.BatchInputArbiter.BatchInputArbiterListener;
+import org.kelar.inputmethod.keyboard.internal.BogusMoveEventDetector;
+import org.kelar.inputmethod.keyboard.internal.DrawingProxy;
+import org.kelar.inputmethod.keyboard.internal.GestureEnabler;
+import org.kelar.inputmethod.keyboard.internal.GestureStrokeDrawingParams;
+import org.kelar.inputmethod.keyboard.internal.GestureStrokeDrawingPoints;
+import org.kelar.inputmethod.keyboard.internal.GestureStrokeRecognitionParams;
+import org.kelar.inputmethod.keyboard.internal.PointerTrackerQueue;
+import org.kelar.inputmethod.keyboard.internal.TimerProxy;
+import org.kelar.inputmethod.keyboard.internal.TypingTimeRecorder;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/org/kelar/inputmethod/keyboard/ProximityInfo.java
index b9a5eaefb..62eca07ea 100644
--- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/java/src/org/kelar/inputmethod/keyboard/ProximityInfo.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.graphics.Rect;
 import android.util.Log;
 
-import com.android.inputmethod.keyboard.internal.TouchPositionCorrection;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.JniUtils;
+import org.kelar.inputmethod.keyboard.internal.TouchPositionCorrection;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.JniUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/DynamicGridKeyboard.java b/java/src/org/kelar/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
index daeb1f928..0c0999fbd 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.JsonUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.JsonUtils;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategory.java
index b57e483d1..9d86059d5 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -25,13 +25,13 @@ import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
index 43d62c71a..c1bd0c7e8 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiLayoutParams.java
index a85c3a97f..26ac96999 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiLayoutParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiLayoutParams.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,8 +22,8 @@ import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 final class EmojiLayoutParams {
     private static final int DEFAULT_KEYBOARD_ROWS = 4;
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java
index 09313f811..80d2dca9f 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPageKeyboardView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import android.content.Context;
 import android.os.Handler;
@@ -23,13 +23,13 @@ import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.accessibility.KeyboardAccessibilityDelegate;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyDetector;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardView;
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.accessibility.KeyboardAccessibilityDelegate;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyDetector;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardView;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * This is an extended {@link KeyboardView} class that hosts an emoji page keyboard.
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesAdapter.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPalettesAdapter.java
index 18b9c7e36..8b638673f 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesAdapter.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPalettesAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
 import androidx.viewpager.widget.PagerAdapter;
 import android.util.Log;
@@ -23,10 +23,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardView;
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardView;
+import org.kelar.inputmethod.latin.R;
 
 final class EmojiPalettesAdapter extends PagerAdapter {
     private static final String TAG = EmojiPalettesAdapter.class.getSimpleName();
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPalettesView.java
index 898605019..08c6b4c18 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiPalettesView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/emoji/EmojiPalettesView.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.emoji;
+package org.kelar.inputmethod.keyboard.emoji;
 
-import static com.android.inputmethod.latin.common.Constants.NOT_A_COORDINATE;
+import static org.kelar.inputmethod.latin.common.Constants.NOT_A_COORDINATE;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -38,18 +38,18 @@ import android.widget.TabHost.OnTabChangeListener;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyboardActionListener;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.KeyboardView;
-import com.android.inputmethod.keyboard.internal.KeyDrawParams;
-import com.android.inputmethod.keyboard.internal.KeyVisualAttributes;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyboardActionListener;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.KeyboardView;
+import org.kelar.inputmethod.keyboard.internal.KeyDrawParams;
+import org.kelar.inputmethod.keyboard.internal.KeyVisualAttributes;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 /**
  * View class to implement Emoji palettes.
@@ -329,7 +329,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
 
     /**
      * Called from {@link EmojiPageKeyboardView} through
-     * {@link com.android.inputmethod.keyboard.emoji.EmojiPageKeyboardView.OnKeyEventListener}
+     * {@link EmojiPageKeyboardView.OnKeyEventListener}
      * interface to handle touch events from non-View-based elements such as Emoji buttons.
      */
     @Override
@@ -340,7 +340,7 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
 
     /**
      * Called from {@link EmojiPageKeyboardView} through
-     * {@link com.android.inputmethod.keyboard.emoji.EmojiPageKeyboardView.OnKeyEventListener}
+     * {@link EmojiPageKeyboardView.OnKeyEventListener}
      * interface to handle touch events from non-View-based elements such as Emoji buttons.
      */
     @Override
diff --git a/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java b/java/src/org/kelar/inputmethod/keyboard/internal/AbstractDrawingPreview.java
index c76a9aca4..3e3106ee0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/AbstractDrawingPreview.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/AbstractDrawingPreview.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.graphics.Canvas;
 import android.view.View;
 
-import com.android.inputmethod.keyboard.MainKeyboardView;
-import com.android.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.keyboard.MainKeyboardView;
+import org.kelar.inputmethod.keyboard.PointerTracker;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/AlphabetShiftState.java b/java/src/org/kelar/inputmethod/keyboard/internal/AlphabetShiftState.java
index 33f6b4965..2ea6e973a 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/AlphabetShiftState.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/AlphabetShiftState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/BatchInputArbiter.java b/java/src/org/kelar/inputmethod/keyboard/internal/BatchInputArbiter.java
index 77d0e7a90..e786fdb95 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/BatchInputArbiter.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/BatchInputArbiter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
 
 /**
  * This class arbitrates batch input.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/BogusMoveEventDetector.java b/java/src/org/kelar/inputmethod/keyboard/internal/BogusMoveEventDetector.java
index 4b355a4ab..bed7cb971 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/BogusMoveEventDetector.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/BogusMoveEventDetector.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
 import android.util.Log;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 // This hack is applied to certain classes of tablets.
 public final class BogusMoveEventDetector {
diff --git a/java/src/com/android/inputmethod/keyboard/internal/CodesArrayParser.java b/java/src/org/kelar/inputmethod/keyboard/internal/CodesArrayParser.java
index 2e2ed52dd..d5d3c96b7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/CodesArrayParser.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/CodesArrayParser.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import android.text.TextUtils;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/DrawingPreviewPlacerView.java b/java/src/org/kelar/inputmethod/keyboard/internal/DrawingPreviewPlacerView.java
index 9c0d7436b..fcdc0f668 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/DrawingPreviewPlacerView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/DrawingPreviewPlacerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -24,7 +24,7 @@ import android.graphics.PorterDuffXfermode;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/DrawingProxy.java b/java/src/org/kelar/inputmethod/keyboard/internal/DrawingProxy.java
index 06bdfc41b..d56e5d62a 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/DrawingProxy.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/DrawingProxy.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.MoreKeysPanel;
-import com.android.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.MoreKeysPanel;
+import org.kelar.inputmethod.keyboard.PointerTracker;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureEnabler.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureEnabler.java
index 7d14ae924..524bf136a 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureEnabler.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureEnabler.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
 
 public final class GestureEnabler {
     /** True if we should handle gesture events. */
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java
index cb50b76ae..762e082fe 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -24,10 +24,10 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.text.TextUtils;
 
-import com.android.inputmethod.keyboard.PointerTracker;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeDrawingParams.java
index eeba67892..c9231028f 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeDrawingParams.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * This class holds parameters to control how a gesture stroke is sampled and drawn on the screen.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingPoints.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeDrawingPoints.java
index 07ef00924..1bb10eafb 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeDrawingPoints.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeDrawingPoints.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.latin.common.ResizableIntArray;
+import org.kelar.inputmethod.latin.common.ResizableIntArray;
 
 /**
  * This class holds drawing points to represent a gesture stroke on the screen.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeRecognitionParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeRecognitionParams.java
index e98729d43..8fdab5fb6 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeRecognitionParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeRecognitionParams.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 /**
  * This class holds parameters to control how a gesture stroke is sampled and recognized.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
index 3e901114a..b300d9c75 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureStrokeRecognitionPoints.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.ResizableIntArray;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.ResizableIntArray;
 
 /**
  * This class holds event points to recognize a gesture stroke.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailDrawingParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailDrawingParams.java
index 074862a70..cbba54fe2 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailDrawingParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailDrawingParams.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * This class holds parameters to control how a gesture trail is drawn and animated on the screen.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailDrawingPoints.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailDrawingPoints.java
index 4d998e443..2dc43dc91 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailDrawingPoints.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailDrawingPoints.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -23,8 +23,8 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.os.SystemClock;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.ResizableIntArray;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.ResizableIntArray;
 
 /**
  * This class holds drawing points to represent a gesture trail. The gesture trail may contain
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailsDrawingPreview.java b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailsDrawingPreview.java
index f7bd7efe0..de0cf1221 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GestureTrailsDrawingPreview.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/GestureTrailsDrawingPreview.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -27,7 +27,7 @@ import android.graphics.Rect;
 import android.os.Handler;
 import android.util.SparseArray;
 
-import com.android.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.keyboard.PointerTracker;
 
 /**
  * Draw preview graphics of multiple gesture trails during gesture input.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/HermiteInterpolator.java b/java/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolator.java
index b526a942a..1c93ea32c 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/HermiteInterpolator.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 /**
  * Interpolates XY-coordinates using Cubic Hermite Curve.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyDrawParams.java
index 3ef9ea1dc..a4550b5fd 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyDrawParams.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.graphics.Typeface;
 
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
index 448f1b4b1..ebdde32c0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewChoreographer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -22,9 +22,9 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.utils.ViewLayoutUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.utils.ViewLayoutUtils;
 
 import java.util.ArrayDeque;
 import java.util.HashMap;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewDrawParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewDrawParams.java
index 5ed39f986..bcfea36e1 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewDrawParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewDrawParams.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
@@ -25,7 +25,7 @@ import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 public final class KeyPreviewDrawParams {
     // XML attributes of {@link MainKeyboardView}.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewView.java
index 24538605a..fa95a69ec 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyPreviewView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -26,8 +26,8 @@ import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.TextView;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.latin.R;
 
 import java.util.HashSet;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeySpecParser.java
index 3eb62e7a6..9ca6d09af 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeySpecParser.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStyle.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyStyle.java
index 28aa22c16..1ba45f1e3 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyStyle.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyStyle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyStylesSet.java
index 61f98c8ff..cdfb22143 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyStylesSet.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.XmlParseUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.XmlParseUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyVisualAttributes.java
index 6f000d294..465656e13 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyVisualAttributes.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardBuilder.java
index 0eabf6cc9..80aa907cf 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -27,17 +27,17 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.util.Xml;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.XmlParseUtils;
-import com.android.inputmethod.latin.utils.XmlParseUtils.ParseException;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.XmlParseUtils;
+import org.kelar.inputmethod.latin.utils.XmlParseUtils.ParseException;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardCodesSet.java
index 05b4c7473..0751069f8 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardCodesSet.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.HashMap;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardIconsSet.java
index 15a5bd456..0c435fe0d 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable;
 import android.util.Log;
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import java.util.HashMap;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardParams.java
index 738d6a400..b13b565c0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardParams.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardRow.java
index 92daf0742..4b3a9df46 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardRow.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardRow.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.Xml;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardState.java
index 973e956db..4528d49d6 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardState.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.CapsModeUtils;
-import com.android.inputmethod.latin.utils.RecapitalizeStatus;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.CapsModeUtils;
+import org.kelar.inputmethod.latin.utils.RecapitalizeStatus;
 
 /**
  * Keyboard state machine.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 0aaf6b401..04b484edd 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.TextUtils;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 7dfb5328c..810ec36f0 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -23,7 +23,7 @@ import java.util.Locale;
  * !!!!! DO NOT EDIT THIS FILE !!!!!
  *
  * This file is generated by tools/make-keyboard-text. The base template file is
- *   tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/
+ *   tools/make-keyboard-text/res/src/org.kelar.inputmethod/keyboard/internal/
  *   KeyboardTextsTable.tmpl
  *
  * This file must be updated when any text resources in keyboard layout files have been changed.
@@ -37,7 +37,7 @@ import java.util.Locale;
  *   $ make-keyboard-text -java packages/inputmethods/LatinIME/java
  *
  * The updated source file will be generated to the following path (this file).
- *   packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/
+ *   packages/inputmethods/LatinIME/java/src/org.kelar.inputmethod/keyboard/internal/
  *   KeyboardTextsTable.java
  */
 public final class KeyboardTextsTable {
diff --git a/java/src/com/android/inputmethod/keyboard/internal/MatrixUtils.java b/java/src/org/kelar/inputmethod/keyboard/internal/MatrixUtils.java
index d927cc362..89b1e2576 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/MatrixUtils.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/MatrixUtils.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java b/java/src/org/kelar/inputmethod/keyboard/internal/ModifierKeyState.java
index b254ab8d4..18b3e6154 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/ModifierKeyState.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/ModifierKeyState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/MoreKeySpec.java b/java/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpec.java
index 0bd42fc13..533cf59c8 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/MoreKeySpec.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpec.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.text.TextUtils;
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.compat.CharacterCompat;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.latin.common.CollectionUtils;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.compat.CharacterCompat;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.latin.common.CollectionUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/NonDistinctMultitouchHelper.java b/java/src/org/kelar/inputmethod/keyboard/internal/NonDistinctMultitouchHelper.java
index 8a375c620..b2258f737 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/NonDistinctMultitouchHelper.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/NonDistinctMultitouchHelper.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 import android.view.MotionEvent;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.KeyDetector;
-import com.android.inputmethod.keyboard.PointerTracker;
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.KeyDetector;
+import org.kelar.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 public final class NonDistinctMultitouchHelper {
     private static final String TAG = NonDistinctMultitouchHelper.class.getSimpleName();
diff --git a/java/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueue.java b/java/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueue.java
index 556d74f4b..2a13b3f42 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueue.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/RoundedLine.java b/java/src/org/kelar/inputmethod/keyboard/internal/RoundedLine.java
index 211ef5f8b..f1728d703 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/RoundedLine.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/RoundedLine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.graphics.Path;
 import android.graphics.Rect;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/ShiftKeyState.java b/java/src/org/kelar/inputmethod/keyboard/internal/ShiftKeyState.java
index a497b2eb3..74c178420 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/ShiftKeyState.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/ShiftKeyState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java b/java/src/org/kelar/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java
index 6837f0fcb..98775ecf5 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
 
-import com.android.inputmethod.keyboard.PointerTracker;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
 
 /**
  * Draw rubber band preview graphics during sliding key input.
diff --git a/java/src/com/android/inputmethod/keyboard/internal/SmoothingUtils.java b/java/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtils.java
index 10847f62d..25ce30728 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/SmoothingUtils.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtils.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java b/java/src/org/kelar/inputmethod/keyboard/internal/TimerHandler.java
index 91f3558eb..078ca12e4 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/TimerHandler.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/TimerHandler.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.os.Message;
 import android.os.SystemClock;
 import android.view.ViewConfiguration;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.PointerTracker;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.LeakGuardHandlerWrapper;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/TimerProxy.java b/java/src/org/kelar/inputmethod/keyboard/internal/TimerProxy.java
index 0ce3de8d9..1bf3a3d0b 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/TimerProxy.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/TimerProxy.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.PointerTracker;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.PointerTracker;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/TouchPositionCorrection.java b/java/src/org/kelar/inputmethod/keyboard/internal/TouchPositionCorrection.java
index d8f0114e1..351e201e1 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/TouchPositionCorrection.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/TouchPositionCorrection.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 public final class TouchPositionCorrection {
     private static final int TOUCH_POSITION_CORRECTION_RECORD_SIZE = 3;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/TypingTimeRecorder.java b/java/src/org/kelar/inputmethod/keyboard/internal/TypingTimeRecorder.java
index 9593f715c..a66976778 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/TypingTimeRecorder.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/TypingTimeRecorder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 public final class TypingTimeRecorder {
     private final int mStaticTimeThresholdAfterFastTyping; // msec
diff --git a/java/src/com/android/inputmethod/keyboard/internal/UniqueKeysCache.java b/java/src/org/kelar/inputmethod/keyboard/internal/UniqueKeysCache.java
index 5b329dce4..ea6b37793 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/UniqueKeysCache.java
+++ b/java/src/org/kelar/inputmethod/keyboard/internal/UniqueKeysCache.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import com.android.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Key;
 
 import java.util.HashMap;
 
diff --git a/java/src/com/android/inputmethod/latin/AssetFileAddress.java b/java/src/org/kelar/inputmethod/latin/AssetFileAddress.java
index f8d02d6ea..c8508f91d 100644
--- a/java/src/com/android/inputmethod/latin/AssetFileAddress.java
+++ b/java/src/org/kelar/inputmethod/latin/AssetFileAddress.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 
diff --git a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java b/java/src/org/kelar/inputmethod/latin/AudioAndHapticFeedbackManager.java
index 5e6e4ab25..1cf7fde0b 100644
--- a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
+++ b/java/src/org/kelar/inputmethod/latin/AudioAndHapticFeedbackManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.media.AudioManager;
@@ -22,8 +22,8 @@ import android.os.Vibrator;
 import android.view.HapticFeedbackConstants;
 import android.view.View;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 /**
  * This class gathers audio feedback and haptic feedback functions.
diff --git a/java/src/com/android/inputmethod/latin/BackupAgent.java b/java/src/org/kelar/inputmethod/latin/BackupAgent.java
index b2d92b30c..267014683 100644
--- a/java/src/com/android/inputmethod/latin/BackupAgent.java
+++ b/java/src/org/kelar/inputmethod/latin/BackupAgent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.BackupDataInput;
@@ -22,7 +22,7 @@ import android.app.backup.SharedPreferencesBackupHelper;
 import android.content.SharedPreferences;
 import android.os.ParcelFileDescriptor;
 
-import com.android.inputmethod.latin.settings.LocalSettingsConstants;
+import org.kelar.inputmethod.latin.settings.LocalSettingsConstants;
 
 import java.io.IOException;
 
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/org/kelar/inputmethod/latin/BinaryDictionary.java
index 9a3ac674e..661339dd0 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/BinaryDictionary.java
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.JniUtils;
-import com.android.inputmethod.latin.utils.WordInputEventForPersonalization;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.JniUtils;
+import org.kelar.inputmethod.latin.utils.WordInputEventForPersonalization;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/org/kelar/inputmethod/latin/BinaryDictionaryFileDumper.java
index 648610c86..ab350576a 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java
+++ b/java/src/org/kelar/inputmethod/latin/BinaryDictionaryFileDumper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
@@ -27,15 +27,15 @@ import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
-import com.android.inputmethod.dictionarypack.MD5Calculator;
-import com.android.inputmethod.dictionarypack.UpdateHandler;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.utils.DictionaryInfoUtils;
-import com.android.inputmethod.latin.utils.DictionaryInfoUtils.DictionaryInfo;
-import com.android.inputmethod.latin.utils.FileTransforms;
-import com.android.inputmethod.latin.utils.MetadataFileUriGetter;
+import org.kelar.inputmethod.dictionarypack.DictionaryPackConstants;
+import org.kelar.inputmethod.dictionarypack.MD5Calculator;
+import org.kelar.inputmethod.dictionarypack.UpdateHandler;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.utils.DictionaryInfoUtils;
+import org.kelar.inputmethod.latin.utils.DictionaryInfoUtils.DictionaryInfo;
+import org.kelar.inputmethod.latin.utils.FileTransforms;
+import org.kelar.inputmethod.latin.utils.MetadataFileUriGetter;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/org/kelar/inputmethod/latin/BinaryDictionaryGetter.java
index c13f0e20a..75d2d5d4e 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/org/kelar/inputmethod/latin/BinaryDictionaryGetter.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.AssetFileDescriptor;
 import android.util.Log;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.DictionaryInfoUtils;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.DictionaryInfoUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/org/kelar/inputmethod/latin/ContactsBinaryDictionary.java
index dbd639fe8..97f465095 100644
--- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/ContactsBinaryDictionary.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.Manifest;
 import android.content.Context;
@@ -23,11 +23,11 @@ import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.latin.ContactsManager.ContactsChangedListener;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.personalization.AccountUtils;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.latin.ContactsManager.ContactsChangedListener;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.personalization.AccountUtils;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/latin/ContactsContentObserver.java b/java/src/org/kelar/inputmethod/latin/ContactsContentObserver.java
index 6103a8296..693675354 100644
--- a/java/src/com/android/inputmethod/latin/ContactsContentObserver.java
+++ b/java/src/org/kelar/inputmethod/latin/ContactsContentObserver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.Manifest;
 import android.content.ContentResolver;
@@ -24,10 +24,10 @@ import android.os.SystemClock;
 import android.provider.ContactsContract.Contacts;
 import android.util.Log;
 
-import com.android.inputmethod.latin.ContactsManager.ContactsChangedListener;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.utils.ExecutorUtils;
+import org.kelar.inputmethod.latin.ContactsManager.ContactsChangedListener;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.utils.ExecutorUtils;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java b/java/src/org/kelar/inputmethod/latin/ContactsDictionaryConstants.java
index 022940910..f4d256787 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java
+++ b/java/src/org/kelar/inputmethod/latin/ContactsDictionaryConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.provider.BaseColumns;
 import android.provider.ContactsContract.Contacts;
diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionaryUtils.java b/java/src/org/kelar/inputmethod/latin/ContactsDictionaryUtils.java
index b77388434..1db81503d 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionaryUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/ContactsDictionaryUtils.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/latin/ContactsManager.java b/java/src/org/kelar/inputmethod/latin/ContactsManager.java
index 13503ff45..e4a6912db 100644
--- a/java/src/com/android/inputmethod/latin/ContactsManager.java
+++ b/java/src/org/kelar/inputmethod/latin/ContactsManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -24,8 +24,7 @@ import android.provider.ContactsContract.Contacts;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/src/com/android/inputmethod/latin/DicTraverseSession.java b/java/src/org/kelar/inputmethod/latin/DicTraverseSession.java
index 6816f129a..c95020ae4 100644
--- a/java/src/com/android/inputmethod/latin/DicTraverseSession.java
+++ b/java/src/org/kelar/inputmethod/latin/DicTraverseSession.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.latin.common.NativeSuggestOptions;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.utils.JniUtils;
+import org.kelar.inputmethod.latin.common.NativeSuggestOptions;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.utils.JniUtils;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/latin/Dictionary.java b/java/src/org/kelar/inputmethod/latin/Dictionary.java
index e00219c98..e070c428e 100644
--- a/java/src/com/android/inputmethod/latin/Dictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/Dictionary.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/org/kelar/inputmethod/latin/DictionaryCollection.java
index 96575f629..16affc317 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryCollection.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.util.Log;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryDumpBroadcastReceiver.java b/java/src/org/kelar/inputmethod/latin/DictionaryDumpBroadcastReceiver.java
index ee2fdc6c7..56f4215bb 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryDumpBroadcastReceiver.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryDumpBroadcastReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.util.Log;
 public class DictionaryDumpBroadcastReceiver extends BroadcastReceiver {
   private static final String TAG = DictionaryDumpBroadcastReceiver.class.getSimpleName();
 
-    private static final String DOMAIN = "com.android.inputmethod.latin";
+    private static final String DOMAIN = "org.kelar.inputmethod.latin";
     public static final String DICTIONARY_DUMP_INTENT_ACTION = DOMAIN + ".DICT_DUMP";
     public static final String DICTIONARY_NAME_KEY = "dictName";
 
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitator.java
index 02015da09..319015c90 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitator.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.util.LruCache;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.SuggestionResults;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.SuggestionResults;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorImpl.java
index b435de867..63c2cea4e 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.Manifest;
 import android.content.Context;
@@ -22,18 +22,18 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.LruCache;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.personalization.UserHistoryDictionary;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.ExecutorUtils;
-import com.android.inputmethod.latin.utils.SuggestionResults;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.personalization.UserHistoryDictionary;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.ExecutorUtils;
+import org.kelar.inputmethod.latin.utils.SuggestionResults;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCache.java b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCache.java
index cbaf6ea4e..b20fad30c 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCache.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorProvider.java
index a48b41fa7..1a932c77a 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorProvider.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryFacilitatorProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 /**
  * Factory for instantiating DictionaryFacilitator objects.
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFactory.java b/java/src/org/kelar/inputmethod/latin/DictionaryFactory.java
index 5dd02bd1c..cb5378aef 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFactory.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryFactory.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.ContentProviderClient;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.util.Log;
 
-import com.android.inputmethod.latin.utils.DictionaryInfoUtils;
+import org.kelar.inputmethod.latin.utils.DictionaryInfoUtils;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java b/java/src/org/kelar/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java
index 2dcfdb0b7..a756fc0a6 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryPackInstallBroadcastReceiver.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
-import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask;
+import org.kelar.inputmethod.dictionarypack.DictionaryPackConstants;
+import org.kelar.inputmethod.latin.utils.TargetPackageInfoGetterTask;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/latin/DictionaryStats.java b/java/src/org/kelar/inputmethod/latin/DictionaryStats.java
index b65d25bb1..915583a1a 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryStats.java
+++ b/java/src/org/kelar/inputmethod/latin/DictionaryStats.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import java.io.File;
 import java.math.BigDecimal;
diff --git a/java/src/com/android/inputmethod/latin/EmojiAltPhysicalKeyDetector.java b/java/src/org/kelar/inputmethod/latin/EmojiAltPhysicalKeyDetector.java
index 8924e0a3d..c8c889e80 100644
--- a/java/src/com/android/inputmethod/latin/EmojiAltPhysicalKeyDetector.java
+++ b/java/src/org/kelar/inputmethod/latin/EmojiAltPhysicalKeyDetector.java
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.res.Resources;
 import android.util.Log;
 import android.util.Pair;
 import android.view.KeyEvent;
 
-import com.android.inputmethod.keyboard.KeyboardSwitcher;
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.keyboard.KeyboardSwitcher;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/org/kelar/inputmethod/latin/ExpandableBinaryDictionary.java
index 907095746..c7b36e71a 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.AsyncResultHolder;
-import com.android.inputmethod.latin.utils.CombinedFormatUtils;
-import com.android.inputmethod.latin.utils.ExecutorUtils;
-import com.android.inputmethod.latin.utils.WordInputEventForPersonalization;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.AsyncResultHolder;
+import org.kelar.inputmethod.latin.utils.CombinedFormatUtils;
+import org.kelar.inputmethod.latin.utils.ExecutorUtils;
+import org.kelar.inputmethod.latin.utils.WordInputEventForPersonalization;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -387,7 +387,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
 
     /**
      * Used by Sketch.
-     * {@see https://cs.corp.google.com/#android/vendor/unbundled_google/packages/LatinIMEGoogle/tools/sketch/ime-simulator/src/com/android/inputmethod/sketch/imesimulator/ImeSimulator.java&q=updateEntriesForInputEventsCallback&l=286}
+     * {@see https://cs.corp.google.com/#android/vendor/unbundled_google/packages/LatinIMEGoogle/tools/sketch/ime-simulator/src/org.kelar.inputmethod/sketch/imesimulator/ImeSimulator.java&q=updateEntriesForInputEventsCallback&l=286}
      */
     @UsedForTesting
     public interface UpdateEntriesForInputEventsCallback {
@@ -398,7 +398,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
      * Dynamically update entries according to input events.
      *
      * Used by Sketch.
-     * {@see https://cs.corp.google.com/#android/vendor/unbundled_google/packages/LatinIMEGoogle/tools/sketch/ime-simulator/src/com/android/inputmethod/sketch/imesimulator/ImeSimulator.java&q=updateEntriesForInputEventsCallback&l=286}
+     * {@see https://cs.corp.google.com/#android/vendor/unbundled_google/packages/LatinIMEGoogle/tools/sketch/ime-simulator/src/org.kelar.inputmethod/sketch/imesimulator/ImeSimulator.java&q=updateEntriesForInputEventsCallback&l=286}
      */
     @UsedForTesting
     public void updateEntriesForInputEvents(
diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/org/kelar/inputmethod/latin/InputAttributes.java
index 86c7810f4..0c145e543 100644
--- a/java/src/com/android/inputmethod/latin/InputAttributes.java
+++ b/java/src/org/kelar/inputmethod/latin/InputAttributes.java
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_FLOATING_GESTURE_PREVIEW;
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_FLOATING_GESTURE_PREVIEW;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
 
 import android.text.InputType;
 import android.util.Log;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,7 +47,7 @@ public final class InputAttributes {
     /**
      * Whether the floating gesture preview should be disabled. If true, this should override the
      * corresponding keyboard settings preference, always suppressing the floating preview text.
-     * {@link com.android.inputmethod.latin.settings.SettingsValues#mGestureFloatingPreviewTextEnabled}
+     * {@link SettingsValues#mGestureFloatingPreviewTextEnabled}
      */
     final public boolean mDisableGestureFloatingPreviewText;
     final public boolean mIsGeneralTextInput;
diff --git a/java/src/com/android/inputmethod/latin/InputView.java b/java/src/org/kelar/inputmethod/latin/InputView.java
index f3a8ca169..9aab0e7c7 100644
--- a/java/src/com/android/inputmethod/latin/InputView.java
+++ b/java/src/org/kelar/inputmethod/latin/InputView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -23,10 +23,10 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.keyboard.MainKeyboardView;
-import com.android.inputmethod.latin.suggestions.MoreSuggestionsView;
-import com.android.inputmethod.latin.suggestions.SuggestionStripView;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.keyboard.MainKeyboardView;
+import org.kelar.inputmethod.latin.suggestions.MoreSuggestionsView;
+import org.kelar.inputmethod.latin.suggestions.SuggestionStripView;
 
 public final class InputView extends FrameLayout {
     private final Rect mInputViewRect = new Rect();
diff --git a/java/src/com/android/inputmethod/latin/LastComposedWord.java b/java/src/org/kelar/inputmethod/latin/LastComposedWord.java
index 426d33e6d..784518822 100644
--- a/java/src/com/android/inputmethod/latin/LastComposedWord.java
+++ b/java/src/org/kelar/inputmethod/latin/LastComposedWord.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/org/kelar/inputmethod/latin/LatinIME.java
index e68b43b39..5529c2bf5 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/org/kelar/inputmethod/latin/LatinIME.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import static com.android.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
-import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
+import static org.kelar.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
 
 import android.Manifest.permission;
 import android.app.ActivityOptions;
@@ -57,49 +57,49 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.annotation.NonNull;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.compat.EditorInfoCompatUtils;
-import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
-import com.android.inputmethod.compat.ViewOutlineProviderCompatUtils;
-import com.android.inputmethod.compat.ViewOutlineProviderCompatUtils.InsetsUpdater;
-import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.event.HardwareEventDecoder;
-import com.android.inputmethod.event.HardwareKeyboardEventDecoder;
-import com.android.inputmethod.event.InputTransaction;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardActionListener;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardSwitcher;
-import com.android.inputmethod.keyboard.MainKeyboardView;
-import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.define.ProductionFlags;
-import com.android.inputmethod.latin.inputlogic.InputLogic;
-import com.android.inputmethod.latin.permissions.PermissionsManager;
-import com.android.inputmethod.latin.personalization.PersonalizationHelper;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.settings.SettingsActivity;
-import com.android.inputmethod.latin.settings.SettingsValues;
-import com.android.inputmethod.latin.suggestions.SuggestionStripView;
-import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
-import com.android.inputmethod.latin.touchinputconsumer.GestureConsumer;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
-import com.android.inputmethod.latin.utils.DialogUtils;
-import com.android.inputmethod.latin.utils.ImportantNoticeUtils;
-import com.android.inputmethod.latin.utils.IntentUtils;
-import com.android.inputmethod.latin.utils.JniUtils;
-import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
-import com.android.inputmethod.latin.utils.StatsUtils;
-import com.android.inputmethod.latin.utils.StatsUtilsManager;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
-import com.android.inputmethod.latin.utils.ViewLayoutUtils;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.compat.EditorInfoCompatUtils;
+import org.kelar.inputmethod.compat.InputMethodServiceCompatUtils;
+import org.kelar.inputmethod.compat.ViewOutlineProviderCompatUtils;
+import org.kelar.inputmethod.compat.ViewOutlineProviderCompatUtils.InsetsUpdater;
+import org.kelar.inputmethod.dictionarypack.DictionaryPackConstants;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.event.HardwareEventDecoder;
+import org.kelar.inputmethod.event.HardwareKeyboardEventDecoder;
+import org.kelar.inputmethod.event.InputTransaction;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardActionListener;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardSwitcher;
+import org.kelar.inputmethod.keyboard.MainKeyboardView;
+import org.kelar.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.inputlogic.InputLogic;
+import org.kelar.inputmethod.latin.permissions.PermissionsManager;
+import org.kelar.inputmethod.latin.personalization.PersonalizationHelper;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.SettingsActivity;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.suggestions.SuggestionStripView;
+import org.kelar.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
+import org.kelar.inputmethod.latin.touchinputconsumer.GestureConsumer;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.utils.DialogUtils;
+import org.kelar.inputmethod.latin.utils.ImportantNoticeUtils;
+import org.kelar.inputmethod.latin.utils.IntentUtils;
+import org.kelar.inputmethod.latin.utils.JniUtils;
+import org.kelar.inputmethod.latin.utils.LeakGuardHandlerWrapper;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
+import org.kelar.inputmethod.latin.utils.StatsUtilsManager;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.ViewLayoutUtils;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -130,13 +130,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
      * A broadcast intent action to hide the software keyboard.
      */
     static final String ACTION_HIDE_SOFT_INPUT =
-            "com.android.inputmethod.latin.HIDE_SOFT_INPUT";
+            "org.kelar.inputmethod.latin.HIDE_SOFT_INPUT";
 
     /**
      * A custom permission for external apps to send {@link #ACTION_HIDE_SOFT_INPUT}.
      */
     static final String PERMISSION_HIDE_SOFT_INPUT =
-            "com.android.inputmethod.latin.HIDE_SOFT_INPUT";
+            "org.kelar.inputmethod.latin.HIDE_SOFT_INPUT";
 
     /**
      * The name of the scheme used by the Package Manager to warn of a new package installation,
diff --git a/java/src/com/android/inputmethod/latin/NgramContext.java b/java/src/org/kelar/inputmethod/latin/NgramContext.java
index 9682fb8a4..3555ab9a2 100644
--- a/java/src/com/android/inputmethod/latin/NgramContext.java
+++ b/java/src/org/kelar/inputmethod/latin/NgramContext.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java b/java/src/org/kelar/inputmethod/latin/PunctuationSuggestions.java
index e2c562174..70a2da107 100644
--- a/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java
+++ b/java/src/org/kelar/inputmethod/latin/PunctuationSuggestions.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.keyboard.internal.KeySpecParser;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.internal.KeySpecParser;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/ReadOnlyBinaryDictionary.java b/java/src/org/kelar/inputmethod/latin/ReadOnlyBinaryDictionary.java
index 7b1a53a6e..7e4eaed45 100644
--- a/java/src/com/android/inputmethod/latin/ReadOnlyBinaryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/ReadOnlyBinaryDictionary.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/org/kelar/inputmethod/latin/RichInputConnection.java
index a10f2bdb0..381560945 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/org/kelar/inputmethod/latin/RichInputConnection.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.inputmethodservice.InputMethodService;
 import android.os.Build;
@@ -32,19 +32,19 @@ import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.inputmethod.compat.InputConnectionCompatUtils;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.UnicodeSurrogate;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.inputlogic.PrivateCommandPerformer;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.CapsModeUtils;
-import com.android.inputmethod.latin.utils.DebugLogUtils;
-import com.android.inputmethod.latin.utils.NgramContextUtils;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.SpannableStringUtils;
-import com.android.inputmethod.latin.utils.StatsUtils;
-import com.android.inputmethod.latin.utils.TextRange;
+import org.kelar.inputmethod.compat.InputConnectionCompatUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.UnicodeSurrogate;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.inputlogic.PrivateCommandPerformer;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.CapsModeUtils;
+import org.kelar.inputmethod.latin.utils.DebugLogUtils;
+import org.kelar.inputmethod.latin.utils.NgramContextUtils;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.SpannableStringUtils;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
+import org.kelar.inputmethod.latin.utils.TextRange;
 
 import java.util.concurrent.TimeUnit;
 
@@ -320,7 +320,7 @@ public final class RichInputConnection implements PrivateCommandPerformer {
                 final int spanFlags = mTempObjectForCommitText.getSpanFlags(span);
                 // We have to adjust the end of the span to include an additional character.
                 // This is to avoid splitting a unicode surrogate pair.
-                // See com.android.inputmethod.latin.common.Constants.UnicodeSurrogate
+                // See org.kelar.inputmethod.latin.common.Constants.UnicodeSurrogate
                 // See https://b.corp.google.com/issues/19255233
                 if (0 < spanEnd && spanEnd < mTempObjectForCommitText.length()) {
                     final char spanEndChar = mTempObjectForCommitText.charAt(spanEnd - 1);
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/org/kelar/inputmethod/latin/RichInputMethodManager.java
index 3beb51d68..f364ce982 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
+++ b/java/src/org/kelar/inputmethod/latin/RichInputMethodManager.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -30,13 +30,13 @@ import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.compat.InputMethodManagerCompatWrapper;
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.compat.InputMethodManagerCompatWrapper;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java b/java/src/org/kelar/inputmethod/latin/RichInputMethodSubtype.java
index 941149895..d0502ddff 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodSubtype.java
+++ b/java/src/org/kelar/inputmethod/latin/RichInputMethodSubtype.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
 
 import android.os.Build;
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/org/kelar/inputmethod/latin/Suggest.java
index da23617af..7023b4db3 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/org/kelar/inputmethod/latin/Suggest.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 
-import static com.android.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION;
-import static com.android.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION;
-
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.AutoCorrectionUtils;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.SuggestionResults;
+import static org.kelar.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION;
+import static org.kelar.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION;
+
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.AutoCorrectionUtils;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.SuggestionResults;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/org/kelar/inputmethod/latin/SuggestedWords.java
index bcd4d5f69..c704ef531 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/org/kelar/inputmethod/latin/SuggestedWords.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 import android.view.inputmethod.CompletionInfo;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/org/kelar/inputmethod/latin/SystemBroadcastReceiver.java
index 90221512f..78c016353 100644
--- a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
+++ b/java/src/org/kelar/inputmethod/latin/SystemBroadcastReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
@@ -31,12 +31,12 @@ import android.util.Log;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
-import com.android.inputmethod.dictionarypack.DownloadManagerWrapper;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.setup.SetupActivity;
-import com.android.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
+import org.kelar.inputmethod.dictionarypack.DictionaryPackConstants;
+import org.kelar.inputmethod.dictionarypack.DownloadManagerWrapper;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.setup.SetupActivity;
+import org.kelar.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
 
 /**
  * This class detects the {@link Intent#ACTION_MY_PACKAGE_REPLACED} broadcast intent when this IME
diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/org/kelar/inputmethod/latin/UserBinaryDictionary.java
index fe24ccfc2..57a10b0a7 100644
--- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/UserBinaryDictionary.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -26,8 +26,8 @@ import android.provider.UserDictionary.Words;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/org/kelar/inputmethod/latin/WordComposer.java
index 8803edc88..5f05aeab7 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/org/kelar/inputmethod/latin/WordComposer.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
-
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.event.CombinerChain;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
+package org.kelar.inputmethod.latin;
+
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.event.CombinerChain;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/src/com/android/inputmethod/latin/WordListInfo.java b/java/src/org/kelar/inputmethod/latin/WordListInfo.java
index 268fe9818..f75721ae2 100644
--- a/java/src/com/android/inputmethod/latin/WordListInfo.java
+++ b/java/src/org/kelar/inputmethod/latin/WordListInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 /**
  * Information container for a word list.
diff --git a/java/src/com/android/inputmethod/latin/about/AboutPreferences.java b/java/src/org/kelar/inputmethod/latin/about/AboutPreferences.java
index ec7e6def5..a9e4a9929 100644
--- a/java/src/com/android/inputmethod/latin/about/AboutPreferences.java
+++ b/java/src/org/kelar/inputmethod/latin/about/AboutPreferences.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.about;
+package org.kelar.inputmethod.latin.about;
 
 import android.app.Fragment;
 
diff --git a/java/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java b/java/src/org/kelar/inputmethod/latin/accounts/AccountStateChangedListener.java
index 3c39c9a16..4680136ae 100644
--- a/java/src/com/android/inputmethod/latin/accounts/AccountStateChangedListener.java
+++ b/java/src/org/kelar/inputmethod/latin/accounts/AccountStateChangedListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import androidx.annotation.NonNull;
 
diff --git a/java/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiver.java b/java/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiver.java
index 00bcecf52..e6ca1f606 100644
--- a/java/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiver.java
+++ b/java/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import android.accounts.AccountManager;
 import android.content.BroadcastReceiver;
@@ -25,8 +25,8 @@ import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.settings.LocalSettingsConstants;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.settings.LocalSettingsConstants;
 
 /**
  * {@link BroadcastReceiver} for {@link AccountManager#LOGIN_ACCOUNTS_CHANGED_ACTION}.
diff --git a/java/src/com/android/inputmethod/latin/accounts/AuthUtils.java b/java/src/org/kelar/inputmethod/latin/accounts/AuthUtils.java
index 31aba3631..f5e517700 100644
--- a/java/src/com/android/inputmethod/latin/accounts/AuthUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/accounts/AuthUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/java/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java b/java/src/org/kelar/inputmethod/latin/accounts/LoginAccountUtils.java
index dcc64a223..c99505d83 100644
--- a/java/src/com/android/inputmethod/latin/accounts/LoginAccountUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/accounts/LoginAccountUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import android.content.Context;
 
diff --git a/java/src/com/android/inputmethod/latin/define/DebugFlags.java b/java/src/org/kelar/inputmethod/latin/define/DebugFlags.java
index c509e8322..36235be8c 100644
--- a/java/src/com/android/inputmethod/latin/define/DebugFlags.java
+++ b/java/src/org/kelar/inputmethod/latin/define/DebugFlags.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
 
 import android.content.SharedPreferences;
 
diff --git a/java/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java b/java/src/org/kelar/inputmethod/latin/define/DecoderSpecificConstants.java
index 7f57ce858..4698d49fc 100644
--- a/java/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java
+++ b/java/src/org/kelar/inputmethod/latin/define/DecoderSpecificConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
 
 /**
  * Decoder specific constants for LatinIme.
diff --git a/java/src/com/android/inputmethod/latin/define/JniLibName.java b/java/src/org/kelar/inputmethod/latin/define/JniLibName.java
index abfc36d39..56abeb96b 100644
--- a/java/src/com/android/inputmethod/latin/define/JniLibName.java
+++ b/java/src/org/kelar/inputmethod/latin/define/JniLibName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
 
 public final class JniLibName {
     private JniLibName() {
diff --git a/java/src/com/android/inputmethod/latin/define/ProductionFlags.java b/java/src/org/kelar/inputmethod/latin/define/ProductionFlags.java
index f31c20822..08f8d5f68 100644
--- a/java/src/com/android/inputmethod/latin/define/ProductionFlags.java
+++ b/java/src/org/kelar/inputmethod/latin/define/ProductionFlags.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
+
+import org.kelar.inputmethod.latin.SuggestedWords;
 
 public final class ProductionFlags {
     private ProductionFlags() {
@@ -25,7 +27,7 @@ public final class ProductionFlags {
 
     /**
      * Include all suggestions from all dictionaries in
-     * {@link com.android.inputmethod.latin.SuggestedWords#mRawSuggestions}.
+     * {@link SuggestedWords#mRawSuggestions}.
      */
     public static final boolean INCLUDE_RAW_SUGGESTIONS = false;
 
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/org/kelar/inputmethod/latin/inputlogic/InputLogic.java
index a7804a13f..1263e276c 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/org/kelar/inputmethod/latin/inputlogic/InputLogic.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.inputlogic;
+package org.kelar.inputmethod.latin.inputlogic;
 
 import android.graphics.Color;
 import android.os.SystemClock;
@@ -29,35 +29,35 @@ import android.view.KeyEvent;
 import android.view.inputmethod.CorrectionInfo;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.compat.SuggestionSpanUtils;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.event.InputTransaction;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardSwitcher;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.LastComposedWord;
-import com.android.inputmethod.latin.LatinIME;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.RichInputConnection;
-import com.android.inputmethod.latin.Suggest;
-import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.WordComposer;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.settings.SettingsValues;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
-import com.android.inputmethod.latin.utils.AsyncResultHolder;
-import com.android.inputmethod.latin.utils.InputTypeUtils;
-import com.android.inputmethod.latin.utils.RecapitalizeStatus;
-import com.android.inputmethod.latin.utils.StatsUtils;
-import com.android.inputmethod.latin.utils.TextRange;
+import org.kelar.inputmethod.compat.SuggestionSpanUtils;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.event.InputTransaction;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardSwitcher;
+import org.kelar.inputmethod.latin.Dictionary;
+import org.kelar.inputmethod.latin.DictionaryFacilitator;
+import org.kelar.inputmethod.latin.LastComposedWord;
+import org.kelar.inputmethod.latin.LatinIME;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.RichInputConnection;
+import org.kelar.inputmethod.latin.Suggest;
+import org.kelar.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.WordComposer;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.suggestions.SuggestionStripViewAccessor;
+import org.kelar.inputmethod.latin.utils.AsyncResultHolder;
+import org.kelar.inputmethod.latin.utils.InputTypeUtils;
+import org.kelar.inputmethod.latin.utils.RecapitalizeStatus;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
+import org.kelar.inputmethod.latin.utils.TextRange;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -265,7 +265,7 @@ public final class InputLogic {
      * @param settingsValues the current values of the settings.
      * @param suggestionInfo the suggestion info.
      * @param keyboardShiftState the shift state of the keyboard, as returned by
-     *     {@link com.android.inputmethod.keyboard.KeyboardSwitcher#getKeyboardShiftMode()}
+     *     {@link KeyboardSwitcher#getKeyboardShiftMode()}
      * @return the complete transaction object
      */
     // Called from {@link SuggestionStripView} through the {@link SuggestionStripView#Listener}
@@ -431,7 +431,7 @@ public final class InputLogic {
      * @param settingsValues the current settings values.
      * @param event the event to handle.
      * @param keyboardShiftMode the current shift mode of the keyboard, as returned by
-     *     {@link com.android.inputmethod.keyboard.KeyboardSwitcher#getKeyboardShiftMode()}
+     *     {@link KeyboardSwitcher#getKeyboardShiftMode()}
      * @return the complete transaction object
      */
     public InputTransaction onCodeInput(final SettingsValues settingsValues,
@@ -1905,10 +1905,10 @@ public final class InputLogic {
     }
 
     /**
-     * Make a {@link com.android.inputmethod.latin.SuggestedWords} object containing a typed word
+     * Make a {@link SuggestedWords} object containing a typed word
      * and obsolete suggestions.
-     * See {@link com.android.inputmethod.latin.SuggestedWords#getTypedWordAndPreviousSuggestions(
-     *      SuggestedWordInfo, com.android.inputmethod.latin.SuggestedWords)}.
+     * See {@link SuggestedWords#getTypedWordAndPreviousSuggestions(
+     *      SuggestedWordInfo, SuggestedWords)}.
      * @param typedWordInfo The typed word as a SuggestedWordInfo.
      * @param previousSuggestedWords The previously suggested words.
      * @return Obsolete suggestions with the newly typed word.
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogicHandler.java b/java/src/org/kelar/inputmethod/latin/inputlogic/InputLogicHandler.java
index ddc4ad99c..513d8785c 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogicHandler.java
+++ b/java/src/org/kelar/inputmethod/latin/inputlogic/InputLogicHandler.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.inputlogic;
+package org.kelar.inputmethod.latin.inputlogic;
 
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 
-import com.android.inputmethod.compat.LooperCompatUtils;
-import com.android.inputmethod.latin.LatinIME;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
-import com.android.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.compat.LooperCompatUtils;
+import org.kelar.inputmethod.latin.LatinIME;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
+import org.kelar.inputmethod.latin.common.InputPointers;
 
 /**
  * A helper to manage deferred tasks for the input logic.
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/PrivateCommandPerformer.java b/java/src/org/kelar/inputmethod/latin/inputlogic/PrivateCommandPerformer.java
index 42eaa9c82..5babf3226 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/PrivateCommandPerformer.java
+++ b/java/src/org/kelar/inputmethod/latin/inputlogic/PrivateCommandPerformer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.inputlogic;
+package org.kelar.inputmethod.latin.inputlogic;
 
 import android.os.Bundle;
 
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/SpaceState.java b/java/src/org/kelar/inputmethod/latin/inputlogic/SpaceState.java
index ce80c0016..0367cb606 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/SpaceState.java
+++ b/java/src/org/kelar/inputmethod/latin/inputlogic/SpaceState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.inputlogic;
+package org.kelar.inputmethod.latin.inputlogic;
 
 /**
  * Class for managing space states.
diff --git a/java/src/com/android/inputmethod/latin/makedict/DictionaryHeader.java b/java/src/org/kelar/inputmethod/latin/makedict/DictionaryHeader.java
index 4d253b0cb..6d771af61 100644
--- a/java/src/com/android/inputmethod/latin/makedict/DictionaryHeader.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/DictionaryHeader.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/org/kelar/inputmethod/latin/makedict/FormatSpec.java
index 288261bf0..35ed0c7ec 100644
--- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/FormatSpec.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/java/src/com/android/inputmethod/latin/makedict/NgramProperty.java b/java/src/org/kelar/inputmethod/latin/makedict/NgramProperty.java
index b1d19dc3c..a9a762553 100644
--- a/java/src/com/android/inputmethod/latin/makedict/NgramProperty.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/NgramProperty.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.NgramContext;
 
 public class NgramProperty {
     public final WeightedString mTargetWord;
diff --git a/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java b/java/src/org/kelar/inputmethod/latin/makedict/ProbabilityInfo.java
index 03c2ece1d..bd397191a 100644
--- a/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/ProbabilityInfo.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.utils.CombinedFormatUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.utils.CombinedFormatUtils;
 
 import java.util.Arrays;
 
diff --git a/java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java b/java/src/org/kelar/inputmethod/latin/makedict/UnsupportedFormatException.java
index 4f3861526..a8d60e5fb 100644
--- a/java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/UnsupportedFormatException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 /**
  * Simple exception thrown when a file format is not recognized.
diff --git a/java/src/com/android/inputmethod/latin/makedict/WeightedString.java b/java/src/org/kelar/inputmethod/latin/makedict/WeightedString.java
index f6782df9e..e2b910b29 100644
--- a/java/src/com/android/inputmethod/latin/makedict/WeightedString.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/WeightedString.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.Arrays;
 
diff --git a/java/src/com/android/inputmethod/latin/makedict/WordProperty.java b/java/src/org/kelar/inputmethod/latin/makedict/WordProperty.java
index 264e75710..e28615c40 100644
--- a/java/src/com/android/inputmethod/latin/makedict/WordProperty.java
+++ b/java/src/org/kelar/inputmethod/latin/makedict/WordProperty.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
-
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.utils.CombinedFormatUtils;
+package org.kelar.inputmethod.latin.makedict;
+
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.Dictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.utils.CombinedFormatUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/network/AuthException.java b/java/src/org/kelar/inputmethod/latin/network/AuthException.java
index 1bce4c156..1df92e8cb 100644
--- a/java/src/com/android/inputmethod/latin/network/AuthException.java
+++ b/java/src/org/kelar/inputmethod/latin/network/AuthException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
 /**
  * Authentication exception. When this exception is thrown, the client may
diff --git a/java/src/com/android/inputmethod/latin/network/BlockingHttpClient.java b/java/src/org/kelar/inputmethod/latin/network/BlockingHttpClient.java
index 079d07eac..7ae3860e7 100644
--- a/java/src/com/android/inputmethod/latin/network/BlockingHttpClient.java
+++ b/java/src/org/kelar/inputmethod/latin/network/BlockingHttpClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/latin/network/HttpException.java b/java/src/org/kelar/inputmethod/latin/network/HttpException.java
index b9d8b6372..6413b0667 100644
--- a/java/src/com/android/inputmethod/latin/network/HttpException.java
+++ b/java/src/org/kelar/inputmethod/latin/network/HttpException.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 /**
  * The HttpException exception represents a XML/HTTP fault with a HTTP status code.
diff --git a/java/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilder.java b/java/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilder.java
index df54bf464..b9f81cbe2 100644
--- a/java/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilder.java
+++ b/java/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
 import android.text.TextUtils;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
diff --git a/java/src/com/android/inputmethod/latin/permissions/PermissionsActivity.java b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsActivity.java
index 36d8ed943..5c56a2a10 100644
--- a/java/src/com/android/inputmethod/latin/permissions/PermissionsActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.permissions;
+package org.kelar.inputmethod.latin.permissions;
 
 
 import android.app.Activity;
diff --git a/java/src/com/android/inputmethod/latin/permissions/PermissionsManager.java b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsManager.java
index 08c623ab5..d95f4540d 100644
--- a/java/src/com/android/inputmethod/latin/permissions/PermissionsManager.java
+++ b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsManager.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.permissions;
+package org.kelar.inputmethod.latin.permissions;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/latin/permissions/PermissionsUtil.java b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsUtil.java
index 9a618a755..337334485 100644
--- a/java/src/com/android/inputmethod/latin/permissions/PermissionsUtil.java
+++ b/java/src/org/kelar/inputmethod/latin/permissions/PermissionsUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.permissions;
+package org.kelar.inputmethod.latin.permissions;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/latin/personalization/AccountUtils.java b/java/src/org/kelar/inputmethod/latin/personalization/AccountUtils.java
index ab3ef964e..45e551291 100644
--- a/java/src/com/android/inputmethod/latin/personalization/AccountUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/personalization/AccountUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/java/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
index 298e46c0a..7be7d1c8f 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/java/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java b/java/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionary.java
index cbf0829b5..bbd96c61e 100644
--- a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
+++ b/java/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionary.java
@@ -14,19 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import android.content.Context;
 
-import com.android.inputmethod.annotations.ExternallyReferenced;
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.ExpandableBinaryDictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.define.ProductionFlags;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.annotations.ExternallyReferenced;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.Dictionary;
+import org.kelar.inputmethod.latin.ExpandableBinaryDictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
 
 import java.io.File;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragment.java
index b39e6b477..a361ad32f 100644
--- a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragment.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
-import static com.android.inputmethod.latin.settings.LocalSettingsConstants.PREF_ACCOUNT_NAME;
-import static com.android.inputmethod.latin.settings.LocalSettingsConstants.PREF_ENABLE_CLOUD_SYNC;
+import static org.kelar.inputmethod.latin.settings.LocalSettingsConstants.PREF_ACCOUNT_NAME;
+import static org.kelar.inputmethod.latin.settings.LocalSettingsConstants.PREF_ENABLE_CLOUD_SYNC;
 
 import android.Manifest;
 import android.app.AlertDialog;
@@ -36,13 +36,13 @@ import android.text.method.LinkMovementMethod;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.accounts.AccountStateChangedListener;
-import com.android.inputmethod.latin.accounts.LoginAccountUtils;
-import com.android.inputmethod.latin.define.ProductionFlags;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.utils.ManagedProfileUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.accounts.AccountStateChangedListener;
+import org.kelar.inputmethod.latin.accounts.LoginAccountUtils;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.utils.ManagedProfileUtils;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/java/src/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
index 4e8a10b1f..95e589c75 100644
--- a/java/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceFragment;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
 
 import javax.annotation.Nonnull;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java
index a6fb7f1f1..9f3df399e 100644
--- a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/AdvancedSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,12 +22,10 @@ import android.content.res.Resources;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.preference.ListPreference;
-import android.preference.Preference;
 
-import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SystemBroadcastReceiver;
-import com.android.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SystemBroadcastReceiver;
 
 /**
  * "Advanced" settings sub screen.
diff --git a/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/AppearanceSettingsFragment.java
index 554edc85c..a294f1a6d 100644
--- a/java/src/com/android/inputmethod/latin/settings/AppearanceSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/AppearanceSettingsFragment.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.os.Bundle;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
 
 /**
  * "Appearance" settings sub screen.
diff --git a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/CorrectionSettingsFragment.java
index dfe899ece..0594ce5d1 100644
--- a/java/src/com/android/inputmethod/latin/settings/CorrectionSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/CorrectionSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.Manifest;
 import android.app.Activity;
@@ -29,12 +29,12 @@ import android.preference.Preference;
 import android.preference.SwitchPreference;
 import android.text.TextUtils;
 
-import com.android.inputmethod.dictionarypack.DictionarySettingsActivity;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.permissions.PermissionsManager;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryList;
-import com.android.inputmethod.latin.userdictionary.UserDictionarySettings;
+import org.kelar.inputmethod.dictionarypack.DictionarySettingsActivity;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.permissions.PermissionsManager;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryList;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionarySettings;
 
 import java.util.TreeSet;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStylePreference.java
index 44a98c1be..0f4cd0da3 100644
--- a/java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStylePreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -32,12 +32,12 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.compat.ViewCompatUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.compat.ViewCompatUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.TreeSet;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
index 56e8f1623..2e83719f2 100644
--- a/java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -38,12 +38,12 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodSubtype;
 import android.widget.Toast;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.DialogUtils;
-import com.android.inputmethod.latin.utils.IntentUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.DialogUtils;
+import org.kelar.inputmethod.latin.utils.IntentUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java b/java/src/org/kelar/inputmethod/latin/settings/DebugSettings.java
index 6fffb8e9d..6f26a00b7 100644
--- a/java/src/com/android/inputmethod/latin/settings/DebugSettings.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/DebugSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 /**
  * Debug settings for the application.
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/DebugSettingsFragment.java
index 37855377d..5cecb8155 100644
--- a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/DebugSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,11 +27,11 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.TwoStatePreference;
 
-import com.android.inputmethod.latin.DictionaryDumpBroadcastReceiver;
-import com.android.inputmethod.latin.DictionaryFacilitatorImpl;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
-import com.android.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.DictionaryDumpBroadcastReceiver;
+import org.kelar.inputmethod.latin.DictionaryFacilitatorImpl;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/latin/settings/GestureSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/GestureSettingsFragment.java
index 22b0655b4..f26392185 100644
--- a/java/src/com/android/inputmethod/latin/settings/GestureSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/GestureSettingsFragment.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.os.Bundle;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * "Gesture typing preferences" settings sub screen.
diff --git a/java/src/com/android/inputmethod/latin/settings/LocalSettingsConstants.java b/java/src/org/kelar/inputmethod/latin/settings/LocalSettingsConstants.java
index 5c416ab18..74551724f 100644
--- a/java/src/com/android/inputmethod/latin/settings/LocalSettingsConstants.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/LocalSettingsConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 /**
  * Collection of device specific preference constants.
diff --git a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/PreferencesSettingsFragment.java
index d9858e61f..3103a7a7f 100644
--- a/java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/PreferencesSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -23,9 +23,9 @@ import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 
-import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
 
 /**
  * "Preferences" settings sub screen.
diff --git a/java/src/com/android/inputmethod/latin/settings/RadioButtonPreference.java b/java/src/org/kelar/inputmethod/latin/settings/RadioButtonPreference.java
index 91444604d..0993cfe29 100644
--- a/java/src/com/android/inputmethod/latin/settings/RadioButtonPreference.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/RadioButtonPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.preference.Preference;
@@ -22,7 +22,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RadioButton;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 /**
  * Radio Button preference
diff --git a/java/src/com/android/inputmethod/latin/settings/SeekBarDialogPreference.java b/java/src/org/kelar/inputmethod/latin/settings/SeekBarDialogPreference.java
index 802574aa8..a5437cf13 100644
--- a/java/src/com/android/inputmethod/latin/settings/SeekBarDialogPreference.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SeekBarDialogPreference.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -26,7 +26,7 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 public final class SeekBarDialogPreference extends DialogPreference
         implements SeekBar.OnSeekBarChangeListener {
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/org/kelar/inputmethod/latin/settings/Settings.java
index 940f1bdfc..c16caddb2 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/Settings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,15 +25,15 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
-import com.android.inputmethod.latin.InputAttributes;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.StatsUtils;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
+import org.kelar.inputmethod.latin.InputAttributes;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
 
 import java.util.Collections;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java b/java/src/org/kelar/inputmethod/latin/settings/SettingsActivity.java
index ac1657762..a11cf47e6 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SettingsActivity.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
-import com.android.inputmethod.latin.permissions.PermissionsManager;
-import com.android.inputmethod.latin.utils.FragmentUtils;
-import com.android.inputmethod.latin.utils.StatsUtils;
-import com.android.inputmethod.latin.utils.StatsUtilsManager;
+import org.kelar.inputmethod.latin.permissions.PermissionsManager;
+import org.kelar.inputmethod.latin.utils.FragmentUtils;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
 
 import android.app.ActionBar;
 import android.content.Intent;
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/SettingsFragment.java
index 874f221c6..b61d418f6 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -27,11 +27,11 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.define.ProductionFlags;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
-import com.android.inputmethod.latin.utils.FeedbackUtils;
-import com.android.inputmethodcommon.InputMethodSettingsFragment;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.utils.FeedbackUtils;
+import org.kelar.inputmethodcommon.InputMethodSettingsFragment;
 
 public final class SettingsFragment extends InputMethodSettingsFragment {
     // We don't care about menu grouping.
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/org/kelar/inputmethod/latin/settings/SettingsValues.java
index 57018244f..f54a70361 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SettingsValues.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,13 +25,14 @@ import android.os.Build;
 import android.util.Log;
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.compat.AppWorkaroundsUtils;
-import com.android.inputmethod.latin.InputAttributes;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.AsyncResultHolder;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask;
+import org.kelar.inputmethod.compat.AppWorkaroundsUtils;
+import org.kelar.inputmethod.latin.InputAttributes;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.AsyncResultHolder;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.TargetPackageInfoGetterTask;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
 
 import java.util.Arrays;
 import java.util.Locale;
@@ -41,7 +42,7 @@ import javax.annotation.Nullable;
 
 /**
  * When you call the constructor of this class, you may want to change the current system locale by
- * using {@link com.android.inputmethod.latin.utils.RunInLocale}.
+ * using {@link RunInLocale}.
  */
 // Non-final for testing via mock library.
 public class SettingsValues {
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValuesForSuggestion.java b/java/src/org/kelar/inputmethod/latin/settings/SettingsValuesForSuggestion.java
index 5e2e5a5d6..b0b3c1d73 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValuesForSuggestion.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SettingsValuesForSuggestion.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 public class SettingsValuesForSuggestion {
     public final boolean mBlockPotentiallyOffensive;
diff --git a/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java b/java/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuations.java
index 70d97a5ba..0145ead8e 100644
--- a/java/src/com/android/inputmethod/latin/settings/SpacingAndPunctuations.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuations.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.res.Resources;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.PunctuationSuggestions;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.PunctuationSuggestions;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/settings/SubScreenFragment.java b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
index 5994a76df..08c9bd441 100644
--- a/java/src/com/android/inputmethod/latin/settings/SubScreenFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/SubScreenFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.backup.BackupManager;
 import android.content.Context;
diff --git a/java/src/com/android/inputmethod/latin/settings/TestFragmentActivity.java b/java/src/org/kelar/inputmethod/latin/settings/TestFragmentActivity.java
index 254bc6567..c235dc8f5 100644
--- a/java/src/com/android/inputmethod/latin/settings/TestFragmentActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/TestFragmentActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/java/src/com/android/inputmethod/latin/settings/ThemeSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/settings/ThemeSettingsFragment.java
index 29289aed2..f0d51196c 100644
--- a/java/src/com/android/inputmethod/latin/settings/ThemeSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/ThemeSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,9 +22,9 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.settings.RadioButtonPreference.OnRadioButtonClickedListener;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.settings.RadioButtonPreference.OnRadioButtonClickedListener;
 
 /**
  * "Keyboard theme" settings sub screen.
diff --git a/java/src/com/android/inputmethod/latin/settings/TwoStatePreferenceHelper.java b/java/src/org/kelar/inputmethod/latin/settings/TwoStatePreferenceHelper.java
index 07a871ca0..7657a4022 100644
--- a/java/src/com/android/inputmethod/latin/settings/TwoStatePreferenceHelper.java
+++ b/java/src/org/kelar/inputmethod/latin/settings/TwoStatePreferenceHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import android.os.Build;
 import android.preference.CheckBoxPreference;
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/org/kelar/inputmethod/latin/setup/SetupActivity.java
index 7607429f8..55b616605 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/setup/SetupActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.setup;
+package org.kelar.inputmethod.latin.setup;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupStartIndicatorView.java b/java/src/org/kelar/inputmethod/latin/setup/SetupStartIndicatorView.java
index 789694f08..aa80e4ce3 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupStartIndicatorView.java
+++ b/java/src/org/kelar/inputmethod/latin/setup/SetupStartIndicatorView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.setup;
+package org.kelar.inputmethod.latin.setup;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -28,7 +28,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 public final class SetupStartIndicatorView extends LinearLayout {
     public SetupStartIndicatorView(final Context context, final AttributeSet attrs) {
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupStepIndicatorView.java b/java/src/org/kelar/inputmethod/latin/setup/SetupStepIndicatorView.java
index 9a39ceace..919eef571 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupStepIndicatorView.java
+++ b/java/src/org/kelar/inputmethod/latin/setup/SetupStepIndicatorView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.setup;
+package org.kelar.inputmethod.latin.setup;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -24,7 +24,7 @@ import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 public final class SetupStepIndicatorView extends View {
     private final Path mIndicatorPath = new Path();
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java b/java/src/org/kelar/inputmethod/latin/setup/SetupWizardActivity.java
index bee22afd5..099c7a023 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/setup/SetupWizardActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.setup;
+package org.kelar.inputmethod.latin.setup;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -33,12 +33,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.VideoView;
 
-import com.android.inputmethod.compat.TextViewCompatUtils;
-import com.android.inputmethod.compat.ViewCompatUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.settings.SettingsActivity;
-import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
-import com.android.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
+import org.kelar.inputmethod.compat.TextViewCompatUtils;
+import org.kelar.inputmethod.compat.ViewCompatUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.settings.SettingsActivity;
+import org.kelar.inputmethod.latin.utils.LeakGuardHandlerWrapper;
+import org.kelar.inputmethod.latin.utils.UncachedInputMethodManagerUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 4625e8e8b..fb53b92d7 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -25,20 +25,20 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 import android.view.textservice.SuggestionsInfo;
 
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.DictionaryFacilitatorLruCache;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.ComposedData;
-import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.SuggestionResults;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.latin.DictionaryFacilitator;
+import org.kelar.inputmethod.latin.DictionaryFacilitatorLruCache;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.ComposedData;
+import org.kelar.inputmethod.latin.settings.SettingsValuesForSuggestion;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.SuggestionResults;
 
 import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
index c7622e7a1..3ab5138bf 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.annotation.TargetApi;
 import android.content.res.Resources;
@@ -26,9 +26,9 @@ import android.view.textservice.SentenceSuggestionsInfo;
 import android.view.textservice.SuggestionsInfo;
 import android.view.textservice.TextInfo;
 
-import com.android.inputmethod.compat.TextInfoCompatUtils;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.utils.SpannableStringUtils;
+import org.kelar.inputmethod.compat.TextInfoCompatUtils;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.utils.SpannableStringUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSessionFactory.java b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerSessionFactory.java
index e0418d404..9463a8fad 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSessionFactory.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerSessionFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.service.textservice.SpellCheckerService.Session;
 
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
index 9223923a7..2f1fc868b 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.content.ContentResolver;
 import android.database.ContentObserver;
@@ -27,19 +27,19 @@ import android.util.LruCache;
 import android.view.textservice.SuggestionsInfo;
 import android.view.textservice.TextInfo;
 
-import com.android.inputmethod.compat.SuggestionsInfoCompatUtils;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.WordComposer;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.StatsUtils;
-import com.android.inputmethod.latin.utils.SuggestionResults;
+import org.kelar.inputmethod.compat.SuggestionsInfoCompatUtils;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.WordComposer;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.StatsUtils;
+import org.kelar.inputmethod.latin.utils.SuggestionResults;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java b/java/src/org/kelar/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
index 10c458c7d..4dbcd092e 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.annotation.TargetApi;
 import android.content.res.Resources;
@@ -23,10 +23,10 @@ import android.view.textservice.SentenceSuggestionsInfo;
 import android.view.textservice.SuggestionsInfo;
 import android.view.textservice.TextInfo;
 
-import com.android.inputmethod.compat.TextInfoCompatUtils;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.compat.TextInfoCompatUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java b/java/src/org/kelar/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java
index 5f99f9004..acbfa8666 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
-import com.android.inputmethod.latin.permissions.PermissionsManager;
-import com.android.inputmethod.latin.utils.FragmentUtils;
+import org.kelar.inputmethod.latin.permissions.PermissionsManager;
+import org.kelar.inputmethod.latin.utils.FragmentUtils;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java b/java/src/org/kelar/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java
index 12005c25e..e60173932 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/spellcheck/SpellCheckerSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.Manifest;
 import android.content.SharedPreferences;
@@ -23,14 +23,14 @@ import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.text.TextUtils;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.permissions.PermissionsManager;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.settings.SubScreenFragment;
-import com.android.inputmethod.latin.settings.TwoStatePreferenceHelper;
-import com.android.inputmethod.latin.utils.ApplicationUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.permissions.PermissionsManager;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.settings.SubScreenFragment;
+import org.kelar.inputmethod.latin.settings.TwoStatePreferenceHelper;
+import org.kelar.inputmethod.latin.utils.ApplicationUtils;
 
-import static com.android.inputmethod.latin.permissions.PermissionsManager.get;
+import static org.kelar.inputmethod.latin.permissions.PermissionsManager.get;
 
 /**
  * Preference screen.
diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java b/java/src/org/kelar/inputmethod/latin/suggestions/MoreSuggestions.java
index 37ab2669b..5ea6ccd99 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestions.java
+++ b/java/src/org/kelar/inputmethod/latin/suggestions/MoreSuggestions.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.TypefaceUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.internal.KeyboardBuilder;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardParams;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.TypefaceUtils;
 
 public final class MoreSuggestions extends Keyboard {
     public final SuggestedWords mSuggestedWords;
diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/org/kelar/inputmethod/latin/suggestions/MoreSuggestionsView.java
index 907e3fa42..a899c9a1d 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java
+++ b/java/src/org/kelar/inputmethod/latin/suggestions/MoreSuggestionsView.java
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardActionListener;
-import com.android.inputmethod.keyboard.MoreKeysKeyboardView;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.suggestions.MoreSuggestions.MoreSuggestionKey;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardActionListener;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboardView;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.suggestions.MoreSuggestions.MoreSuggestionKey;
 
 /**
  * A view that renders a virtual {@link MoreSuggestions}. It handles rendering of keys and detecting
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
index 9577d0913..6e95de414 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
+++ b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -43,16 +43,16 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.PunctuationSuggestions;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.settings.SettingsValues;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.ViewLayoutUtils;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.PunctuationSuggestions;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.ViewLayoutUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripView.java
index 5dba4928b..9e75a8f8d 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -38,20 +38,20 @@ import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.android.inputmethod.accessibility.AccessibilityUtils;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.MainKeyboardView;
-import com.android.inputmethod.keyboard.MoreKeysPanel;
-import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.define.DebugFlags;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.settings.SettingsValues;
-import com.android.inputmethod.latin.suggestions.MoreSuggestionsView.MoreSuggestionsListener;
-import com.android.inputmethod.latin.utils.ImportantNoticeUtils;
+import org.kelar.inputmethod.accessibility.AccessibilityUtils;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.MainKeyboardView;
+import org.kelar.inputmethod.keyboard.MoreKeysPanel;
+import org.kelar.inputmethod.latin.AudioAndHapticFeedbackManager;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.suggestions.MoreSuggestionsView.MoreSuggestionsListener;
+import org.kelar.inputmethod.latin.utils.ImportantNoticeUtils;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripViewAccessor.java b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripViewAccessor.java
index 68f417e84..5af9611cf 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripViewAccessor.java
+++ b/java/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripViewAccessor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
-import com.android.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords;
 
 /**
  * An object that gives basic control of a suggestion strip and some info on it.
diff --git a/java/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java b/java/src/org/kelar/inputmethod/latin/touchinputconsumer/GestureConsumer.java
index 8291b4f72..26a22e1b6 100644
--- a/java/src/com/android/inputmethod/latin/touchinputconsumer/GestureConsumer.java
+++ b/java/src/org/kelar/inputmethod/latin/touchinputconsumer/GestureConsumer.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.touchinputconsumer;
+package org.kelar.inputmethod.latin.touchinputconsumer;
 
 import android.view.inputmethod.EditorInfo;
 
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.inputlogic.PrivateCommandPerformer;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.DictionaryFacilitator;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.inputlogic.PrivateCommandPerformer;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java
index 58e6a25b8..f214eb82a 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryAddWordContents.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -26,9 +26,9 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 
-import com.android.inputmethod.compat.UserDictionaryCompatUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.compat.UserDictionaryCompatUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
index a8781d786..33fa4b84d 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryAddWordFragment.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryAddWordContents.LocaleRenderer;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryLocalePicker.LocationChangedListener;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryAddWordContents.LocaleRenderer;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryLocalePicker.LocationChangedListener;
 
 import android.app.Fragment;
 import android.os.Bundle;
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryList.java
index f7940e3de..7fd5825ed 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,8 +30,8 @@ import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryLocalePicker.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryLocalePicker.java
index 58d3fb91c..12d9140f8 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryLocalePicker.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionaryLocalePicker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
 import android.app.Fragment;
 
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionarySettings.java
index d9339d965..d02dbd67c 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettings.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionarySettings.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import android.app.ListFragment;
 import android.content.ContentResolver;
diff --git a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java
index c0a946e42..095ab3e09 100644
--- a/java/src/com/android/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/userdictionary/UserDictionarySettingsUtils.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.userdictionary;
+package org.kelar.inputmethod.latin.userdictionary;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
 
 import android.content.Context;
 import android.text.TextUtils;
diff --git a/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java b/java/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtils.java
index 2aac7c57a..2b44fcd91 100644
--- a/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtils.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
 
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/java/src/com/android/inputmethod/latin/utils/ApplicationUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ApplicationUtils.java
index 7a4150def..13d5f2a00 100644
--- a/java/src/com/android/inputmethod/latin/utils/ApplicationUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ApplicationUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
diff --git a/java/src/com/android/inputmethod/latin/utils/AsyncResultHolder.java b/java/src/org/kelar/inputmethod/latin/utils/AsyncResultHolder.java
index 1525f2d56..b269f7f88 100644
--- a/java/src/com/android/inputmethod/latin/utils/AsyncResultHolder.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/AsyncResultHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java b/java/src/org/kelar/inputmethod/latin/utils/AutoCorrectionUtils.java
index c9ecade91..7410abddf 100644
--- a/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/AutoCorrectionUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 public final class AutoCorrectionUtils {
     private static final boolean DBG = DebugFlags.DEBUG_ENABLED;
diff --git a/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java b/java/src/org/kelar/inputmethod/latin/utils/BinaryDictionaryUtils.java
index 3bf9c6200..4020ca62a 100644
--- a/java/src/com/android/inputmethod/latin/utils/BinaryDictionaryUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/BinaryDictionaryUtils.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java b/java/src/org/kelar/inputmethod/latin/utils/CapsModeUtils.java
index 47f65499d..ee42b4f59 100644
--- a/java/src/com/android/inputmethod/latin/utils/CapsModeUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/CapsModeUtils.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.text.InputType;
 import android.text.TextUtils;
 
-import com.android.inputmethod.latin.WordComposer;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.WordComposer;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java b/java/src/org/kelar/inputmethod/latin/utils/CombinedFormatUtils.java
index 5c0c4328f..62ecc8d04 100644
--- a/java/src/com/android/inputmethod/latin/utils/CombinedFormatUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/CombinedFormatUtils.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.NgramProperty;
-import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.NgramProperty;
+import org.kelar.inputmethod.latin.makedict.ProbabilityInfo;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import java.util.HashMap;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/CompletionInfoUtils.java b/java/src/org/kelar/inputmethod/latin/utils/CompletionInfoUtils.java
index 5ccf0e079..fde9594fd 100644
--- a/java/src/com/android/inputmethod/latin/utils/CompletionInfoUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/CompletionInfoUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.text.TextUtils;
 import android.view.inputmethod.CompletionInfo;
diff --git a/java/src/com/android/inputmethod/latin/utils/CursorAnchorInfoUtils.java b/java/src/org/kelar/inputmethod/latin/utils/CursorAnchorInfoUtils.java
index 41090c054..e79c8f376 100644
--- a/java/src/com/android/inputmethod/latin/utils/CursorAnchorInfoUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/CursorAnchorInfoUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.annotation.TargetApi;
 import android.graphics.Matrix;
@@ -30,8 +30,8 @@ import android.view.ViewParent;
 import android.view.inputmethod.CursorAnchorInfo;
 import android.widget.TextView;
 
-import com.android.inputmethod.compat.BuildCompatUtils;
-import com.android.inputmethod.compat.CursorAnchorInfoCompatWrapper;
+import org.kelar.inputmethod.compat.BuildCompatUtils;
+import org.kelar.inputmethod.compat.CursorAnchorInfoCompatWrapper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/java/src/com/android/inputmethod/latin/utils/DebugLogUtils.java b/java/src/org/kelar/inputmethod/latin/utils/DebugLogUtils.java
index 1ab834fc3..6587304ac 100644
--- a/java/src/com/android/inputmethod/latin/utils/DebugLogUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/DebugLogUtils.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
-import com.android.inputmethod.latin.define.DebugFlags;
+import org.kelar.inputmethod.latin.define.DebugFlags;
 
 /**
  * A class for logging and debugging utility methods.
diff --git a/java/src/com/android/inputmethod/latin/utils/DialogUtils.java b/java/src/org/kelar/inputmethod/latin/utils/DialogUtils.java
index a05c932d0..37a3fe57a 100644
--- a/java/src/com/android/inputmethod/latin/utils/DialogUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/DialogUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 import android.view.ContextThemeWrapper;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 public final class DialogUtils {
     private DialogUtils() {
diff --git a/java/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java b/java/src/org/kelar/inputmethod/latin/utils/DictionaryHeaderUtils.java
index 5eb613c9b..0c0843e11 100644
--- a/java/src/com/android/inputmethod/latin/utils/DictionaryHeaderUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/DictionaryHeaderUtils.java
@@ -14,10 +14,10 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.AssetFileAddress;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.AssetFileAddress;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
 
 import java.io.File;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java b/java/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtils.java
index cea2e13b1..1cec4ff78 100644
--- a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -24,18 +24,18 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.dictionarypack.UpdateHandler;
-import com.android.inputmethod.latin.AssetFileAddress;
-import com.android.inputmethod.latin.BinaryDictionaryGetter;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.dictionarypack.UpdateHandler;
+import org.kelar.inputmethod.latin.AssetFileAddress;
+import org.kelar.inputmethod.latin.BinaryDictionaryGetter;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -390,7 +390,7 @@ public class DictionaryInfoUtils {
     /**
      * Returns the id associated with the main word list for a specified locale.
      *
-     * Word lists stored in Android Keyboard's resources are referred to as the "main"
+     * Word lists stored in Kelar Keyboard's resources are referred to as the "main"
      * word lists. Since they can be updated like any other list, we need to assign a
      * unique ID to them. This ID is just the name of the language (locale-wise) they
      * are for, and this method returns this ID.
diff --git a/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ExecutorUtils.java
index 8ce6eff92..2432febdd 100644
--- a/java/src/com/android/inputmethod/latin/utils/ExecutorUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ExecutorUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.Executors;
diff --git a/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java b/java/src/org/kelar/inputmethod/latin/utils/FeedbackUtils.java
index 67de8ba32..72308c85f 100644
--- a/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/FeedbackUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/java/src/com/android/inputmethod/latin/utils/FileTransforms.java b/java/src/org/kelar/inputmethod/latin/utils/FileTransforms.java
index 9f4584ec9..5f918410d 100644
--- a/java/src/com/android/inputmethod/latin/utils/FileTransforms.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/FileTransforms.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java b/java/src/org/kelar/inputmethod/latin/utils/FragmentUtils.java
index 147e57b13..f015c7f73 100644
--- a/java/src/com/android/inputmethod/latin/utils/FragmentUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/FragmentUtils.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.dictionarypack.DictionarySettingsFragment;
-import com.android.inputmethod.latin.about.AboutPreferences;
-import com.android.inputmethod.latin.settings.AccountsSettingsFragment;
-import com.android.inputmethod.latin.settings.AdvancedSettingsFragment;
-import com.android.inputmethod.latin.settings.AppearanceSettingsFragment;
-import com.android.inputmethod.latin.settings.CorrectionSettingsFragment;
-import com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment;
-import com.android.inputmethod.latin.settings.DebugSettingsFragment;
-import com.android.inputmethod.latin.settings.GestureSettingsFragment;
-import com.android.inputmethod.latin.settings.PreferencesSettingsFragment;
-import com.android.inputmethod.latin.settings.SettingsFragment;
-import com.android.inputmethod.latin.settings.ThemeSettingsFragment;
-import com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsFragment;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryAddWordFragment;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryList;
-import com.android.inputmethod.latin.userdictionary.UserDictionaryLocalePicker;
-import com.android.inputmethod.latin.userdictionary.UserDictionarySettings;
+import org.kelar.inputmethod.dictionarypack.DictionarySettingsFragment;
+import org.kelar.inputmethod.latin.about.AboutPreferences;
+import org.kelar.inputmethod.latin.settings.AccountsSettingsFragment;
+import org.kelar.inputmethod.latin.settings.AdvancedSettingsFragment;
+import org.kelar.inputmethod.latin.settings.AppearanceSettingsFragment;
+import org.kelar.inputmethod.latin.settings.CorrectionSettingsFragment;
+import org.kelar.inputmethod.latin.settings.CustomInputStyleSettingsFragment;
+import org.kelar.inputmethod.latin.settings.DebugSettingsFragment;
+import org.kelar.inputmethod.latin.settings.GestureSettingsFragment;
+import org.kelar.inputmethod.latin.settings.PreferencesSettingsFragment;
+import org.kelar.inputmethod.latin.settings.SettingsFragment;
+import org.kelar.inputmethod.latin.settings.ThemeSettingsFragment;
+import org.kelar.inputmethod.latin.spellcheck.SpellCheckerSettingsFragment;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryAddWordFragment;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryList;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionaryLocalePicker;
+import org.kelar.inputmethod.latin.userdictionary.UserDictionarySettings;
 
 import java.util.HashSet;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtils.java
index cea263b3b..d006cd3d5 100644
--- a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.Manifest;
 import android.content.Context;
@@ -24,10 +24,10 @@ import android.provider.Settings.SettingNotFoundException;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.permissions.PermissionsUtil;
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.permissions.PermissionsUtil;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/InputTypeUtils.java b/java/src/org/kelar/inputmethod/latin/utils/InputTypeUtils.java
index 19cd34011..3a4bae78c 100644
--- a/java/src/com/android/inputmethod/latin/utils/InputTypeUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/InputTypeUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
diff --git a/java/src/com/android/inputmethod/latin/utils/IntentUtils.java b/java/src/org/kelar/inputmethod/latin/utils/IntentUtils.java
index ea0168117..48e4b69e5 100644
--- a/java/src/com/android/inputmethod/latin/utils/IntentUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/IntentUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Intent;
 import android.text.TextUtils;
diff --git a/java/src/com/android/inputmethod/latin/utils/JniUtils.java b/java/src/org/kelar/inputmethod/latin/utils/JniUtils.java
index e7fdafaeb..c7506ca7b 100644
--- a/java/src/com/android/inputmethod/latin/utils/JniUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/JniUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
-import com.android.inputmethod.latin.define.JniLibName;
+import org.kelar.inputmethod.latin.define.JniLibName;
 
 public final class JniUtils {
     private static final String TAG = JniUtils.class.getSimpleName();
diff --git a/java/src/com/android/inputmethod/latin/utils/JsonUtils.java b/java/src/org/kelar/inputmethod/latin/utils/JsonUtils.java
index 6dd8d9711..7a2d2d92f 100644
--- a/java/src/com/android/inputmethod/latin/utils/JsonUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/JsonUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
diff --git a/java/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtils.java b/java/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtils.java
index a5a1ea921..2bcfc82b8 100644
--- a/java/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/java/src/com/android/inputmethod/latin/utils/LeakGuardHandlerWrapper.java b/java/src/org/kelar/inputmethod/latin/utils/LeakGuardHandlerWrapper.java
index 9a5be99b3..37f7c3023 100644
--- a/java/src/com/android/inputmethod/latin/utils/LeakGuardHandlerWrapper.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/LeakGuardHandlerWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ManagedProfileUtils.java
index ef1872bf4..f0eb90ad6 100644
--- a/java/src/com/android/inputmethod/latin/utils/ManagedProfileUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ManagedProfileUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 public class ManagedProfileUtils {
     private static ManagedProfileUtils INSTANCE = new ManagedProfileUtils();
diff --git a/java/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java b/java/src/org/kelar/inputmethod/latin/utils/MetadataFileUriGetter.java
index 97fb17de3..ae3108747 100644
--- a/java/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/MetadataFileUriGetter.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import android.content.Context;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/NgramContextUtils.java b/java/src/org/kelar/inputmethod/latin/utils/NgramContextUtils.java
index c05ffd693..6f8437b06 100644
--- a/java/src/com/android/inputmethod/latin/utils/NgramContextUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/NgramContextUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
diff --git a/java/src/com/android/inputmethod/latin/utils/RecapitalizeStatus.java b/java/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatus.java
index 737e33228..438b9871a 100644
--- a/java/src/com/android/inputmethod/latin/utils/RecapitalizeStatus.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatus.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ResourceUtils.java
index 37b34751a..96f206a7b 100644
--- a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ResourceUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -25,14 +25,13 @@ import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.WindowMetrics;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -125,7 +124,7 @@ public final class ResourceUtils {
      * @param conditionConstantArray an array of "condition,constant" elements to be searched.
      * @return the constant part of the matched "condition,constant" element. Returns null if no
      * condition matches.
-     * @see com.android.inputmethod.latin.utils.ResourceUtilsTests#testFindConstantForKeyValuePairsRegexp()
+     * @see org.kelar.inputmethod.latin.utils.ResourceUtilsTests#testFindConstantForKeyValuePairsRegexp()
      */
     @UsedForTesting
     static String findConstantForKeyValuePairs(final HashMap<String, String> keyValuePairs,
diff --git a/java/src/com/android/inputmethod/latin/utils/RunInLocale.java b/java/src/org/kelar/inputmethod/latin/utils/RunInLocale.java
index 1ea16e6ef..f890118d1 100644
--- a/java/src/com/android/inputmethod/latin/utils/RunInLocale.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/RunInLocale.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
diff --git a/java/src/com/android/inputmethod/latin/utils/ScriptUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ScriptUtils.java
index 537713091..981bc6649 100644
--- a/java/src/com/android/inputmethod/latin/utils/ScriptUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ScriptUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import java.util.Locale;
 import java.util.TreeMap;
diff --git a/java/src/com/android/inputmethod/latin/utils/SpannableStringUtils.java b/java/src/org/kelar/inputmethod/latin/utils/SpannableStringUtils.java
index c41817fe6..e3c6d60bf 100644
--- a/java/src/com/android/inputmethod/latin/utils/SpannableStringUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/SpannableStringUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -24,7 +24,7 @@ import android.text.TextUtils;
 import android.text.style.SuggestionSpan;
 import android.text.style.URLSpan;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
diff --git a/java/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java/src/org/kelar/inputmethod/latin/utils/StatsUtils.java
index 03e58478b..f690eae3e 100644
--- a/java/src/com/android/inputmethod/latin/utils/StatsUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/StatsUtils.java
@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.settings.SettingsValues;
-
-import javax.annotation.Nullable;
+import org.kelar.inputmethod.latin.DictionaryFacilitator;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 @SuppressWarnings("unused")
 public final class StatsUtils {
diff --git a/java/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java b/java/src/org/kelar/inputmethod/latin/utils/StatsUtilsManager.java
index cd42f50c7..5c86f020e 100644
--- a/java/src/com/android/inputmethod/latin/utils/StatsUtilsManager.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/StatsUtilsManager.java
@@ -15,12 +15,12 @@
  */
 
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 
-import com.android.inputmethod.latin.DictionaryFacilitator;
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.DictionaryFacilitator;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 @SuppressWarnings("unused")
 public class StatsUtilsManager {
diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtils.java
index 54a3fc39c..2be7ca5ba 100644
--- a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.COMBINING_RULES;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.COMBINING_RULES;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,9 +26,9 @@ import android.os.Build;
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/java/src/com/android/inputmethod/latin/utils/SuggestionResults.java b/java/src/org/kelar/inputmethod/latin/utils/SuggestionResults.java
index 981355115..0cd484704 100644
--- a/java/src/com/android/inputmethod/latin/utils/SuggestionResults.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/SuggestionResults.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.define.ProductionFlags;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.define.ProductionFlags;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/java/src/com/android/inputmethod/latin/utils/TargetPackageInfoGetterTask.java b/java/src/org/kelar/inputmethod/latin/utils/TargetPackageInfoGetterTask.java
index ab2b00e36..1d0a3e942 100644
--- a/java/src/com/android/inputmethod/latin/utils/TargetPackageInfoGetterTask.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/TargetPackageInfoGetterTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -22,7 +22,7 @@ import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.util.LruCache;
 
-import com.android.inputmethod.compat.AppWorkaroundsUtils;
+import org.kelar.inputmethod.compat.AppWorkaroundsUtils;
 
 public final class TargetPackageInfoGetterTask extends
         AsyncTask<String, Void, PackageInfo> {
diff --git a/java/src/com/android/inputmethod/latin/utils/TextRange.java b/java/src/org/kelar/inputmethod/latin/utils/TextRange.java
index dbf3b5060..2b0397d8e 100644
--- a/java/src/com/android/inputmethod/latin/utils/TextRange.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/TextRange.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.text.Spanned;
 import android.text.style.SuggestionSpan;
diff --git a/java/src/com/android/inputmethod/latin/utils/TypefaceUtils.java b/java/src/org/kelar/inputmethod/latin/utils/TypefaceUtils.java
index fafba79c2..5e0a985ed 100644
--- a/java/src/com/android/inputmethod/latin/utils/TypefaceUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/TypefaceUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.graphics.Paint;
 import android.graphics.Rect;
diff --git a/java/src/com/android/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java b/java/src/org/kelar/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java
index 5df00efb9..fd29bf9e3 100644
--- a/java/src/com/android/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/UncachedInputMethodManagerUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.Context;
 import android.provider.Settings;
diff --git a/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java b/java/src/org/kelar/inputmethod/latin/utils/ViewLayoutUtils.java
index 0bcba2754..3940375bb 100644
--- a/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/ViewLayoutUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/java/src/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java b/java/src/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
index fc0a9cb6c..6e7f0603b 100644
--- a/java/src/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.util.Log;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/src/com/android/inputmethod/latin/utils/XmlParseUtils.java b/java/src/org/kelar/inputmethod/latin/utils/XmlParseUtils.java
index bdad16652..cbd476413 100644
--- a/java/src/com/android/inputmethod/latin/utils/XmlParseUtils.java
+++ b/java/src/org/kelar/inputmethod/latin/utils/XmlParseUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import android.content.res.TypedArray;
 
diff --git a/java/src/com/android/inputmethodcommon/InputMethodSettingsActivity.java b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsActivity.java
index 6e868c9ff..1e304c3c4 100644
--- a/java/src/com/android/inputmethodcommon/InputMethodSettingsActivity.java
+++ b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethodcommon;
+package org.kelar.inputmethodcommon;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
diff --git a/java/src/com/android/inputmethodcommon/InputMethodSettingsFragment.java b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsFragment.java
index 49f0b87f1..4b1c5c7e8 100644
--- a/java/src/com/android/inputmethodcommon/InputMethodSettingsFragment.java
+++ b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethodcommon;
+package org.kelar.inputmethodcommon;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/java/src/com/android/inputmethodcommon/InputMethodSettingsImpl.java b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsImpl.java
index cfa1a6596..6f1b9478f 100644
--- a/java/src/com/android/inputmethodcommon/InputMethodSettingsImpl.java
+++ b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsImpl.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethodcommon;
+package org.kelar.inputmethodcommon;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.TextUtils;
diff --git a/java/src/com/android/inputmethodcommon/InputMethodSettingsInterface.java b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsInterface.java
index 6e97faeb7..fd7a421c0 100644
--- a/java/src/com/android/inputmethodcommon/InputMethodSettingsInterface.java
+++ b/java/src/org/kelar/inputmethodcommon/InputMethodSettingsInterface.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethodcommon;
+package org.kelar.inputmethodcommon;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/native/jni/Android.bp b/native/jni/Android.bp
index ab14632f8..c60133f76 100644
--- a/native/jni/Android.bp
+++ b/native/jni/Android.bp
@@ -143,10 +143,10 @@ cc_library {
     local_include_dirs: ["src"],
 
     srcs: [
-        "com_android_inputmethod_keyboard_ProximityInfo.cpp",
-        "com_android_inputmethod_latin_BinaryDictionary.cpp",
-        "com_android_inputmethod_latin_BinaryDictionaryUtils.cpp",
-        "com_android_inputmethod_latin_DicTraverseSession.cpp",
+        "org_kelar_inputmethod_keyboard_ProximityInfo.cpp",
+        "org_kelar_inputmethod_latin_BinaryDictionary.cpp",
+        "org_kelar_inputmethod_latin_BinaryDictionaryUtils.cpp",
+        "org_kelar_inputmethod_latin_DicTraverseSession.cpp",
         "jni_common.cpp",
 
         ":LATIN_IME_CORE_SRC_FILES",
diff --git a/native/jni/NativeFileList.mk b/native/jni/NativeFileList.mk
index d8b69bfd7..e04cd715f 100644
--- a/native/jni/NativeFileList.mk
+++ b/native/jni/NativeFileList.mk
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 LATIN_IME_JNI_SRC_FILES := \
-    com_android_inputmethod_keyboard_ProximityInfo.cpp \
-    com_android_inputmethod_latin_BinaryDictionary.cpp \
-    com_android_inputmethod_latin_BinaryDictionaryUtils.cpp \
-    com_android_inputmethod_latin_DicTraverseSession.cpp \
+    org_kelar_inputmethod_keyboard_ProximityInfo.cpp \
+    org_kelar_inputmethod_latin_BinaryDictionary.cpp \
+    org_kelar_inputmethod_latin_BinaryDictionaryUtils.cpp \
+    org_kelar_inputmethod_latin_DicTraverseSession.cpp \
     jni_common.cpp
 
 LATIN_IME_CORE_SRC_FILES := \
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp
index ce5e30c5d..a0ae9d1b3 100644
--- a/native/jni/jni_common.cpp
+++ b/native/jni/jni_common.cpp
@@ -18,10 +18,10 @@
 
 #include "jni_common.h"
 
-#include "com_android_inputmethod_keyboard_ProximityInfo.h"
-#include "com_android_inputmethod_latin_BinaryDictionary.h"
-#include "com_android_inputmethod_latin_BinaryDictionaryUtils.h"
-#include "com_android_inputmethod_latin_DicTraverseSession.h"
+#include "org_kelar_inputmethod_keyboard_ProximityInfo.h"
+#include "org_kelar_inputmethod_latin_BinaryDictionary.h"
+#include "org_kelar_inputmethod_latin_BinaryDictionaryUtils.h"
+#include "org_kelar_inputmethod_latin_DicTraverseSession.h"
 #include "defines.h"
 
 /*
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/org_kelar_inputmethod_keyboard_ProximityInfo.cpp
index 80419b335..9cab00422 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/org_kelar_inputmethod_keyboard_ProximityInfo.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "LatinIME: jni: ProximityInfo"
 
-#include "com_android_inputmethod_keyboard_ProximityInfo.h"
+#include "org_kelar_inputmethod_keyboard_ProximityInfo.h"
 
 #include "defines.h"
 #include "jni.h"
@@ -57,7 +57,7 @@ static const JNINativeMethod sMethods[] = {
 };
 
 int register_ProximityInfo(JNIEnv *env) {
-    const char *const kClassPathName = "com/android/inputmethod/keyboard/ProximityInfo";
+    const char *const kClassPathName = "org/kelar/inputmethod/keyboard/ProximityInfo";
     return registerNativeMethods(env, kClassPathName, sMethods, NELEMS(sMethods));
 }
 } // namespace latinime
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h b/native/jni/org_kelar_inputmethod_keyboard_ProximityInfo.h
index c3503c8c3..105e023b1 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.h
+++ b/native/jni/org_kelar_inputmethod_keyboard_ProximityInfo.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef _COM_ANDROID_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
-#define _COM_ANDROID_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
+#ifndef _ORG_KELAR_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
+#define _ORG_KELAR_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
 
 #include "jni.h"
 
 namespace latinime {
 int register_ProximityInfo(JNIEnv *env);
 } // namespace latinime
-#endif // _COM_ANDROID_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
+#endif // _ORG_KELAR_INPUTMETHOD_KEYBOARD_PROXIMITYINFO_H
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/org_kelar_inputmethod_latin_BinaryDictionary.cpp
index 3341e1163..84283bce8 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/org_kelar_inputmethod_latin_BinaryDictionary.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "LatinIME: jni: BinaryDictionary"
 
-#include "com_android_inputmethod_latin_BinaryDictionary.h"
+#include "org_kelar_inputmethod_latin_BinaryDictionary.h"
 
 #include <cstring> // for memset()
 #include <vector>
@@ -717,7 +717,7 @@ static const JNINativeMethod sMethods[] = {
     {
         const_cast<char *>("updateEntriesForInputEventsNative"),
         const_cast<char *>(
-                "(J[Lcom/android/inputmethod/latin/utils/WordInputEventForPersonalization;I)I"),
+                "(J[Lorg/kelar/inputmethod/latin/utils/WordInputEventForPersonalization;I)I"),
         reinterpret_cast<void *>(latinime_BinaryDictionary_updateEntriesForInputEvents)
     },
     {
@@ -738,7 +738,7 @@ static const JNINativeMethod sMethods[] = {
 };
 
 int register_BinaryDictionary(JNIEnv *env) {
-    const char *const kClassPathName = "com/android/inputmethod/latin/BinaryDictionary";
+    const char *const kClassPathName = "org/kelar/inputmethod/latin/BinaryDictionary";
     return registerNativeMethods(env, kClassPathName, sMethods, NELEMS(sMethods));
 }
 } // namespace latinime
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.h b/native/jni/org_kelar_inputmethod_latin_BinaryDictionary.h
index 2a07f9936..3710517e1 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.h
+++ b/native/jni/org_kelar_inputmethod_latin_BinaryDictionary.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
-#define _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
+#ifndef _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
+#define _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
 
 #include "jni.h"
 
 namespace latinime {
 int register_BinaryDictionary(JNIEnv *env);
 } // namespace latinime
-#endif // _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
+#endif // _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARY_H
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp b/native/jni/org_kelar_inputmethod_latin_BinaryDictionaryUtils.cpp
index 0885f2de9..0ce65605c 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp
+++ b/native/jni/org_kelar_inputmethod_latin_BinaryDictionaryUtils.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "LatinIME: jni: BinaryDictionaryUtils"
 
-#include "com_android_inputmethod_latin_BinaryDictionaryUtils.h"
+#include "org_kelar_inputmethod_latin_BinaryDictionaryUtils.h"
 
 #include "defines.h"
 #include "dictionary/utils/dict_file_writing_utils.h"
@@ -99,7 +99,7 @@ static const JNINativeMethod sMethods[] = {
 };
 
 int register_BinaryDictionaryUtils(JNIEnv *env) {
-    const char *const kClassPathName = "com/android/inputmethod/latin/utils/BinaryDictionaryUtils";
+    const char *const kClassPathName = "org/kelar/inputmethod/latin/utils/BinaryDictionaryUtils";
     return registerNativeMethods(env, kClassPathName, sMethods, NELEMS(sMethods));
 }
 } // namespace latinime
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.h b/native/jni/org_kelar_inputmethod_latin_BinaryDictionaryUtils.h
index 38edcd20c..351c04476 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.h
+++ b/native/jni/org_kelar_inputmethod_latin_BinaryDictionaryUtils.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
-#define _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
+#ifndef _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
+#define _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
 
 #include "jni.h"
 
 namespace latinime {
 int register_BinaryDictionaryUtils(JNIEnv *env);
 } // namespace latinime
-#endif // _COM_ANDROID_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
+#endif // _ORG_KELAR_INPUTMETHOD_LATIN_BINARYDICTIONARYUTILS_H
diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/org_kelar_inputmethod_latin_DicTraverseSession.cpp
index 45f5492b1..edb9f41c6 100644
--- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp
+++ b/native/jni/org_kelar_inputmethod_latin_DicTraverseSession.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "LatinIME: jni: Session"
 
-#include "com_android_inputmethod_latin_DicTraverseSession.h"
+#include "org_kelar_inputmethod_latin_DicTraverseSession.h"
 
 #include "defines.h"
 #include "dictionary/property/ngram_context.h"
@@ -74,7 +74,7 @@ static const JNINativeMethod sMethods[] = {
 };
 
 int register_DicTraverseSession(JNIEnv *env) {
-    const char *const kClassPathName = "com/android/inputmethod/latin/DicTraverseSession";
+    const char *const kClassPathName = "org/kelar/inputmethod/latin/DicTraverseSession";
     return registerNativeMethods(env, kClassPathName, sMethods, NELEMS(sMethods));
 }
 } // namespace latinime
diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.h b/native/jni/org_kelar_inputmethod_latin_DicTraverseSession.h
index badcbb9ea..4fee8f78b 100644
--- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.h
+++ b/native/jni/org_kelar_inputmethod_latin_DicTraverseSession.h
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
-#define _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
+#ifndef _ORG_KELAR_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
+#define _ORG_KELAR_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
 
 #include "jni.h"
 
 namespace latinime {
 int register_DicTraverseSession(JNIEnv *env);
 } // namespace latinime
-#endif // _COM_ANDROID_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
+#endif // _ORG_KELAR_INPUTMETHOD_LATIN_DICTRAVERSESESSION_H
diff --git a/native/jni/src/suggest/core/suggest_options.h b/native/jni/src/suggest/core/suggest_options.h
index 4d331292b..69ca3b96a 100644
--- a/native/jni/src/suggest/core/suggest_options.h
+++ b/native/jni/src/suggest/core/suggest_options.h
@@ -55,7 +55,7 @@ class SuggestOptions{
  private:
     DISALLOW_IMPLICIT_CONSTRUCTORS(SuggestOptions);
 
-    // Need to update com.android.inputmethod.latin.NativeSuggestOptions when you add, remove or
+    // Need to update org.kelar.inputmethod.latin.NativeSuggestOptions when you add, remove or
     // reorder options.
     static const int IS_GESTURE = 0;
     static const int USE_FULL_EDIT_DISTANCE = 1;
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 47d961166..3c4035074 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -28,7 +28,7 @@
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.inputmethod.latin"
+        android:targetPackage="org.kelar.inputmethod.latin"
         android:label="LatinIME tests">
     </instrumentation>
 </manifest>
diff --git a/tests/AndroidManifest_SdkVersion.xml b/tests/AndroidManifest_SdkVersion.xml
index 7bd3212a8..b00e8c627 100644
--- a/tests/AndroidManifest_SdkVersion.xml
+++ b/tests/AndroidManifest_SdkVersion.xml
@@ -15,6 +15,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.inputmethod.latin.tests">
+    package="org.kelar.inputmethod.latin.tests">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 </manifest>
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 60e9a01e9..fe8378319 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -33,7 +33,7 @@
 
     <option name="test-tag" value="LatinIMETests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="com.android.inputmethod.latin.tests" />
+        <option name="package" value="org.kelar.inputmethod.latin.tests" />
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
     </test>
diff --git a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java b/tests/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtilsTests.java
index 6203238b8..44aae0282 100644
--- a/tests/src/com/android/inputmethod/compat/LocaleSpanCompatUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/compat/LocaleSpanCompatUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java b/tests/src/org/kelar/inputmethod/compat/SuggestionSpanUtilsTest.java
index e3fb30dbb..d9fe690ac 100644
--- a/tests/src/com/android/inputmethod/compat/SuggestionSpanUtilsTest.java
+++ b/tests/src/org/kelar/inputmethod/compat/SuggestionSpanUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -30,8 +30,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/compat/TextInfoCompatUtilsTests.java b/tests/src/org/kelar/inputmethod/compat/TextInfoCompatUtilsTests.java
index d4dbfd4c6..9b2ab94ee 100644
--- a/tests/src/com/android/inputmethod/compat/TextInfoCompatUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/compat/TextInfoCompatUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.compat;
+package org.kelar.inputmethod.compat;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
index 21333b0a0..5ba44c73e 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysBase.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
index 36c217989..c257e3dee 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
index bb7a247db..fadbba0fd 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysLxxTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
 
 @SmallTest
 public class KeyboardLayoutSetNavigateMoreKeysLxxTests
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
index 1f13b4106..122caea85 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,16 +24,16 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet.Builder;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.ResourceUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet.Builder;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.ResourceUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutTest.java
index ddace1a38..eb0754a60 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutTest.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardLayoutTest.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/org/kelar/inputmethod/keyboard/KeyboardThemeTests.java
index 2f8140e23..ffc5cc9ed 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/KeyboardThemeTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;
-import static com.android.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;
+import static org.kelar.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
index 90963d4ca..15d594daa 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderAutoOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
index 3c5c298f6..2184ef63e 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
index 1d28c2295..85a49f80c 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/MoreKeysKeyboardBuilderMaxOrderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
+import org.kelar.inputmethod.keyboard.MoreKeysKeyboard.MoreKeysKeyboardParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/keyboard/action/ActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/ActionTestsBase.java
index 1ea68e471..77ec4cee3 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/ActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/ActionTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,17 +22,17 @@ import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyVisual;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyVisual;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionCustomTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionCustomTests.java
index e67a53162..e8257cc9f 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionCustomTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionCustomTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionCustomTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionDoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionDoneTests.java
index 33543e173..557590041 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionDoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionDoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionDoneTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionGoTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionGoTests.java
index 171581467..f77a4d38f 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionGoTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionGoTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionGoTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionLabelTests.java
index 7fe620970..8297764c2 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionLabelTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionLabelTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.content.res.Resources;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.MediumTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardTextsSet;
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.KeyboardTextsSet;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNextTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNextTests.java
index b9ec446da..47170f062 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNextTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNextTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionNextTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNoneTests.java
index 9f28395fc..09178bea9 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionNoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionNoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionNoneTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionPreviousTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionPreviousTests.java
index 7b71f7469..d779b2838 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionPreviousTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionPreviousTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionPreviousTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSearchTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSearchTests.java
index 6a10d6709..2a2b6ab44 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSearchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSearchTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionSearchTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSendTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSendTests.java
index 5b49ac170..5a0c7de48 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionSendTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionSendTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionSendTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionTestsBase.java
index 511f9950b..61156ebce 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionTestsBase.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
index b3944cdcb..11039bb29 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/KlpActionUnspecifiedTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class KlpActionUnspecifiedTests extends KlpActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionCustomTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionCustomTests.java
index e892bc9fb..fd958b2c0 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionCustomTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionCustomTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionCustomTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionDoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionDoneTests.java
index 587d30b1f..d09a514a4 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionDoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionDoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionDoneTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionGoTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionGoTests.java
index 3bce6ff0a..c000f2154 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionGoTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionGoTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionGoTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNextTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNextTests.java
index 392ebd3ed..576fcde84 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNextTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNextTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionNextTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNoneTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNoneTests.java
index d0cff8a8b..07b7d01e3 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionNoneTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionNoneTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionNoneTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionPreviousTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionPreviousTests.java
index 023e024eb..eb9ecd10a 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionPreviousTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionPreviousTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionPreviousTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSearchTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSearchTests.java
index 51988bbef..86b915ff8 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSearchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSearchTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionSearchTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSendTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSendTests.java
index ab330f3b7..8c57243ea 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionSendTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionSendTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionSendTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionTestsBase.java
index 70de9a6b8..4e9fbcb4a 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionTestsBase.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
-import com.android.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
 
 abstract class LxxActionTestsBase extends ActionTestsBase {
     @Override
diff --git a/tests/src/com/android/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
index d0fe454f1..264e8951d 100644
--- a/tests/src/com/android/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/action/LxxActionUnspecifiedTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.action;
+package org.kelar.inputmethod.keyboard.action;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 @LargeTest
 public class LxxActionUnspecifiedTests extends LxxActionTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/HermiteInterpolatorTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
index a1ee199c0..f23fb8d3f 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/HermiteInterpolatorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTests.java
index 10537096a..1d3ceaf63 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @SmallTest
 public final class KeySpecParserTests extends KeySpecParserTestsBase {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
index 79cf10e84..8bf344c92 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardCodesSet.PREFIX_CODE;
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.PREFIX_ICON;
-import static com.android.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardCodesSet.PREFIX_CODE;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.PREFIX_ICON;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_OUTPUT_TEXT;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import android.test.AndroidTestCase;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
index 8f1869f5b..202718bbb 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
index 88efe12b9..f1621ebb0 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateSingleTouchTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import androidx.test.filters.SmallTest;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
index 1474c8d27..016578ce6 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.test.AndroidTestCase;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 public class KeyboardStateTestsBase extends AndroidTestCase
         implements MockKeyboardSwitcher.MockConstants {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSetTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
index f312cadae..34a16cfb7 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsSetTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -27,8 +27,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MatrixUtilsTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MatrixUtilsTests.java
index 10c552f29..2c7d986c9 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MatrixUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MatrixUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
+import org.kelar.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class MatrixUtilsTests {
-    // "run tests" -c com.android.inputmethod.keyboard.internal.MatrixUtilsTests
+    // "run tests" -c org.kelar.inputmethod.keyboard.internal.MatrixUtilsTests
     private static final boolean DEBUG = false;
     private static final float EPSILON = 0.00001f;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
index 4b2ec9588..197652783 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MockKeyboardSwitcher.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import android.text.TextUtils;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.RecapitalizeStatus;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.RecapitalizeStatus;
 
 public class MockKeyboardSwitcher implements KeyboardState.SwitchActions {
     public interface MockConstants {
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
index cbedd0426..ca7c96a38 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecSplitTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -26,7 +26,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.R;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
index e31efe427..0faf9cdc9 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecStringReferenceTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -27,7 +27,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-//import com.android.inputmethod.latin.tests.R;
+import org.kelar.inputmethod.latin.tests.R;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,9 +46,8 @@ public class MoreKeySpecStringReferenceTests {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         final Context testContext = instrumentation.getContext();
         final Resources testRes = testContext.getResources();
-        // final String testPackageName = testRes.getResourcePackageName(R.string.empty_string);
-        // mTextsSet.setLocale(TEST_LOCALE, testRes, testPackageName);
-        mTextsSet.setLocale(TEST_LOCALE, testRes, "");
+        final String testPackageName = testRes.getResourcePackageName(R.string.empty_string);
+        mTextsSet.setLocale(TEST_LOCALE, testRes, testPackageName);
     }
 
     private void assertTextArray(final String message, final String value,
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecTests.java
index 4c6504588..b56308f5d 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/MoreKeySpecTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
-import static com.android.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
-import static com.android.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
+import static org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet.ICON_UNDEFINED;
+import static org.kelar.inputmethod.latin.common.Constants.CODE_UNSPECIFIED;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueueTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
index 6ab1549c0..e491ca955 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/PointerTrackerQueueTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/SmoothingUtilsTests.java b/tests/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtilsTests.java
index 39da3ec71..4de2dda81 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/SmoothingUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/internal/SmoothingUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
+import org.kelar.inputmethod.keyboard.internal.MatrixUtils.MatrixOperationFailedException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class SmoothingUtilsTests {
-    // "run tests" -c com.android.inputmethod.keyboard.internal.SmoothingUtilsTests
+    // "run tests" -c org.kelar.inputmethod.keyboard.internal.SmoothingUtilsTests
     private static final boolean DEBUG = false;
 
     @Test
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Arabic.java
index ff05f92c2..c0d267a0a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Arabic.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/ArmenianPhonetic.java
index cbbeff4a7..94a5bf40c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/ArmenianPhonetic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/ArmenianPhonetic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Azerty.java
index f3176d09d..c7df7eb9f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Azerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Azerty.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The AZERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Bengali.java
index 339cab444..fa62ffc30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Bengali.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Bengali keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/BengaliAkkhor.java b/tests/src/org/kelar/inputmethod/keyboard/layout/BengaliAkkhor.java
index bb1dc10fb..765c698f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/BengaliAkkhor.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/BengaliAkkhor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Bengali Akkhor keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Bulgarian.java
index bbe038414..99c15d281 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Bulgarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Bulgarian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java b/tests/src/org/kelar/inputmethod/keyboard/layout/BulgarianBds.java
index 74372b9bc..cba635e75 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/BulgarianBds.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/BulgarianBds.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Colemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Colemak.java
index 3f8ce28eb..fa64f80e3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Colemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Colemak.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Colemak alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/DevanagariLetterConstants.java b/tests/src/org/kelar/inputmethod/keyboard/layout/DevanagariLetterConstants.java
index bcf06f085..1d2f7f46d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/DevanagariLetterConstants.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/DevanagariLetterConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
 import android.os.Build;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Dvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Dvorak.java
index 7cb3b92a7..9795427de 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Dvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Dvorak.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Dvorak alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/EastSlavic.java
index f95d2d20e..e4bbcc24f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/EastSlavic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/EastSlavic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class EastSlavic extends LayoutBase {
     private static final String LAYOUT_NAME = "east_slavic";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Farsi.java
index 6dc4559dc..d942600e0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Farsi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Farsi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Georgian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Georgian.java
index d1ac5fd6e..e658e1ca0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Georgian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Georgian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Greek.java
index 0209c2ae1..e646fc663 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Greek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Greek.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Hebrew.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Hebrew.java
index 1b91b47ae..5adb50ddc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Hebrew.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Hebrew.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
-
-import com.android.inputmethod.keyboard.layout.Symbols.RtlSymbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+package org.kelar.inputmethod.keyboard.layout;
+
+import org.kelar.inputmethod.keyboard.layout.Symbols.RtlSymbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted.RtlSymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Hindi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Hindi.java
index 82f67aca2..25021e72d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Hindi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Hindi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Hindi keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/HindiCompact.java b/tests/src/org/kelar/inputmethod/keyboard/layout/HindiCompact.java
index a2e339919..253447dfe 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/HindiCompact.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/HindiCompact.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.HindiCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.HindiCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Kannada.java
index 5a8d32cb8..b7e843314 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Kannada.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Khmer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Khmer.java
index 4d82f090b..aff10226c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Khmer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Khmer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Lao.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Lao.java
index 149f75397..d3c3d0ccc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Lao.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Lao.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/LayoutBase.java
index 285a50ce9..620e0a442 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/LayoutBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/LayoutBase.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Malayalam.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Malayalam.java
index 3497c356f..714955f30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Malayalam.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Malayalam.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Marathi.java
index af26ec555..85b2c2501 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Marathi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Marathi.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.DevanagariCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.DevanagariCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Mongolian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Mongolian.java
index 288a17e10..e616cc931 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Mongolian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Mongolian.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/NepaliRomanized.java b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliRomanized.java
index 299cb61b2..ed4719a24 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/NepaliRomanized.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliRomanized.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/NepaliTraditional.java b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliTraditional.java
index 0a2bea342..c6282460e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/NepaliTraditional.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/NepaliTraditional.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import static com.android.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
+import static org.kelar.inputmethod.keyboard.layout.DevanagariLetterConstants.*;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Hindi.HindiSymbols;
-import com.android.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Hindi.HindiSymbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.NepaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Nordic.java
index 4f718e64f..303c55bee 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Nordic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Nordic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Nordic alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/PcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/PcQwerty.java
index 0085ac6a8..1fdd28e16 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/PcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/PcQwerty.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The PC QWERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwerty.java
index 508df0c17..fc535e032 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwerty.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The QWERTY alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwertz.java
index cc41fbf20..74f3d0c77 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Qwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Qwertz.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Qwertz extends LayoutBase {
     private static final String LAYOUT_NAME = "qwertz";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SerbianQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SerbianQwertz.java
index a4936288a..f2a00fc81 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SerbianQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SerbianQwertz.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class SerbianQwertz extends LayoutBase {
     private static final String LAYOUT_NAME = "serbian_qwertz";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Sinhala.java
index c3a9351f7..433c0ea93 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Sinhala.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SouthSlavic.java
index ad8278754..503af359c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SouthSlavic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SouthSlavic.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class SouthSlavic extends LayoutBase {
     private static final String LAYOUT_NAME = "south_slavic";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Spanish.java
index fc6f1ea95..a5ac6bd71 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Spanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Spanish.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Spanish extends LayoutBase {
     private static final String LAYOUT_NAME = "spanish";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Swiss.java
index 57e3725a5..6ab08d0b3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Swiss.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Swiss.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 public final class Swiss extends LayoutBase {
     private static final String LAYOUT_NAME = "swiss";
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Symbols.java
index 7ad7b5442..e9d934283 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Symbols.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Symbols.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The symbols keyboard layout.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java b/tests/src/org/kelar/inputmethod/keyboard/layout/SymbolsShifted.java
index 64262167d..f106ffb7f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/SymbolsShifted.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/SymbolsShifted.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
 
 /**
  * The symbols shifted keyboard layout.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Tamil.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Tamil.java
index 1413e366a..db6bbde1a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Tamil.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Tamil.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Tamil keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Telugu.java
index 81437f3ac..370f21eb3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Telugu.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Telugu.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Thai.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Thai.java
index ce5fd8068..f19d44f8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Thai.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Thai.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Uzbek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/Uzbek.java
index f37fd2241..dcee48857 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Uzbek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/Uzbek.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout;
+package org.kelar.inputmethod.keyboard.layout;
 
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 /**
  * The Uzbek alphabet keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
index f13c26114..b9faf5ea6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/BengaliCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DanishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
index 3d91194f2..c7ec65fb3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DanishCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
index 13f9171d4..4308fac31 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DevanagariCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DutchCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
index 825afb64b..fc7729562 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DutchCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
index b7b018793..815e19680 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/DvorakCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
index 8815b068c..1cf087a09 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EastSlavicCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
index 9a9c6bb2f..75454f2b7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EnglishCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
index a7d611a3e..91c10405a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EstonianEECustomizer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EuroCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
index ee0236d88..162843a7e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/EuroCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
index a792f9143..e70251df7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FinnishCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
index d7798cc56..b78ce4fb1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/FrenchCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/GermanCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
index e0e4c78b1..3cc165b39 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/GermanCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/HindiCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
index c7fe9dbd5..6023fe709 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/HindiCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
index 3b547fdc4..6b04af939 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/ItalianCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
index 27f55342e..ffac507d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/LayoutCustomizer.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
index 264322f54..aa557ba5b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NepaliCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
index b6bf5bfeb..2581b67bb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NoLanguageCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
index 6cc44e578..02dd48dc0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/NorwegianCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
index 9a0f764ae..03d72a485 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PcQwertyCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
index 4fc64cc62..253b63e2f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/PortugueseCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
index 4d03c8ba6..ef075c264 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SerbianLatinCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.SerbianQwertz;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.SerbianQwertz;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
index bec816000..bfe5913f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SouthSlavicLayoutCustomizer.java
@@ -15,10 +15,10 @@
  */
 
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
index 1284f054e..400481c14 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SpanishCustomizer.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
index f4ff59458..325f94f97 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/SwedishCustomizer.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TamilCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
index de82aaf9e..13da88037 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TamilCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
index 3fd3aa219..6789a6e95 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/TurkicCustomizer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
index 99486163e..08dd3fd25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/customizer/UzbekCustomizer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.customizer;
+package org.kelar.inputmethod.keyboard.layout.customizer;
 
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
index 6e721047c..0ed74eb25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractKeyboardBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
 import java.util.Arrays;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index 2232548eb..dba595ab5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.latin.common.Constants;
 
 /**
  * Base class to create an expected keyboard for unit test.
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
index 2a040f564..779cc0b6c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ActualKeyboardBuilder.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKey.java
index 5c147a3b6..aeec19dde 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKey.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKey.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
index e2b98bc69..fbfdc7403 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
index 3f9f12a2b..bdd939b1e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.MoreKeySpec;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.internal.KeyboardIconsSet;
+import org.kelar.inputmethod.keyboard.internal.MoreKeySpec;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
index f5531c9e3..9da1ac4df 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/expected/ExpectedKeyboardBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.expected;
+package org.kelar.inputmethod.keyboard.layout.expected;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
index cc8d5d1e5..c2fc8dff2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
index 27519ee93..2e8f4d3e8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.util.Log;
 import android.view.inputmethod.InputMethodSubtype;
 
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
-import com.android.inputmethod.keyboard.KeyboardTheme;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
-import com.android.inputmethod.keyboard.layout.expected.ActualKeyboardBuilder;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSetTestsBase;
+import org.kelar.inputmethod.keyboard.KeyboardTheme;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.AbstractLayoutBase;
+import org.kelar.inputmethod.keyboard.layout.expected.ActualKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey.ExpectedAdditionalMoreKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Arrays;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
index 5f1d7ed53..8bc2b3dcc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAfrikaans.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArabic.java
index 204579a49..ae489eca3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArabic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Arabic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Arabic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
index 441aa402a..bc5b6bfa1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsArmenianAMPhonetic.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.ArmenianPhonetic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.ArmenianPhonetic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
index 39f9c9a6b..dabf419bb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsAzerbaijaniAZ.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBasqueES.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBasqueES.java
index 934efc3e7..8ca34122e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBasqueES.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBasqueES.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
index e3c9357c0..cc7f31994 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBelarusianBY.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
index be4f2ef34..af63d113a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliBD.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.BengaliAkkhor;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.BengaliAkkhor;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
index c2b090b60..8a4570e01 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBengaliIN.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Bengali;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.Bengali;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.BengaliCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarian.java
index 8787d5a00..9ce1906d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Bulgarian;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Bulgarian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
index 2e322400b..651b5414c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsBulgarianBds.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.BulgarianBds;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.BulgarianBds;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCatalan.java
index 8527180e8..57515cb74 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCatalan.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCatalan.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCroatian.java
index 33f4f10f2..ca96dc892 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCroatian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCroatian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCzech.java
index 44c97f309..2b7a5253a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsCzech.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsCzech.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanish.java
index 22eeb9e60..ca18e31f4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.DanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.DanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
index b90ab0536..019f5dc89 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDanishQwertz.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.DanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.DanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutch.java
index 4bd29130c..281cb1858 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutch.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutch.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.DutchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.DutchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutchBE.java
index 22f6327e4..9e66d6884 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDutchBE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDutchBE.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Azerty;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DutchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Azerty;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DutchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
index 5482b0ca9..72a093fb0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakEmail.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
index 97411e2ac..e0d8989cf 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsDvorakUrl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,13 +22,13 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardId;
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardId;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
index fdb32f0cb..4ce4a4ecc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishDvorak.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer.EnglishDvorakCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
index 52e49a369..85c54b693 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishIN.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
index 202887a70..648ca3879 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUK.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
index 25f68c00f..72f57db8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEnglishUS.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEsperanto.java
index 5158dca5e..de34b7a38 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEsperanto.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEsperanto.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
index 0deafb19c..2a0f636de 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEE.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
index 85ee81736..1727523da 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsEstonianEEQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EstonianEECustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnish.java
index db167d2c9..329c22ac8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
index 571377cff..5aeade2dd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFinnishQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.FinnishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrench.java
index 6485c2ca7..b8f5331b7 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrench.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrench.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Azerty;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Azerty;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
index 13134f53e..59092d344 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCA.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
index 4ad7a48b9..1bd896cae 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
index f3d0f02f6..2d04239b3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchDvorak.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
index 75818c02c..a6ab73174 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsFrenchQwertz.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.FrenchCustomizer.FrenchEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGalicianES.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGalicianES.java
index e953e2f43..6c7a0e1e4 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGalicianES.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGalicianES.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
index 237c3f67e..db278e91e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGeorgianGE.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Georgian;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Georgian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGerman.java
index 0eee72a20..dc4c65e2c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGerman.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGerman.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanCH.java
index b7bae4c8d..756c7a77c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
index e699ccd7c..0da8eb4ef 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanDvorak.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
index 77f31a28e..33bf2df25 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGermanQwerty.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.GermanCustomizer.GermanEuroCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGreek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGreek.java
index eee1b96a6..5c8e8e6d1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsGreek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsGreek.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Greek;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Greek;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHebrew.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHebrew.java
index e09b5188d..eb31e4e12 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHebrew.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHebrew.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Hebrew;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Hebrew;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindi.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindi.java
index 2f63ecc07..b67cf0f1c 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindi.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindi.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Hindi;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.HindiCustomizer;
+import org.kelar.inputmethod.keyboard.layout.Hindi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.HindiCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
index 7f0178004..a70cf7c6f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHindiCompact.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.HindiCompact;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.HindiCompact;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHinglish.java
index 7c1441f11..7b6563001 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHinglish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHinglish.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHungarian.java
index 7c2d023ed..f3536e122 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHungarian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsHungarian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwertz;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwertz;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIcelandic.java
index b6970b94a..76a039f87 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIcelandic.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIcelandic.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIndonesian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIndonesian.java
index 3e2f4035d..0c122fddd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsIndonesian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsIndonesian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalian.java
index 9395c7947..4f727f140 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalian.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalianCH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalianCH.java
index f4a9f9f96..ff7c04620 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsItalianCH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsItalianCH.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Swiss;
-import com.android.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Swiss;
+import org.kelar.inputmethod.keyboard.layout.customizer.ItalianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
index f0a2546fd..3f5169444 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKannadaIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Kannada;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Kannada;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKazakh.java
index 227361140..92797d005 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKazakh.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKazakh.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKhmerKH.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
index 36583b55f..9e28a1bf2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKhmerKH.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Khmer;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Khmer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
index d301dd459..a60801cb5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsKyrgyz.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLaoLA.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLaoLA.java
index 172ea6ae4..b6d06baf3 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLaoLA.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLaoLA.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Lao;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Lao;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLatvian.java
index 2051bae6d..873a42ec5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLatvian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLatvian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLithuanian.java
index 99e6af51c..6c9797ccb 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsLithuanian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsLithuanian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMacedonian.java
index 0ee8d3c63..5970c15e5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMacedonian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMacedonian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SouthSlavic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SouthSlavic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayMY.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayMY.java
index d2053509e..6aa2a13ea 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayMY.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayMY.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
index 0e0f2d2e8..4ab784650 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMalayalamIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Malayalam;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Malayalam;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
index 7b2bdc6da..e0ff90742 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMarathiIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Marathi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Marathi;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMongolianMN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
index 3fa9ec680..0c94f6ec9 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsMongolianMN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Mongolian;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Mongolian;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
index 1e2ebd709..ae57bec7a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliRomanized.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.NepaliRomanized;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.NepaliRomanized;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
index ec5f10e28..17dee2b61 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNepaliTraditional.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.NepaliTraditional;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.NepaliTraditional;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
index cd43d37ef..09953ceed 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguage.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
index af646a05f..25577eb92 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageColemak.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Colemak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Colemak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
index b93b6f0eb..078f2a231 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguageDvorak.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Dvorak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Dvorak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.DvorakCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
index 308e911d2..ac5b5b571 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNoLanguagePcQwerty.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.PcQwerty;
-import com.android.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.PcQwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.NoLanguageCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegian.java
index 2f869b626..077af6daa 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegian.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
index 81ae26f28..10214573a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsNorwegianColemak.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Colemak;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.Colemak;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.customizer.NorwegianCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPersian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPersian.java
index 0817853a5..fb45a264e 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPersian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPersian.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.Farsi;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Farsi;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPolish.java
index 3b813acaf..e9fb37354 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPolish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPolish.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
index aaf75ea21..9dc5f2cf6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortugueseBR.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
index 2b91225da..44c0afa30 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsPortuguesePT.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PortugueseCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
index 5e1891e86..a30dccaed 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyEmail.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,11 +22,11 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
index 4fa9925ec..8e9897df0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsQwertyUrl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.text.InputType;
 import android.view.inputmethod.EditorInfo;
@@ -22,11 +22,11 @@ import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRomanian.java
index be386cbca..fed99b1d9 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRomanian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRomanian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRussian.java
index aedf78d43..57f2d7bd0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsRussian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsRussian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbian.java
index a30614e9c..cfbbcd9e1 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SouthSlavic;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SouthSlavic;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.SouthSlavicLayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
index dfed265b6..facef7aa8 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatin.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.SerbianQwertz;
-import com.android.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.SerbianQwertz;
+import org.kelar.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
index 205e8d61b..c4b9f5595 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSerbianLatinQwerty.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.SerbianLatinCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
index bfea4fbeb..c615f3bde 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSinhalaLK.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Sinhala;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Sinhala;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovak.java
index 449df3721..83ce1874d 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovak.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovak.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovenian.java
index 0b63bd935..6c7a4e7f2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSlovenian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSlovenian.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish.java
index 973669ceb..6ce6f22c0 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish419.java
index d91a94f99..f37ad0052 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanish419.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanish419.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
index f9936f767..eb9d80bdf 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSpanishUS.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
index a69a35701..75385f643 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSplitLayoutQwertyEnglishUS.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodSubtype;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.KeyboardLayoutSet;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.KeyboardLayoutSet;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwahili.java
index de01c8e40..1ef382572 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwahili.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwahili.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedish.java
index 931c8bc48..faf9be6dc 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedish.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Nordic;
-import com.android.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Nordic;
+import org.kelar.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
index b2b0895b6..b1cb06d60 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsSwedishPcQwerty.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.PcQwerty;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.PcQwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.PcQwertyCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.SwedishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTagalog.java
index b75c8823e..bd4956b8f 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTagalog.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTagalog.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Spanish;
-import com.android.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Spanish;
+import org.kelar.inputmethod.keyboard.layout.customizer.SpanishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilIN.java
index e90542be6..02656aea2 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilIN.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilLK.java
index f26e2f0f0..dc3c16cee 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilLK.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilLK.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.Suppress;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilSG.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilSG.java
index aa14e2f82..8bd34fbfd 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTamilSG.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTamilSG.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Tamil;
-import com.android.inputmethod.keyboard.layout.customizer.TamilCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Tamil;
+import org.kelar.inputmethod.keyboard.layout.customizer.TamilCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
index 096207aba..eda1895f6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTeluguIN.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Telugu;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Telugu;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsThai.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsThai.java
index a7dd1c779..95475956a 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsThai.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsThai.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Thai;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Thai;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTurkish.java
index 0df877296..511dca380 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsTurkish.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsTurkish.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EuroCustomizer;
-import com.android.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EuroCustomizer;
+import org.kelar.inputmethod.keyboard.layout.customizer.TurkicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUkrainian.java
index 7f79765f6..60fc97f29 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUkrainian.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUkrainian.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.EastSlavic;
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.EastSlavic;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.EastSlavicCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbek.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbek.java
index 3c2eef6b4..ad9ab8762 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbek.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbek.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Uzbek;
-import com.android.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Uzbek;
+import org.kelar.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
index becd45c0c..e795a5ed6 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsUzbekQwerty.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.UzbekCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsVietnamese.java
index 56807d039..91e50dfd5 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsVietnamese.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsVietnamese.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.Symbols;
-import com.android.inputmethod.keyboard.layout.SymbolsShifted;
-import com.android.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKey;
-import com.android.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.Symbols;
+import org.kelar.inputmethod.keyboard.layout.SymbolsShifted;
+import org.kelar.inputmethod.keyboard.layout.customizer.LayoutCustomizer;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKey;
+import org.kelar.inputmethod.keyboard.layout.expected.ExpectedKeyboardBuilder;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsZulu.java
index 5ea9568e7..d745d9956 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsZulu.java
+++ b/tests/src/org/kelar/inputmethod/keyboard/layout/tests/TestsZulu.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.layout.tests;
+package org.kelar.inputmethod.keyboard.layout.tests;
 
 import androidx.test.filters.SmallTest;
 
-import com.android.inputmethod.keyboard.layout.LayoutBase;
-import com.android.inputmethod.keyboard.layout.Qwerty;
-import com.android.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
+import org.kelar.inputmethod.keyboard.layout.LayoutBase;
+import org.kelar.inputmethod.keyboard.layout.Qwerty;
+import org.kelar.inputmethod.keyboard.layout.customizer.EnglishCustomizer;
 
 import java.util.Locale;
 
diff --git a/tests/src/com/android/inputmethod/latin/AppWorkaroundsTests.java b/tests/src/org/kelar/inputmethod/latin/AppWorkaroundsTests.java
index 59494481e..038b38735 100644
--- a/tests/src/com/android/inputmethod/latin/AppWorkaroundsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/AppWorkaroundsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -23,7 +23,7 @@ import android.view.inputmethod.EditorInfo;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 @LargeTest
 public class AppWorkaroundsTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/org/kelar/inputmethod/latin/BinaryDictionaryTests.java
index db8b80949..a44c0bce7 100644
--- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/BinaryDictionaryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,14 +28,14 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java b/tests/src/org/kelar/inputmethod/latin/BlueUnderlineTests.java
index d84c0df71..7835f4497 100644
--- a/tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/BlueUnderlineTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.style.SuggestionSpan;
 import android.text.style.UnderlineSpan;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class BlueUnderlineTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsContentObserverTest.java
index 029e1b506..8e21324cb 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsContentObserverTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsDictionaryUtilsTest.java
index a00c9dfdd..79f13a979 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsDictionaryUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/ContactsManagerTest.java b/tests/src/org/kelar/inputmethod/latin/ContactsManagerTest.java
index d3d746df5..d912ec266 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsManagerTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/ContactsManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,9 +35,6 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.ContactsDictionaryConstants;
-import com.android.inputmethod.latin.ContactsManager;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java b/tests/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
index f8130f33c..ed9928a65 100644
--- a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTests.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTests.java
index 10c133f4b..689ee88bb 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static android.test.MoreAsserts.assertNotEqual;
 
@@ -23,9 +23,9 @@ import android.view.inputmethod.BaseInputConnection;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.settings.Settings;
 
 @LargeTest
 public class InputLogicTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsDeadKeys.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsDeadKeys.java
index b3a5f73cc..0c4662b1f 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTestsDeadKeys.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsDeadKeys.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
index c9627f41d..9b4e661be 100644
--- a/tests/src/com/android/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputLogicTestsLanguageWithoutSpaces.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.view.inputmethod.BaseInputConnection;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class InputLogicTestsLanguageWithoutSpaces extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/InputTestsBase.java b/tests/src/org/kelar/inputmethod/latin/InputTestsBase.java
index dead53da2..e57b6823f 100644
--- a/tests/src/com/android/inputmethod/latin/InputTestsBase.java
+++ b/tests/src/org/kelar/inputmethod/latin/InputTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -36,19 +36,19 @@ import android.view.inputmethod.InputMethodSubtype;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
-import com.android.inputmethod.event.Event;
-import com.android.inputmethod.keyboard.Key;
-import com.android.inputmethod.keyboard.Keyboard;
-import com.android.inputmethod.latin.Dictionary.PhonyDictionary;
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.InputPointers;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.settings.DebugSettings;
-import com.android.inputmethod.latin.settings.Settings;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.event.Event;
+import org.kelar.inputmethod.keyboard.Key;
+import org.kelar.inputmethod.keyboard.Keyboard;
+import org.kelar.inputmethod.latin.Dictionary.PhonyDictionary;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.InputPointers;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.settings.DebugSettings;
+import org.kelar.inputmethod.latin.settings.Settings;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/src/com/android/inputmethod/latin/LatinIMEForTests.java b/tests/src/org/kelar/inputmethod/latin/LatinIMEForTests.java
index 035c8d7ce..f9e975556 100644
--- a/tests/src/com/android/inputmethod/latin/LatinIMEForTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinIMEForTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 public class LatinIMEForTests extends LatinIME {
     @Override
diff --git a/tests/src/com/android/inputmethod/latin/LatinImeStressTests.java b/tests/src/org/kelar/inputmethod/latin/LatinImeStressTests.java
index d4f8bc194..6b9f65931 100644
--- a/tests/src/com/android/inputmethod/latin/LatinImeStressTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinImeStressTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
 
 import java.util.Random;
 
diff --git a/tests/src/com/android/inputmethod/latin/LatinImeTests.java b/tests/src/org/kelar/inputmethod/latin/LatinImeTests.java
index 134ec2f7a..5d3d04783 100644
--- a/tests/src/com/android/inputmethod/latin/LatinImeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/LatinImeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import androidx.test.filters.LargeTest;
 
diff --git a/tests/src/com/android/inputmethod/latin/NgramContextTests.java b/tests/src/org/kelar/inputmethod/latin/NgramContextTests.java
index 505818439..07b66271d 100644
--- a/tests/src/com/android/inputmethod/latin/NgramContextTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/NgramContextTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,9 +24,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.NgramContextUtils;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.NgramContextUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/PunctuationTests.java b/tests/src/org/kelar/inputmethod/latin/PunctuationTests.java
index ba98003f8..c8337430d 100644
--- a/tests/src/com/android/inputmethod/latin/PunctuationTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/PunctuationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.provider.Settings.Secure;
 
diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/org/kelar/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
index ac38468f9..cf4a349d5 100644
--- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/RichInputConnectionAndTextRangeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,13 +35,13 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.StringUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
-import com.android.inputmethod.latin.utils.NgramContextUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.ScriptUtils;
-import com.android.inputmethod.latin.utils.TextRange;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.utils.NgramContextUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.ScriptUtils;
+import org.kelar.inputmethod.latin.utils.TextRange;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/org/kelar/inputmethod/latin/RichInputMethodSubtypeTests.java
index 578e6bea0..f28ba53cd 100644
--- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/RichInputMethodSubtypeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,12 +30,10 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.RunInLocale;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.utils.AdditionalSubtypeUtils;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.utils.SubtypeLocaleUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/ShiftModeTests.java b/tests/src/org/kelar/inputmethod/latin/ShiftModeTests.java
index 9b6e72be2..a036e5d7d 100644
--- a/tests/src/com/android/inputmethod/latin/ShiftModeTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/ShiftModeTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import android.text.TextUtils;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 @LargeTest
 public class ShiftModeTests extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java b/tests/src/org/kelar/inputmethod/latin/SuggestedWordsTests.java
index b41c7013c..1d3df9335 100644
--- a/tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/SuggestedWordsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import org.kelar.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/org/kelar/inputmethod/latin/WordComposerTests.java
index 4ac094b25..f13458526 100644
--- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/WordComposerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.common.CoordinateUtils;
-import com.android.inputmethod.latin.common.StringUtils;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.CoordinateUtils;
+import org.kelar.inputmethod.latin.common.StringUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiverTests.java b/tests/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
index 86f453b08..96e522182 100644
--- a/tests/src/com/android/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/accounts/AccountsChangedReceiverTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.accounts;
+package org.kelar.inputmethod.latin.accounts;
 
 import static org.junit.Assert.assertEquals;
 
@@ -28,7 +28,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.settings.LocalSettingsConstants;
+import org.kelar.inputmethod.latin.settings.LocalSettingsConstants;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/common/InputPointersTests.java b/tests/src/org/kelar/inputmethod/latin/common/InputPointersTests.java
index 29abec365..e0b98dd13 100644
--- a/tests/src/com/android/inputmethod/latin/common/InputPointersTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/InputPointersTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/latin/common/ResizableIntArrayTests.java b/tests/src/org/kelar/inputmethod/latin/common/ResizableIntArrayTests.java
index 5151b6b2b..d2a7a651f 100644
--- a/tests/src/com/android/inputmethod/latin/common/ResizableIntArrayTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/ResizableIntArrayTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/tests/src/com/android/inputmethod/latin/common/StringUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/common/StringUtilsTests.java
index 36a4b912d..016819ce8 100644
--- a/tests/src/com/android/inputmethod/latin/common/StringUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/StringUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/common/UnicodeSurrogateTests.java b/tests/src/org/kelar/inputmethod/latin/common/UnicodeSurrogateTests.java
index adfbbf418..7fad18588 100644
--- a/tests/src/com/android/inputmethod/latin/common/UnicodeSurrogateTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/common/UnicodeSurrogateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.common;
+package org.kelar.inputmethod.latin.common;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/AbstractDictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/AbstractDictDecoder.java
index bc856f113..978e6cd3a 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/AbstractDictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/AbstractDictDecoder.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
index 376aa3f62..659df6859 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 import android.test.AndroidTestCase;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
 
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
-import com.android.inputmethod.latin.utils.ByteArrayDictBuffer;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.utils.ByteArrayDictBuffer;
 
 import java.io.File;
 import java.io.IOException;
@@ -151,7 +151,7 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase {
 //    on-device, so it's commented out.
 //    private void dumpToCombinedFileForDebug(final FusionDictionary dict, final String filename)
 //            throws IOException {
-//        com.android.inputmethod.latin.dicttool.CombinedInputOutput.writeDictionaryCombined(
+//        org.kelar.inputmethod.latin.dicttool.CombinedInputOutput.writeDictionaryCombined(
 //                new java.io.FileWriter(new File(filename)), dict);
 //    }
 
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
index be75565bb..18199ae21 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.annotations.UsedForTesting;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
index 2ae5bf5c1..3b35288d7 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictIOUtils.java
index da1b32a8b..055d6492d 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictIOUtils.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.DictDecoder.DictionaryBufferFactory;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.DictDecoder.DictionaryBufferFactory;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictUtils.java
index 9c1e4cf84..48e3d95f2 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/BinaryDictUtils.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
 
 import java.io.File;
 import java.util.HashMap;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/DictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/DictDecoder.java
index a3b28a702..97fb3596b 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/DictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/DictDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
-import com.android.inputmethod.latin.utils.ByteArrayDictBuffer;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.utils.ByteArrayDictBuffer;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/DictEncoder.java
index 10dd00325..d637b6d2a 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/DictEncoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java b/tests/src/org/kelar/inputmethod/latin/makedict/FusionDictionary.java
index 2bed44d7a..817d69f99 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/FusionDictionary.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.define.DecoderSpecificConstants;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.define.DecoderSpecificConstants;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/MakedictLog.java b/tests/src/org/kelar/inputmethod/latin/makedict/MakedictLog.java
index 7eccff2b4..07270d1d0 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/MakedictLog.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/MakedictLog.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 /**
  * Wrapper to redirect log events to the right output medium.
diff --git a/tests/src/com/android/inputmethod/latin/makedict/PendingAttribute.java b/tests/src/org/kelar/inputmethod/latin/makedict/PendingAttribute.java
index 70e24cc98..0abce4848 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/PendingAttribute.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/PendingAttribute.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 /**
  * A not-yet-resolved attribute.
diff --git a/tests/src/com/android/inputmethod/latin/makedict/PtNodeInfo.java b/tests/src/org/kelar/inputmethod/latin/makedict/PtNodeInfo.java
index 862e8c101..65209a832 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/PtNodeInfo.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/PtNodeInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
 import java.util.ArrayList;
 
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver2DictEncoder.java
index b5694caa3..8b3636208 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver2DictEncoder.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
-import com.android.inputmethod.latin.makedict.BinaryDictEncoderUtils.CodePointTable;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.CharEncoding;
+import org.kelar.inputmethod.latin.makedict.BinaryDictEncoderUtils.CodePointTable;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictDecoder.java
index 746431dfa..351fd72c4 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictDecoder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictEncoder.java
index 6e7b37d54..2eb3010c2 100644
--- a/tests/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java
+++ b/tests/src/org/kelar/inputmethod/latin/makedict/Ver4DictEncoder.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.Dictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.annotations.UsedForTesting;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.Dictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java b/tests/src/org/kelar/inputmethod/latin/network/BlockingHttpClientTests.java
index f6f54eb77..941abc606 100644
--- a/tests/src/com/android/inputmethod/latin/network/BlockingHttpClientTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/network/BlockingHttpClientTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.network.BlockingHttpClient.ResponseProcessor;
+import org.kelar.inputmethod.latin.network.BlockingHttpClient.ResponseProcessor;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java b/tests/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
index 1aa4040b8..63a5f6ff0 100644
--- a/tests/src/com/android/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/network/HttpUrlConnectionBuilderTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.network;
+package org.kelar.inputmethod.latin.network;
 
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_BI_DIRECTIONAL;
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_DOWNLOAD_ONLY;
-import static com.android.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_UPLOAD_ONLY;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_BI_DIRECTIONAL;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_DOWNLOAD_ONLY;
+import static org.kelar.inputmethod.latin.network.HttpUrlConnectionBuilder.MODE_UPLOAD_ONLY;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
index bc9881bde..9e6a18a13 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,8 +25,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.ExpandableBinaryDictionary;
-import com.android.inputmethod.latin.utils.BinaryDictionaryUtils;
+import org.kelar.inputmethod.latin.ExpandableBinaryDictionary;
+import org.kelar.inputmethod.latin.utils.BinaryDictionaryUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
index 73d7e7339..11e2a7ae5 100644
--- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
+++ b/tests/src/org/kelar/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 import android.content.Context;
 
-import com.android.inputmethod.latin.BinaryDictionary;
-import com.android.inputmethod.latin.NgramContext;
-import com.android.inputmethod.latin.NgramContext.WordInfo;
-import com.android.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.BinaryDictionary;
+import org.kelar.inputmethod.latin.NgramContext;
+import org.kelar.inputmethod.latin.NgramContext.WordInfo;
+import org.kelar.inputmethod.latin.common.FileUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java b/tests/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
index 667ffd1ae..5eff614df 100644
--- a/tests/src/com/android/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/settings/AccountsSettingsFragmentTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -33,7 +33,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.utils.ManagedProfileUtils;
+import org.kelar.inputmethod.latin.utils.ManagedProfileUtils;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/settings/SpacingAndPunctuationsTests.java b/tests/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
index df44fba67..45a303639 100644
--- a/tests/src/com/android/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,9 +28,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
-import com.android.inputmethod.latin.common.Constants;
-import com.android.inputmethod.latin.utils.RunInLocale;
+import org.kelar.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.utils.RunInLocale;
 
 import junit.framework.AssertionFailedError;
 
diff --git a/tests/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java b/tests/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
index 2434667c8..e68670de0 100644
--- a/tests/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
+++ b/tests/src/org/kelar/inputmethod/latin/spellcheck/AndroidSpellCheckerServiceTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.spellcheck;
+package org.kelar.inputmethod.latin.spellcheck;
 
 import android.text.style.SuggestionSpan;
 
 import androidx.test.filters.LargeTest;
 
-import com.android.inputmethod.latin.InputTestsBase;
+import org.kelar.inputmethod.latin.InputTestsBase;
 
 @LargeTest
 public class AndroidSpellCheckerServiceTest extends InputTestsBase {
diff --git a/tests/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java b/tests/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
index 3706574ef..e7f140f29 100644
--- a/tests/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/suggestions/SuggestionStripLayoutHelperTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.suggestions;
+package org.kelar.inputmethod.latin.suggestions;
 
 import static junit.framework.TestCase.assertEquals;
 
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.SuggestedWords;
+import org.kelar.inputmethod.latin.SuggestedWords;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java b/tests/src/org/kelar/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
index 986c8e3dd..85eeaf86c 100644
--- a/tests/src/com/android/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/touchinputconsumer/NullGestureConsumerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.touchinputconsumer;
+package org.kelar.inputmethod.latin.touchinputconsumer;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
diff --git a/tests/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
index 08c404e12..7c929c7a1 100644
--- a/tests/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/AdditionalSubtypeUtilsTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
-import static com.android.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
-import static com.android.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.ASCII_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.EMOJI_CAPABLE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.IS_ADDITIONAL_SUBTYPE;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.KEYBOARD_LAYOUT_SET;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.ExtraValue.UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME;
+import static org.kelar.inputmethod.latin.common.Constants.Subtype.KEYBOARD_MODE;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -35,7 +35,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.compat.InputMethodSubtypeCompatUtils;
+import org.kelar.inputmethod.compat.InputMethodSubtypeCompatUtils;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/utils/AsyncResultHolderTests.java b/tests/src/org/kelar/inputmethod/latin/utils/AsyncResultHolderTests.java
index f53780543..b85e4f38c 100644
--- a/tests/src/com/android/inputmethod/latin/utils/AsyncResultHolderTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/AsyncResultHolderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/ByteArrayDictBuffer.java b/tests/src/org/kelar/inputmethod/latin/utils/ByteArrayDictBuffer.java
index 2028298f2..6c0854824 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ByteArrayDictBuffer.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ByteArrayDictBuffer.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils.DictBuffer;
 
 /**
  * This class provides an implementation for the FusionDictionary buffer interface that is backed
diff --git a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/CapsModeUtilsTests.java
index 4aac7fc41..75463929f 100644
--- a/tests/src/com/android/inputmethod/latin/utils/CapsModeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/CapsModeUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -26,8 +26,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/CollectionUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/CollectionUtilsTests.java
index da23c9cb8..390e88828 100644
--- a/tests/src/com/android/inputmethod/latin/utils/CollectionUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/CollectionUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.CollectionUtils;
+import org.kelar.inputmethod.latin.common.CollectionUtils;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/DictionaryInfoUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
index 2112f985a..4c30750f5 100644
--- a/tests/src/com/android/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/DictionaryInfoUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,8 +26,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.LocaleUtils;
-import com.android.inputmethod.latin.settings.SpacingAndPunctuations;
+import org.kelar.inputmethod.latin.common.LocaleUtils;
+import org.kelar.inputmethod.latin.settings.SpacingAndPunctuations;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/ExecutorUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ExecutorUtilsTests.java
index 7c9b3e6ca..440e527f1 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ExecutorUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ExecutorUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/ImportantNoticeUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
index 9d9a541b7..65abd16fd 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ImportantNoticeUtilsTests.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.utils.ImportantNoticeUtils.KEY_TIMESTAMP_OF_CONTACTS_NOTICE;
+import static org.kelar.inputmethod.latin.utils.ImportantNoticeUtils.KEY_TIMESTAMP_OF_CONTACTS_NOTICE;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -28,7 +28,7 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.settings.SettingsValues;
+import org.kelar.inputmethod.latin.settings.SettingsValues;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tests/src/com/android/inputmethod/latin/utils/JsonUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/JsonUtilsTests.java
index fd5e0a4d7..5a323ef51 100644
--- a/tests/src/com/android/inputmethod/latin/utils/JsonUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/JsonUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
index 58e26e8d6..007c69fd2 100644
--- a/tests/src/com/android/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/LanguageOnSpacebarUtilsTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_FULL_LOCALE;
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_LANGUAGE_ONLY;
-import static com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_NONE;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_FULL_LOCALE;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_LANGUAGE_ONLY;
+import static org.kelar.inputmethod.latin.utils.LanguageOnSpacebarUtils.FORMAT_TYPE_NONE;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,11 +29,8 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
-import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.LanguageOnSpacebarUtils;
-import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/src/com/android/inputmethod/latin/utils/RecapitalizeStatusTests.java b/tests/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatusTests.java
index 0908f2b54..1ce091b0b 100644
--- a/tests/src/com/android/inputmethod/latin/utils/RecapitalizeStatusTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/RecapitalizeStatusTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.common.Constants;
+import org.kelar.inputmethod.latin.common.Constants;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/ResourceUtilsTests.java
index 4aab96a55..7e7f24d49 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/ResourceUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/tests/src/com/android/inputmethod/latin/utils/SpannableStringUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/SpannableStringUtilsTests.java
index a5987cf13..f5546a04d 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SpannableStringUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/SpannableStringUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
index 6764fd880..77b960a95 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
+++ b/tests/src/org/kelar/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,9 +30,9 @@ import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.inputmethod.latin.R;
-import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.RichInputMethodSubtype;
+import org.kelar.inputmethod.latin.R;
+import org.kelar.inputmethod.latin.RichInputMethodManager;
+import org.kelar.inputmethod.latin.RichInputMethodSubtype;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/tools/EditTextVariations/AndroidManifest.xml b/tools/EditTextVariations/AndroidManifest.xml
index 0cf6d4fcc..37d365a4b 100644
--- a/tools/EditTextVariations/AndroidManifest.xml
+++ b/tools/EditTextVariations/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.inputmethod.tools.edittextvariations"
+     package="org.kelar.inputmethod.tools.edittextvariations"
      android:versionName="0.67"
      android:versionCode="67">
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/tools/EditTextVariations/res/layout/main.xml b/tools/EditTextVariations/res/layout/main.xml
index 99abfb07e..6416a3571 100644
--- a/tools/EditTextVariations/res/layout/main.xml
+++ b/tools/EditTextVariations/res/layout/main.xml
@@ -42,14 +42,14 @@
             android:inputType="textMultiLine|textAutoCorrect"
             android:imeOptions="actionSend" />
         <view
-            class="com.android.inputmethod.tools.edittextvariations.MultiLineShortMessageEditText"
+            class="org.kelar.inputmethod.tools.edittextvariations.MultiLineShortMessageEditText"
             android:id="@+id/text_short_message_send_multi_lines"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:inputType="textShortMessage|textMultiLine|textAutoCorrect|textCapSentences"
             android:imeOptions="actionSend" />
         <view
-            class="com.android.inputmethod.tools.edittextvariations.MultiLineShortMessageEditText"
+            class="org.kelar.inputmethod.tools.edittextvariations.MultiLineShortMessageEditText"
             android:id="@+id/text_multi_lines_search"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EchoingTextWatcher.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EchoingTextWatcher.java
index 1c652c2a2..e22c1f640 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EchoingTextWatcher.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EchoingTextWatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.annotation.SuppressLint;
 import android.os.Handler;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EditTextVariations.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EditTextVariations.java
index 53d08b6c9..40568b3bd 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EditTextVariations.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EditTextVariations.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import static android.graphics.Color.BLUE;
 import static android.view.Gravity.LEFT;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EditorActivity.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EditorActivity.java
index 4fc947bff..8be0dacd3 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/EditorActivity.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/EditorActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/FinalClassField.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/FinalClassField.java
index 14c556a67..6d6794449 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/FinalClassField.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/FinalClassField.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import java.lang.reflect.Field;
 
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/InstanceMethod.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/InstanceMethod.java
index 05dc0d6dc..eab60df40 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/InstanceMethod.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/InstanceMethod.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/MultiLineShortMessageEditText.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/MultiLineShortMessageEditText.java
index 7ab700776..44fd6a37a 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/MultiLineShortMessageEditText.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/MultiLineShortMessageEditText.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/NotificationBroadcastReceiver.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/NotificationBroadcastReceiver.java
index 97db49b15..c247fab3b 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/NotificationBroadcastReceiver.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/NotificationBroadcastReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/NotificationUtils.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/NotificationUtils.java
index 78d52bb00..69d7d2cbb 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/NotificationUtils.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/NotificationUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/ThemeItem.java b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/ThemeItem.java
index f3c6d4f54..6c5f80f97 100644
--- a/tools/EditTextVariations/src/com/android/inputmethod/tools/edittextvariations/ThemeItem.java
+++ b/tools/EditTextVariations/src/org/kelar/inputmethod/tools/edittextvariations/ThemeItem.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.tools.edittextvariations;
+package org.kelar.inputmethod.tools.edittextvariations;
 
 import android.os.Build;
 
-import com.android.inputmethod.tools.edittextvariations.R;
+import org.kelar.inputmethod.tools.edittextvariations.R;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/tools/dicttool/Android.bp b/tools/dicttool/Android.bp
index 3a6c7dc09..185543021 100644
--- a/tools/dicttool/Android.bp
+++ b/tools/dicttool/Android.bp
@@ -37,5 +37,5 @@ java_binary_host {
         "latinime-common",
     ],
     jni_libs: ["libjni_latinime"],
-    main_class: "com.android.inputmethod.latin.dicttool.Dicttool",
+    main_class: "org.kelar.inputmethod.latin.dicttool.Dicttool",
 }
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index ee81c2a19..70a1aa6ac 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -26,11 +26,11 @@ LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LATINIME_LOCAL_DIR := ../..
-LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod
+LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/org/kelar/inputmethod
 LATINIME_BASE_OVERRIDABLE_SRC_DIR := \
-        $(LATINIME_LOCAL_DIR)/java-overridable/src/com/android/inputmethod
+        $(LATINIME_LOCAL_DIR)/java-overridable/src/org/kelar/inputmethod
 MAKEDICT_CORE_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/latin/makedict
-LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin
+LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/org/kelar/inputmethod/latin
 
 # Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that
 # a significant part of the dependencies are mocked in the compat/ directory, with empty or
@@ -63,7 +63,7 @@ USED_TARGETED_SRC_FILES := \
         $(addprefix $(LATINIME_TESTS_SRC_DIR)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL))
 
 DICTTOOL_ONDEVICE_TESTS_DIR := \
-        $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/
+        $(LATINIME_LOCAL_DIR)/tests/src/org/kelar/inputmethod/latin/makedict/
 DICTTOOL_COMPAT_TESTS_DIR := compat
 
 LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SRC_DIR))
diff --git a/tools/dicttool/compat/android/test/AndroidTestCase.java b/tools/dicttool/compat/android/test/AndroidTestCase.java
index f765ce0fc..058032496 100644
--- a/tools/dicttool/compat/android/test/AndroidTestCase.java
+++ b/tools/dicttool/compat/android/test/AndroidTestCase.java
@@ -16,7 +16,7 @@
 
 package android.test;
 
-import com.android.inputmethod.latin.dicttool.Test;
+import org.kelar.inputmethod.latin.dicttool.Test;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/Key.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Key.java
index 925940650..d6c1156fa 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/Key.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Key.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 @SuppressWarnings("static-method")
 public class Key {
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/Keyboard.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Keyboard.java
index 3d6bfd0a9..ce91ffe15 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/Keyboard.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/Keyboard.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 @SuppressWarnings("unused")
 public class Keyboard {
diff --git a/tools/dicttool/compat/com/android/inputmethod/keyboard/ProximityInfo.java b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/ProximityInfo.java
index 3a068bd5a..5d156f5c6 100644
--- a/tools/dicttool/compat/com/android/inputmethod/keyboard/ProximityInfo.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/keyboard/ProximityInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard;
+package org.kelar.inputmethod.keyboard;
 
 public class ProximityInfo {
     public long getNativeProximityInfo() { return 0l; }
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/LatinIME.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/LatinIME.java
index e7aa340fb..70d8791da 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/LatinIME.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/LatinIME.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin;
+package org.kelar.inputmethod.latin;
 
 public class LatinIME {
 }
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/define/JniLibName.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/define/JniLibName.java
index 93ac1980a..3eaba83c5 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/define/JniLibName.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/define/JniLibName.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.define;
+package org.kelar.inputmethod.latin.define;
 
 public final class JniLibName {
     private JniLibName() {
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
index 6a430d57d..4e9c3824b 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.settings;
+package org.kelar.inputmethod.latin.settings;
 
 public class AdditionalFeaturesSettingUtils {
     public static final int ADDITIONAL_FEATURES_SETTINGS_SIZE = 0;
diff --git a/tools/dicttool/compat/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java b/tools/dicttool/compat/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
index b5a729421..3f86b4580 100644
--- a/tools/dicttool/compat/com/android/inputmethod/latin/utils/WordInputEventForPersonalization.java
+++ b/tools/dicttool/compat/org/kelar/inputmethod/latin/utils/WordInputEventForPersonalization.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.utils;
+package org.kelar.inputmethod.latin.utils;
 
 public final class WordInputEventForPersonalization {
 }
diff --git a/tools/dicttool/etc/dicttool_aosp b/tools/dicttool/etc/dicttool_aosp
index fc918f0f8..9f9b745fb 100644
--- a/tools/dicttool/etc/dicttool_aosp
+++ b/tools/dicttool/etc/dicttool_aosp
@@ -33,7 +33,7 @@ progdir=`pwd`
 prog="${progdir}"/`basename "${prog}"`
 cd "${oldwd}"
 
-classname=com.android.inputmethod.latin.dicttool.Dicttool
+classname=org.kelar.inputmethod.latin.dicttool.Dicttool
 jarfile=dicttool_aosp.jar
 frameworkdir="$progdir"
 if [ ! -r "$frameworkdir/$jarfile" ]
diff --git a/tools/dicttool/etc/manifest.txt b/tools/dicttool/etc/manifest.txt
index 67c85214c..8f4277593 100644
--- a/tools/dicttool/etc/manifest.txt
+++ b/tools/dicttool/etc/manifest.txt
@@ -1 +1 @@
-Main-Class: com.android.inputmethod.latin.dicttool.Dicttool
+Main-Class: org.kelar.inputmethod.latin.dicttool.Dicttool
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
index b5ed94ccd..6a4b366d5 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CombinedInputOutput.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CombinedInputOutput.java
index 5e7aca5bb..dfe2df40d 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CombinedInputOutput.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CombinedInputOutput.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
-import com.android.inputmethod.latin.utils.CombinedFormatUtils;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.ProbabilityInfo;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.utils.CombinedFormatUtils;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CommandList.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CommandList.java
index 8fdf7633f..d09c2d9a2 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/CommandList.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/CommandList.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 public class CommandList {
     public static void populate() {
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Compress.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Compress.java
index 728a159a0..da7e60eff 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Compress.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Compress.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Crypt.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Crypt.java
index 4612ae4ab..5db316920 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Crypt.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Crypt.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/DictionaryMaker.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/DictionaryMaker.java
index 6187853c8..a3b0e1d9b 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/DictionaryMaker.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/DictionaryMaker.java
@@ -14,18 +14,18 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictEncoder;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.MakedictLog;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.Ver2DictEncoder;
-import com.android.inputmethod.latin.makedict.Ver4DictEncoder;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictEncoder;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.MakedictLog;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.Ver2DictEncoder;
+import org.kelar.inputmethod.latin.makedict.Ver4DictEncoder;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Dicttool.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Dicttool.java
index e49b35084..88aa0562f 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Dicttool.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Dicttool.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Diff.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Diff.java
index 4ba7e1309..6f5032694 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Diff.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Diff.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import java.util.Arrays;
 import java.util.ArrayList;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Header.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Header.java
index aa1762ff1..ab57e23f4 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Header.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Header.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Info.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Info.java
index 8f8c968c1..894354922 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Info.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Info.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.WeightedString;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.WeightedString;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import java.util.Arrays;
 import java.util.ArrayList;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Makedict.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Makedict.java
index 0b1fb88bc..dbed2b150 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Makedict.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Makedict.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Package.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Package.java
index 3efa10a80..3e411e272 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Package.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Package.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Test.java b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Test.java
index e2dd5199b..17632ba96 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/dicttool/Test.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/dicttool/Test.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
+package org.kelar.inputmethod.latin.dicttool;
 
-import com.android.inputmethod.latin.common.FileUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictDecoderEncoderTests;
-import com.android.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests;
-import com.android.inputmethod.latin.makedict.FusionDictionaryTest;
+import org.kelar.inputmethod.latin.common.FileUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictDecoderEncoderTests;
+import org.kelar.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests;
+import org.kelar.inputmethod.latin.makedict.FusionDictionaryTest;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tools/dicttool/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java b/tools/dicttool/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
index dcc4e1972..cf3d3f0c5 100644
--- a/tools/dicttool/src/com/android/inputmethod/latin/personalization/PersonalizationHelper.java
+++ b/tools/dicttool/src/org/kelar/inputmethod/latin/personalization/PersonalizationHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.personalization;
+package org.kelar.inputmethod.latin.personalization;
 
 @SuppressWarnings("unused")
 public class PersonalizationHelper {
diff --git a/tools/dicttool/tests/etc/test-dicttool.sh b/tools/dicttool/tests/etc/test-dicttool.sh
index 2f53049c3..8936d4bcb 100755
--- a/tools/dicttool/tests/etc/test-dicttool.sh
+++ b/tools/dicttool/tests/etc/test-dicttool.sh
@@ -24,5 +24,5 @@ fi
 find out -name "dicttool_aosp*" -exec rm -rf {} \; > /dev/null 2>&1
 mmm -j8 external/junit
 DICTTOOL_UNITTEST=true mmm -j8 packages/inputmethods/LatinIME/tools/dicttool
-java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests
-java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtilsTests
+java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner org.kelar.inputmethod.latin.makedict.BinaryDictEncoderFlattenTreeTests
+java -classpath ${ANDROID_HOST_OUT}/framework/junit-host.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtilsTests
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
index d3ecc9154..337c4d41d 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/dicttool/BinaryDictOffdeviceUtilsTests.java
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.dicttool;
-
-import com.android.inputmethod.latin.common.CodePointUtils;
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils;
-import com.android.inputmethod.latin.dicttool.Compress;
-import com.android.inputmethod.latin.dicttool.Crypt;
-import com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
-import com.android.inputmethod.latin.makedict.BinaryDictIOUtils;
-import com.android.inputmethod.latin.makedict.BinaryDictUtils;
-import com.android.inputmethod.latin.makedict.DictDecoder;
-import com.android.inputmethod.latin.makedict.DictEncoder;
-import com.android.inputmethod.latin.makedict.DictionaryHeader;
-import com.android.inputmethod.latin.makedict.FormatSpec;
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.ProbabilityInfo;
-import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
-import com.android.inputmethod.latin.makedict.Ver2DictEncoder;
+package org.kelar.inputmethod.latin.dicttool;
+
+import org.kelar.inputmethod.latin.common.CodePointUtils;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils;
+import org.kelar.inputmethod.latin.dicttool.Compress;
+import org.kelar.inputmethod.latin.dicttool.Crypt;
+import org.kelar.inputmethod.latin.dicttool.BinaryDictOffdeviceUtils.DecoderChainSpec;
+import org.kelar.inputmethod.latin.makedict.BinaryDictIOUtils;
+import org.kelar.inputmethod.latin.makedict.BinaryDictUtils;
+import org.kelar.inputmethod.latin.makedict.DictDecoder;
+import org.kelar.inputmethod.latin.makedict.DictEncoder;
+import org.kelar.inputmethod.latin.makedict.DictionaryHeader;
+import org.kelar.inputmethod.latin.makedict.FormatSpec;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.FormatOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.ProbabilityInfo;
+import org.kelar.inputmethod.latin.makedict.UnsupportedFormatException;
+import org.kelar.inputmethod.latin.makedict.Ver2DictEncoder;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java
index 178fc41e2..ec1377704 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/BinaryDictEncoderFlattenTreeTests.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
 
 import junit.framework.TestCase;
 
diff --git a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/FusionDictionaryTest.java b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/FusionDictionaryTest.java
index 901d0cef3..a16c27ec7 100644
--- a/tools/dicttool/tests/com/android/inputmethod/latin/makedict/FusionDictionaryTest.java
+++ b/tools/dicttool/tests/org/kelar/inputmethod/latin/makedict/FusionDictionaryTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.latin.makedict;
+package org.kelar.inputmethod.latin.makedict;
 
-import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
-import com.android.inputmethod.latin.makedict.FusionDictionary;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
-import com.android.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
-import com.android.inputmethod.latin.makedict.WordProperty;
+import org.kelar.inputmethod.latin.makedict.FormatSpec.DictionaryOptions;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNode;
+import org.kelar.inputmethod.latin.makedict.FusionDictionary.PtNodeArray;
+import org.kelar.inputmethod.latin.makedict.WordProperty;
 
 import junit.framework.TestCase;
 
diff --git a/tools/make-keyboard-text/Android.bp b/tools/make-keyboard-text/Android.bp
index 781f53f97..66655277d 100644
--- a/tools/make-keyboard-text/Android.bp
+++ b/tools/make-keyboard-text/Android.bp
@@ -26,6 +26,6 @@ java_binary_host {
     name: "make-keyboard-text",
 
     srcs: ["src/**/*.java"],
-    main_class: "com.android.inputmethod.keyboard.tools.MakeKeyboardText",
+    main_class: "org.kelar.inputmethod.keyboard.tools.MakeKeyboardText",
     java_resource_dirs: ["res"],
 }
diff --git a/tools/make-keyboard-text/etc/manifest.txt b/tools/make-keyboard-text/etc/manifest.txt
index 8ad4db059..024658445 100644
--- a/tools/make-keyboard-text/etc/manifest.txt
+++ b/tools/make-keyboard-text/etc/manifest.txt
@@ -1 +1 @@
-Main-Class: com.android.inputmethod.keyboard.tools.MakeKeyboardText
+Main-Class: org.kelar.inputmethod.keyboard.tools.MakeKeyboardText
diff --git a/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl b/tools/make-keyboard-text/res/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl
index 5855129c5..29ec0b1f9 100644
--- a/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl
+++ b/tools/make-keyboard-text/res/src/org/kelar/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.internal;
+package org.kelar.inputmethod.keyboard.internal;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -23,7 +23,7 @@ import java.util.Locale;
  * !!!!! DO NOT EDIT THIS FILE !!!!!
  *
  * This file is generated by tools/make-keyboard-text. The base template file is
- *   tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/
+ *   tools/make-keyboard-text/res/src/org/kelar/inputmethod/keyboard/internal/
  *   KeyboardTextsTable.tmpl
  *
  * This file must be updated when any text resources in keyboard layout files have been changed.
@@ -37,7 +37,7 @@ import java.util.Locale;
  *   $ make-keyboard-text -java packages/inputmethods/LatinIME/java
  *
  * The updated source file will be generated to the following path (this file).
- *   packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/
+ *   packages/inputmethods/LatinIME/java/src/org/kelar/inputmethod/keyboard/internal/
  *   KeyboardTextsTable.java
  */
 public final class KeyboardTextsTable {
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/ArrayInitializerFormatter.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/ArrayInitializerFormatter.java
index 48bf8010a..d4d1634bb 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/ArrayInitializerFormatter.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/ArrayInitializerFormatter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import java.io.PrintStream;
 
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/JarUtils.java
index abb33397b..a77be9ea1 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/JarUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/LocaleUtils.java
index c1a7ec5eb..f0f785768 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/LocaleUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -22,7 +22,7 @@ import java.util.Locale;
 /**
  * A class to help with handling Locales in string form.
  *
- * This is a subset of com/android/inputmethod/latin/utils/LocaleUtils.java in order to use
+ * This is a subset of org/kelar/inputmethod/latin/utils/LocaleUtils.java in order to use
  * for the make-keyboard-text tool.
  */
 public final class LocaleUtils {
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/MakeKeyboardText.java
index 6c15ce6bf..5c1181f70 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/MakeKeyboardText.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/MoreKeysResources.java
index 563acc57e..31c452718 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/MoreKeysResources.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResource.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/StringResource.java
index a49b8fe70..ac1b7e860 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResource.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/StringResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 public class StringResource {
     public final String mName;
diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/StringResourceMap.java
index cf44f2cad..62d1f7dc2 100644
--- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java
+++ b/tools/make-keyboard-text/src/org/kelar/inputmethod/keyboard/tools/StringResourceMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.inputmethod.keyboard.tools;
+package org.kelar.inputmethod.keyboard.tools;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;