diff --git a/Android.mk b/Android.mk
index bb2b0d8c91c9909d9b6cd1ff4cf16f1098b957dc..393068fc6677ac474e5ee46a8cb76779297a2cfa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@ LOCAL_AAPT_FLAGS := \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
 
-LOCAL_PACKAGE_NAME := Camera2
+LOCAL_PACKAGE_NAME := SnapdragonCamera
 
 #LOCAL_SDK_VERSION := current
 
@@ -38,4 +38,4 @@ endif
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under, $(LOCAL_PATH))
+#include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 65cb4b85503911fc3dcec2c6505fea6babc042ca..59de46fe4d7cbf031b2c501dd685909b836c7d30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.camera2">
+    package="org.codeaurora.snapcam">
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -44,7 +44,7 @@
         android:name="com.android.camera.app.CameraApp"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher_camera"
-        android:label="@string/app_name"
+        android:label="@string/snapcam_app_name"
         android:largeHeap="true"
         android:logo="@mipmap/ic_launcher_camera"
         android:restoreAnyVersion="true"
@@ -55,7 +55,7 @@
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:icon="@mipmap/ic_launcher_camera"
-            android:label="@string/app_name"
+            android:label="@string/snapcam_app_name"
             android:logo="@mipmap/ic_launcher_gallery"
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/Theme.Camera"
@@ -81,7 +81,7 @@
         <activity-alias
             android:name="com.android.camera.CameraLauncher"
             android:icon="@mipmap/ic_launcher_camera"
-            android:label="@string/app_name"
+            android:label="@string/snapcam_app_name"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -113,7 +113,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:excludeFromRecents="true"
             android:icon="@mipmap/ic_launcher_camera"
-            android:label="@string/app_name"
+            android:label="@string/snapcam_app_name"
             android:logo="@mipmap/ic_launcher_gallery"
             android:taskAffinity="com.android.camera.SecureCameraActivity"
             android:theme="@style/Theme.Camera"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47be6891ced7a5150dd622a180c9a5a4cee3cefb..56b129651981c75297940981caf6608f86cb71d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
     <string name="app_name">Camera</string>
+    <string name="snapcam_app_name">Snapdragon Camera</string>
     <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
     <string name="video_camera_label">Camcorder</string>
     <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index f1d16fda500f7ba1aff62def4a526306cc2d4e6e..02512ef7d451f99654a47c31eb6206ae10bc4b5d 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
+        xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.snapcam"
         camera:title="@string/pref_camera_settings_category">
     <IconListPreference
             camera:key="pref_camera_flashmode_key"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 2ea5fa1ba1e038b88c688a9e8d24673a2598947c..6b107a53429d845b52cfd77f8b9e4c58c2077e25 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -15,7 +15,7 @@
 -->
 
 <PreferenceGroup
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
+        xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.snapcam"
         camera:title="@string/pref_camcorder_settings_category">
     <ListPreference
             camera:key="pref_video_quality_key"
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 5ade3950ac0f9b0cc73932895984f6e1f19de674..4ad1bd0d00e0374956d76f8c2925f6ef072d101a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -88,7 +88,7 @@ import com.android.camera.util.IntentHelper;
 import com.android.camera.util.PhotoSphereHelper;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.File;
 
