diff --git a/Gcam/Android.mk b/Gcam/Android.mk
index 6cab40b..6fa8e62 100644
--- a/Gcam/Android.mk
+++ b/Gcam/Android.mk
@@ -1,11 +1,12 @@
 LOCAL_PATH := $(call my-dir)
- include $(CLEAR_VARS)
-LOCAL_MODULE := Gcam
+include $(CLEAR_VARS)
+LOCAL_MODULE := GoogleCamera
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := Gcam/Gcam.apk
+LOCAL_SRC_FILES := GoogleCamera.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_PATH := $(TARGET_OUT)/priv-app
-LOCAL_OVERRIDES_PACKAGES := SnapdragonCamera Camera2
+LOCAL_OVERRIDES_PACKAGES := Snap Camera2
+LOCAL_DEX_PREOPT := false
 include $(BUILD_PREBUILT)
diff --git a/Gcam/Gcam/Gcam.apk b/Gcam/GoogleCamera.apk
similarity index 68%
rename from Gcam/Gcam/Gcam.apk
rename to Gcam/GoogleCamera.apk
index d48d39f..8548993 100644
Binary files a/Gcam/Gcam/Gcam.apk and b/Gcam/GoogleCamera.apk differ