diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index d33016a948727329d377d81242315189500c2a7f..5f4791d1feb42cf98c77988141fafb46e60294b9 100755
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.google.android.inputmethod.latin2">
+        package="com.google.android.inputmethod.latin">
 
     <!-- Do not override the default LatinIME for now -->
     <!-- original-package android:name="com.android.inputmethod.latin" / -->
diff --git a/tests/Android.mk b/tests/Android.mk
index fba7a8d743880f7020586c8ff5ea77956f117538..e72587ddd39c3c12830157664cc8f715254a756a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -12,6 +12,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := LatinIMETests
 
-LOCAL_INSTRUMENTATION_FOR := LatinIME
+LOCAL_INSTRUMENTATION_FOR := LatinIme2Google
 
 include $(BUILD_PACKAGE)