diff --git a/src/com/android/camera/CameraPreference.java b/src/com/android/camera/CameraPreference.java
index f2a78e9ccd7677af35a403c85e9b51b6d11a5817..fc5aa4aa6eac70854f1f116c2e8810fab5f18d9d 100644
--- a/src/com/android/camera/CameraPreference.java
+++ b/src/com/android/camera/CameraPreference.java
@@ -21,7 +21,7 @@ import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * The base class of all Preferences used in Camera. The preferences can be
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 4a05994d54c7e6380db2463067a9e9352e954ed1..721cd1c20185ed348880acb24042083d90a38f13 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -33,7 +33,7 @@ import android.util.Log;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/camera/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java
index 14819fa486e8f82c42c92c6285e6dfc27870c2ae..c256f0783cbb6a3417f313a1692cb7b30b1663e3 100644
--- a/src/com/android/camera/CountDownTimerPreference.java
+++ b/src/com/android/camera/CountDownTimerPreference.java
@@ -19,7 +19,7 @@ package com.android.camera;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class CountDownTimerPreference extends ListPreference {
     private static final int[] DURATIONS = {
diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java
index 97e729d0ec6eae0d2a8c4172d814153ac7784b36..eab0d613eebcd1a427de5e5bacd84b1756059361 100644
--- a/src/com/android/camera/IconListPreference.java
+++ b/src/com/android/camera/IconListPreference.java
@@ -23,7 +23,7 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /** A {@code ListPreference} where each entry has a corresponding icon. */
 public class IconListPreference extends ListPreference {
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 2a33fb098465efbff1aab59a3f159156f5fcd77f..b856d460edd770076386ba058590db68e65ec177 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -28,7 +28,7 @@ import android.util.TypedValue;
 
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * A type of <code>CameraPreference</code> whose number of possible values
diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index f47d9d8cbbef3e4d4356442baf37c411940a5dff..48cdebf5dfc50c1f0e63253dcf779fc872285fc3 100644
--- a/src/com/android/camera/OnScreenHint.java
+++ b/src/com/android/camera/OnScreenHint.java
@@ -25,7 +25,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * A on-screen hint is a view containing a little message for the user and will
diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java
index 64992cfae8bd6cff0a40593671a969211f6f0a6e..5f5dbc3117a1ab92d1e7487e1c23eeb62df35574 100644
--- a/src/com/android/camera/OnScreenIndicators.java
+++ b/src/com/android/camera/OnScreenIndicators.java
@@ -24,7 +24,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * The on-screen indicators of the pie menu button. They show the camera
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index dbb9925b736b24729d15181e479d6b4826a16208..98dd9baf568e6829a06d03a91380086ad28ab22f 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -28,7 +28,7 @@ import com.android.camera.ui.MoreSettingPopup;
 import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.widget.Toast;
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c10df24770930642a99c6e02688c7dee21b70024..8a616d33e0c21dc729ea8e4493628e2f907ee5f9 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -74,7 +74,7 @@ import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import com.android.internal.util.MemInfoReader;
 import android.app.ActivityManager;
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 5a085dca5c200a5976f096a1281988fcfdd75e10..48458ba0a7c966088e4b794c4d2b33149481c0fe 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -57,7 +57,7 @@ import com.android.camera.ui.PieRenderer.PieListener;
 import com.android.camera.ui.RenderOverlay;
 import com.android.camera.ui.ZoomRenderer;
 import com.android.camera.util.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.List;
 
diff --git a/src/com/android/camera/PieController.java b/src/com/android/camera/PieController.java
index d2e5b72c1b11c63914a9c2f6c15446e333aaa0fc..cc4ad65523037a9718dc9eb1af9555b7bd887836 100644
--- a/src/com/android/camera/PieController.java
+++ b/src/com/android/camera/PieController.java
@@ -26,7 +26,7 @@ import com.android.camera.drawable.TextDrawable;
 import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/camera/SoundClips.java b/src/com/android/camera/SoundClips.java
index e8e5ce733338721e9c73fd20b56c25e7235e2e0b..8ccd51d4a119cf819fd54107d76efb90d9cb2eac 100644
--- a/src/com/android/camera/SoundClips.java
+++ b/src/com/android/camera/SoundClips.java
@@ -24,7 +24,7 @@ import android.media.SoundPool;
 import android.os.Build;
 import android.util.Log;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 import com.android.camera.util.ApiHelper;
 
 /*
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 2ee2f211de4af8b4f8eed53befe83e4d3501e1b0..c150335292f56d00ccfaf320867aed2d11594d93 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -26,7 +26,7 @@ import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
 import com.android.camera.ui.TimeIntervalPopup;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class VideoMenu extends PieController
         implements MoreSettingPopup.Listener,
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 16911f1f060286a647f93c480326757646aec01a..81c6e136d7916e6891fb2716a9f806569c9f05d5 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -67,7 +67,7 @@ import com.android.camera.util.AccessibilityUtils;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 import com.android.camera.PhotoModule;
 import java.io.File;
 import java.io.IOException;
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 9ffd1a113c824538523afed4ac5db2707f766154..75105822b5e9577c3ca0a5a487357dc29f28072a 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -52,7 +52,7 @@ import com.android.camera.ui.RotateLayout;
 import com.android.camera.PauseButton.OnPauseButtonListener;
 import com.android.camera.ui.ZoomRenderer;
 import com.android.camera.util.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.List;
 
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index f6daa6019a7dc7f146dee43a41f820c4dea0c362..2259818086ab6f295ad8e6cfb9b8a91732d2030f 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -50,7 +50,7 @@ import com.android.camera.data.LocalData;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 4ee2427ebb35243c9874a83de951fff33dae94b0..57b414a432e07dcef5e9c664525020b3893596d0 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -44,7 +44,7 @@ import com.android.camera.ui.CameraControls;
 import com.android.camera.ui.CameraRootView;
 import com.android.camera.ui.ModuleSwitcher;
 import com.android.camera.util.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * The UI of {@link WideAnglePanoramaModule}.
diff --git a/src/com/android/camera/crop/CropActivity.java b/src/com/android/camera/crop/CropActivity.java
index b5351d34c406cce3fc912b34f143694ae1484c3d..9c9295dc4ebf306d45e365166ec0f59d03ec0f69 100644
--- a/src/com/android/camera/crop/CropActivity.java
+++ b/src/com/android/camera/crop/CropActivity.java
@@ -42,7 +42,7 @@ import android.view.View.OnClickListener;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com/android/camera/crop/CropView.java b/src/com/android/camera/crop/CropView.java
index a47cb0a368db8c9bb065f96cb90aa1cbbfa07db2..77a79bba76f638b3a283aea68dd749daf38ca885 100644
--- a/src/com/android/camera/crop/CropView.java
+++ b/src/com/android/camera/crop/CropView.java
@@ -32,7 +32,7 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class CropView extends View {
     private static final String LOGTAG = "CropView";
diff --git a/src/com/android/camera/data/InProgressDataWrapper.java b/src/com/android/camera/data/InProgressDataWrapper.java
index 61e87b72257f7c3ff052a13142ad05ee0212d54a..9ce968e2f30c218112bbbc358671e83440bb5452 100644
--- a/src/com/android/camera/data/InProgressDataWrapper.java
+++ b/src/com/android/camera/data/InProgressDataWrapper.java
@@ -25,7 +25,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 import com.android.camera.util.PhotoSphereHelper;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * A wrapper class for in-progress data. Data that's still being processed
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index fe56108633f28eb38168ec37e19b138b51ab5594..e77578b16c9467a320a317c98c397da7c8c39cd9 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -41,7 +41,7 @@ import android.widget.ImageView;
 import com.android.camera.ui.FilmStripView;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.PhotoSphereHelper;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.File;
 import java.text.DateFormat;
diff --git a/src/com/android/camera/data/MediaDetails.java b/src/com/android/camera/data/MediaDetails.java
index dd4c147cc11e59f03a37f7939df94459fde3eba8..f7d7fd05c3f29255784cb7bd6c4f08ada237738b 100644
--- a/src/com/android/camera/data/MediaDetails.java
+++ b/src/com/android/camera/data/MediaDetails.java
@@ -22,7 +22,7 @@ import android.util.SparseIntArray;
 
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.exif.ExifTag;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/com/android/camera/data/RotationTask.java b/src/com/android/camera/data/RotationTask.java
index 558815a508dfb9a12a98a7084c45fc5fbc2df101..de9b92f7e4c14eb66ab9d34544b905d97084f0ba 100644
--- a/src/com/android/camera/data/RotationTask.java
+++ b/src/com/android/camera/data/RotationTask.java
@@ -26,7 +26,7 @@ import android.util.Log;
 import com.android.camera.data.LocalMediaData.PhotoData;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.exif.ExifTag;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java
index d1d5af91cc4b56d14531ef3714564ef8938aeb7f..5a9f739471e10f162faa1a836d74c3cdfd0e6410 100644
--- a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java
+++ b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java
@@ -48,7 +48,7 @@ import com.android.camera.MediaSaveService.OnMediaSavedListener;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.tinyplanet.TinyPlanetPreview.PreviewSizeListener;
 import com.android.camera.util.XmpUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
diff --git a/src/com/android/camera/ui/AbstractSettingPopup.java b/src/com/android/camera/ui/AbstractSettingPopup.java
index a3cf298b5a00bf3e42907981b15c0a16c983218f..e4c7aa9fb34ca8cb64b77e79c83a1f3159ed5183 100644
--- a/src/com/android/camera/ui/AbstractSettingPopup.java
+++ b/src/com/android/camera/ui/AbstractSettingPopup.java
@@ -21,7 +21,7 @@ import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 // A popup window that shows one or more camera settings.
 abstract public class AbstractSettingPopup extends RotateLayout {
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index d211f4eef3e32060b3b03b3470ccdb9a59544ac3..9e0964b4fbd03862930e237491a89f5a57f75a0c 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -22,7 +22,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class CameraControls extends RotatableLayout {
 
diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java
index 9cfe3f9b09cf34b11143a1886f50722c0c420d39..75cdf5e8a61bbebeded172e3060ac14e272e47d0 100644
--- a/src/com/android/camera/ui/CountDownView.java
+++ b/src/com/android/camera/ui/CountDownView.java
@@ -31,7 +31,7 @@ import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class CountDownView extends FrameLayout {
 
diff --git a/src/com/android/camera/ui/CountdownTimerPopup.java b/src/com/android/camera/ui/CountdownTimerPopup.java
index 3f3a1ac7df5dd893db733e95939d72c5ac79c70e..aa121948173e1a7acb3108e4d2ff84fa6126ab0d 100644
--- a/src/com/android/camera/ui/CountdownTimerPopup.java
+++ b/src/com/android/camera/ui/CountdownTimerPopup.java
@@ -28,7 +28,7 @@ import android.widget.NumberPicker;
 import android.widget.NumberPicker.OnValueChangeListener;
 
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * This is a popup window that allows users to specify a countdown timer
diff --git a/src/com/android/camera/ui/DetailsDialog.java b/src/com/android/camera/ui/DetailsDialog.java
index 9561ef5427e092f8557c09e1507729a8b82b7df6..18428c0f2dc7875367b51e46624a61a8d6b7db1b 100644
--- a/src/com/android/camera/ui/DetailsDialog.java
+++ b/src/com/android/camera/ui/DetailsDialog.java
@@ -31,7 +31,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.camera.data.MediaDetails;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 1868e0a38407ddf2f4292ca6cc20122e8ad1fe18..9e50f166a7cf9b33d56053a3d6b68c6ab317000f 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -33,7 +33,7 @@ import android.view.View;
 
 import com.android.camera.PhotoUI;
 import com.android.camera.util.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 import org.codeaurora.camera.ExtendedFace;
 
 public class FaceView extends View
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index d0bcdfcc2608435953e8aec99b49a2f304f37b24..f892934e20a00d0d4e73a188f3bc34269bc9a9d3 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -44,7 +44,7 @@ import com.android.camera.ui.FilmstripBottomControls.BottomControlsListener;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.Arrays;
 
diff --git a/src/com/android/camera/ui/FilmstripBottomControls.java b/src/com/android/camera/ui/FilmstripBottomControls.java
index 451bc928acc589867ef77e7ab65f73ed5c61a6a0..521fd50e2c480d9fd80f5a761f461a4672899b75 100644
--- a/src/com/android/camera/ui/FilmstripBottomControls.java
+++ b/src/com/android/camera/ui/FilmstripBottomControls.java
@@ -23,7 +23,7 @@ import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 
 import com.android.camera.CameraActivity;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * Shows controls at the bottom of the screen for editing, viewing a photo
diff --git a/src/com/android/camera/ui/InLineSettingCheckBox.java b/src/com/android/camera/ui/InLineSettingCheckBox.java
index c3cd1979d279feb6d36d1a03462edc72a73f2733..556cbb7c8fc858d2f1957c4fd16138e0729aa007 100644
--- a/src/com/android/camera/ui/InLineSettingCheckBox.java
+++ b/src/com/android/camera/ui/InLineSettingCheckBox.java
@@ -24,7 +24,7 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /* A check box setting control which turns on/off the setting. */
 public class InLineSettingCheckBox extends InLineSettingItem {
diff --git a/src/com/android/camera/ui/InLineSettingItem.java b/src/com/android/camera/ui/InLineSettingItem.java
index 288781fda817a58a4ea464ae1bf12b939152fe0d..cdbe2fe6e837d897acff6da08c32600bd5f51d94 100644
--- a/src/com/android/camera/ui/InLineSettingItem.java
+++ b/src/com/android/camera/ui/InLineSettingItem.java
@@ -23,7 +23,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * A one-line camera setting could be one of three types: knob, switch or restore
diff --git a/src/com/android/camera/ui/InLineSettingMenu.java b/src/com/android/camera/ui/InLineSettingMenu.java
index 1d80741b58e0d094b9d537cf16ac17c5476b8aaa..94daa79149433171ca0bf35ce0395523b5c6aa28 100644
--- a/src/com/android/camera/ui/InLineSettingMenu.java
+++ b/src/com/android/camera/ui/InLineSettingMenu.java
@@ -23,7 +23,7 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.TextView;
 
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /* Setting menu item that will bring up a menu when you click on it. */
 public class InLineSettingMenu extends InLineSettingItem {
diff --git a/src/com/android/camera/ui/ListPrefSettingPopup.java b/src/com/android/camera/ui/ListPrefSettingPopup.java
index ff4d995a0ac76e8a37d1237e8658e69d7925229a..d66eb58d33db462e4d47d845dd63bc8f4ba7bdbd 100644
--- a/src/com/android/camera/ui/ListPrefSettingPopup.java
+++ b/src/com/android/camera/ui/ListPrefSettingPopup.java
@@ -32,7 +32,7 @@ import android.widget.SimpleAdapter;
 
 import com.android.camera.IconListPreference;
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 // A popup window that shows one camera setting. The title is the name of the
 // setting (ex: white-balance). The entries are the supported values (ex:
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index df76bbde26064b3f2c2862564d09922d5c2f3eb2..60fed24ad84fec5133f4a7d63572040c27dcaddd 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -38,7 +38,7 @@ import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.PhotoSphereHelper;
 import com.android.camera.util.UsageStatistics;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class ModuleSwitcher extends RotateImageView
         implements OnClickListener, OnTouchListener {
diff --git a/src/com/android/camera/ui/MoreSettingPopup.java b/src/com/android/camera/ui/MoreSettingPopup.java
index ad8ed772185bf0b9b0f46a466fb3e60c0008061d..2e0626e7461ddf37890e71e3180f3d13001a6fb0 100644
--- a/src/com/android/camera/ui/MoreSettingPopup.java
+++ b/src/com/android/camera/ui/MoreSettingPopup.java
@@ -30,7 +30,7 @@ import android.widget.ListView;
 
 import com.android.camera.ListPreference;
 import com.android.camera.PreferenceGroup;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /* A popup window that contains several camera settings. */
 public class MoreSettingPopup extends AbstractSettingPopup
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 0039aa22ca1e20eaa2496a8fc4be9cd471154e6e..13ead421e5662c148ac11ea1794f88f329e4e150 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -38,7 +38,7 @@ import android.view.animation.Transformation;
 
 import com.android.camera.drawable.TextDrawable;
 import com.android.camera.ui.ProgressRenderer.VisibilityListener;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/camera/ui/ProgressRenderer.java b/src/com/android/camera/ui/ProgressRenderer.java
index 50029313380b9adacd15b242626a023a473fe5b6..f7cb386fbb538f985165234593fa91cd0e235861 100644
--- a/src/com/android/camera/ui/ProgressRenderer.java
+++ b/src/com/android/camera/ui/ProgressRenderer.java
@@ -22,7 +22,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * Renders a circular progress bar on the screen.
diff --git a/src/com/android/camera/ui/RotateTextToast.java b/src/com/android/camera/ui/RotateTextToast.java
index ea12682185408472d005b72c05f877f460be6fea..10d97bf7306cf72d51996296485d95386826a9f8 100644
--- a/src/com/android/camera/ui/RotateTextToast.java
+++ b/src/com/android/camera/ui/RotateTextToast.java
@@ -24,7 +24,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.android.camera.util.CameraUtil;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class RotateTextToast {
     private static final int TOAST_DURATION = 5000; // milliseconds
diff --git a/src/com/android/camera/ui/Switch.java b/src/com/android/camera/ui/Switch.java
index 6c339977559a68eb66602adb4e68ab1bbea3b9fb..3e7b9bfb92290df713fe52a6cc11bd3b9342b4e7 100644
--- a/src/com/android/camera/ui/Switch.java
+++ b/src/com/android/camera/ui/Switch.java
@@ -39,7 +39,7 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.CompoundButton;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 /**
  * A Switch is a two-state toggle switch widget that can select between two
diff --git a/src/com/android/camera/ui/TimeIntervalPopup.java b/src/com/android/camera/ui/TimeIntervalPopup.java
index 10e256ad1606ddfca3168fd660359d6218d6f775..95fc18a5337a27c8eb84cbf50d72a0ac6420d5da 100644
--- a/src/com/android/camera/ui/TimeIntervalPopup.java
+++ b/src/com/android/camera/ui/TimeIntervalPopup.java
@@ -28,7 +28,7 @@ import android.widget.TextView;
 
 import com.android.camera.IconListPreference;
 import com.android.camera.ListPreference;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.text.NumberFormat;
 import java.util.Locale;
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java
index e708d3eea3ecb4015ef9e2cb34e8211501963240..c1f4c6c98f78512f065375fdacbe6d2252c3610a 100644
--- a/src/com/android/camera/ui/ZoomRenderer.java
+++ b/src/com/android/camera/ui/ZoomRenderer.java
@@ -24,7 +24,7 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.view.ScaleGestureDetector;
 
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 public class ZoomRenderer extends OverlayRenderer
         implements ScaleGestureDetector.OnScaleGestureListener {
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index bb7639f9fa864a808647669ec3f9139bc124a921..cfddf957e025386156d342e850387219af7b3c5f 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -58,7 +58,7 @@ import com.android.camera.CameraHolder;
 import com.android.camera.CameraManager;
 import com.android.camera.CameraSettings;
 import com.android.camera.util.IntentHelper;
-import com.android.camera2.R;
+import org.codeaurora.snapcam.R;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index a19dd387e1fba0a14e7c41c9b2bd25608958fa5d..9544aa5928094c45de883f7763556817c5d3f272 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -23,22 +23,22 @@
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-             android:targetPackage="com.android.camera2"
+             android:targetPackage="org.codeaurora.snapcam"
              android:label="Tests for Camera2 application."/>
 
     <instrumentation android:name="com.android.camera.CameraTestRunner"
-            android:targetPackage="com.android.camera2"
+            android:targetPackage="org.codeaurora.snapcam"
             android:label="Camera continuous test runner"/>
 
     <instrumentation android:name="com.android.camera.exif.ExifTestRunner"
-            android:targetPackage="com.android.camera2"
+            android:targetPackage="org.codeaurora.snapcam"
             android:label="Tests for ExifParser."/>
 
     <instrumentation android:name="com.android.camera.jpegstream.JpegStreamTestRunner"
-            android:targetPackage="com.android.camera2"
+            android:targetPackage="org.codeaurora.snapcam"
             android:label="Tests for JpegStream classes."/>
 
     <instrumentation android:name="com.android.camera.stress.CameraStressTestRunner"
-            android:targetPackage="com.android.camera2"
+            android:targetPackage="org.codeaurora.snapcam"
             android:label="Camera stress test runner"/>
 </manifest>