diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index d33016a94..5f4791d1f 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 fba7a8d74..e72587ddd 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)