diff --git a/Android.mk b/Android.mk
index 4afb569..ee55779 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_USE_AAPT2 := true
 
-LOCAL_PACKAGE_NAME := SnapdragonGallery
+LOCAL_PACKAGE_NAME := Gallery2
 
 LOCAL_PRIVILEGED_MODULE := true
 
@@ -35,7 +35,9 @@
 
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
-LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D Gallery2
+LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.gallery3d
 
 LOCAL_JNI_SHARED_LIBRARIES := \
     libjni_gallery_eglfence \
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52016e3..c4b53fe 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,7 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Snapdragon Gallery</string>
+    <string name="app_name">Gallery</string>
     <!-- Title for picture frame gadget to show in list of all available gadgets -->
     <string name="gadget_title">Picture frame</string>