diff --git a/Android.mk b/Android.mk
index 5892f35252..aed00c07c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,9 +7,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClock
+LOCAL_PACKAGE_NAME := AchepClock
 
-LOCAL_OVERRIDES_PACKAGES := AlarmClock
+LOCAL_OVERRIDES_PACKAGES := AlarmClock DeskClock
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 50561453de..b422b24978 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,8 +9,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := DeskClockTests
+LOCAL_PACKAGE_NAME := AchepClockTests
 
-LOCAL_INSTRUMENTATION_FOR := DeskClock
+LOCAL_INSTRUMENTATION_FOR := AchepClock
 
 include $(BUILD_PACKAGE)