diff --git a/Android.mk b/Android.mk
index 393068fc6677ac474e5ee46a8cb76779297a2cfa..c51a8a6334cb99bd45ca41ffd964e13f7854751d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,13 +27,13 @@ LOCAL_PACKAGE_NAME := SnapdragonCamera
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-# If this is an unbundled build (to install seprately) then include
+# If this is an unbundled build (to install separately) then include
 # the libraries in the APK, otherwise just put them in /system/lib and
 # leave them out of the APK
 ifneq (,$(TARGET_BUILD_APPS))
-  LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_tinyplanet
+  LOCAL_JNI_SHARED_LIBRARIES := libjni_snapcammosaic libjni_snapcamtinyplanet
 else
-  LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_tinyplanet
+  LOCAL_REQUIRED_MODULES := libjni_snapcammosaic libjni_snapcamtinyplanet
 endif
 
 include $(BUILD_PACKAGE)
diff --git a/jni/Android.mk b/jni/Android.mk
index b9bafcf6c2e348f4986678a82bf0a21c88299a8d..af2d81462af1cb6b9ed280941f0003f854977523 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -56,7 +56,7 @@ LOCAL_LDFLAGS := -llog -lGLESv2
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_MODULE    := libjni_mosaic
+LOCAL_MODULE    := libjni_snapcammosaic
 include $(BUILD_SHARED_LIBRARY)
 
 # TinyPlanet
@@ -65,7 +65,7 @@ include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_LDFLAGS   := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
-LOCAL_MODULE    := libjni_tinyplanet
+LOCAL_MODULE    := libjni_snapcamtinyplanet
 LOCAL_SRC_FILES := tinyplanet.cc
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops