177 files changed, 309 insertions, 352 deletions

diff --git a/Android.mk b/Android.mk
index abcca40c9..e05cd4172 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,10 +24,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
 
 
-LOCAL_PACKAGE_NAME := Launcher2
+LOCAL_PACKAGE_NAME := Trebuchet
 LOCAL_CERTIFICATE := shared
 
-LOCAL_OVERRIDES_PACKAGES := Home
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dbeb7bce1..5b6d4fdef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,34 +19,35 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher">
+    package="com.cyanogenmod.trebuchet"
+    android:versionName="@string/application_version">
 
     <original-package android:name="com.android.launcher2" />
 
     <permission
-        android:name="com.android.launcher.permission.PRELOAD_WORKSPACE"
+        android:name="com.cyanogenmod.trebuchet.permission.PRELOAD_WORKSPACE"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="system|signature" />
     <permission
-        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
+        android:name="com.cyanogenmod.trebuchet.permission.INSTALL_SHORTCUT"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_install_shortcut"
         android:description="@string/permdesc_install_shortcut" />
     <permission
-        android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
+        android:name="com.cyanogenmod.trebuchet.permission.UNINSTALL_SHORTCUT"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_uninstall_shortcut"
         android:description="@string/permdesc_uninstall_shortcut"/>
     <permission
-        android:name="com.android.launcher.permission.READ_SETTINGS"
+        android:name="com.cyanogenmod.trebuchet.permission.READ_SETTINGS"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_read_settings"
         android:description="@string/permdesc_read_settings"/>
     <permission
-        android:name="com.android.launcher.permission.WRITE_SETTINGS"
+        android:name="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_write_settings"
@@ -58,17 +59,17 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BIND_APPWIDGET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
-    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="com.cyanogenmod.trebuchet.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS" />
 
     <application
-        android:name="com.android.launcher2.LauncherApplication"
+        android:name="com.cyanogenmod.trebuchet.LauncherApplication"
         android:label="@string/application_name"
         android:icon="@drawable/ic_launcher_home"
         android:hardwareAccelerated="@bool/config_hardwareAccelerated"
         android:largeHeap="@bool/config_largeHeap">
         <activity
-            android:name="com.android.launcher2.Launcher"
+            android:name="com.cyanogenmod.trebuchet.Launcher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
@@ -84,7 +85,7 @@
         </activity>
 
         <activity
-            android:name="com.android.launcher2.WallpaperChooser"
+            android:name="com.cyanogenmod.trebuchet.WallpaperChooser"
             style="@style/Theme.WallpaperPicker"
             android:label="@string/pick_wallpaper"
             android:icon="@drawable/ic_launcher_wallpaper"
@@ -98,7 +99,7 @@
                 android:resource="@xml/wallpaper_picker_preview" />
         </activity>
 
-        <activity android:name="com.android.launcher2.RocketLauncher"
+        <activity android:name="com.cyanogenmod.trebuchet.RocketLauncher"
             android:label="@string/dream_name"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
             <intent-filter>
@@ -110,37 +111,37 @@
 
         <!-- Intent received used to prepopulate the default workspace. -->
         <receiver
-            android:name="com.android.launcher2.PreloadReceiver"
-            android:permission="com.android.launcher.permission.PRELOAD_WORKSPACE">
+            android:name="com.cyanogenmod.trebuchet.PreloadReceiver"
+            android:permission="com.cyanogenmod.trebuchet.permission.PRELOAD_WORKSPACE">
             <intent-filter>
-                <action android:name="com.android.launcher.action.PRELOAD_WORKSPACE" />
+                <action android:name="com.cyanogenmod.trebuchet.action.PRELOAD_WORKSPACE" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to install shortcuts from other applications -->
         <receiver
-            android:name="com.android.launcher2.InstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT">
+            android:name="com.cyanogenmod.trebuchet.InstallShortcutReceiver"
+            android:permission="com.cyanogenmod.trebuchet.permission.INSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
+                <action android:name="com.cyanogenmod.trebuchet.action.INSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to uninstall shortcuts from other applications -->
         <receiver
-            android:name="com.android.launcher2.UninstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">
+            android:name="com.cyanogenmod.trebuchet.UninstallShortcutReceiver"
+            android:permission="com.cyanogenmod.trebuchet.permission.UNINSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
+                <action android:name="com.cyanogenmod.trebuchet.action.UNINSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
         <!-- The settings provider contains Home's data, like the workspace favorites -->
         <provider
-            android:name="com.android.launcher2.LauncherProvider"
-            android:authorities="com.android.launcher2.settings"
-            android:writePermission="com.android.launcher.permission.WRITE_SETTINGS"
-            android:readPermission="com.android.launcher.permission.READ_SETTINGS" />
+            android:name="com.cyanogenmod.trebuchet.LauncherProvider"
+            android:authorities="com.cyanogenmod.trebuchet.settings"
+            android:writePermission="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS"
+            android:readPermission="com.cyanogenmod.trebuchet.permission.READ_SETTINGS" />
 
         <meta-data android:name="android.nfc.disable_beam_default"
                        android:value="true" />
diff --git a/fill_screens.py b/fill_screens.py
index 5841b8e49..c4badb9f6 100755
--- a/fill_screens.py
+++ b/fill_screens.py
@@ -34,7 +34,7 @@ def make_dir():
 def pull_file(fn):
   print "pull_file: " + fn
   rv = os.system("adb pull"
-    + " /data/data/com.android.launcher/databases/launcher.db"
+    + " /data/data/com.cyanogenmod.trebuchet/databases/launcher.db"
     + " " + fn);
   if rv != 0:
     print "adb pull failed"
@@ -44,7 +44,7 @@ def push_file(fn):
   print "push_file: " + fn
   rv = os.system("adb push"
     + " " + fn
-    + " /data/data/com.android.launcher/databases/launcher.db")
+    + " /data/data/com.cyanogenmod.trebuchet/databases/launcher.db")
   if rv != 0:
     print "adb push failed"
     sys.exit(1)
diff --git a/print_db.py b/print_db.py
index 4f90f94f1..b5bb8d4a5 100755
--- a/print_db.py
+++ b/print_db.py
@@ -32,7 +32,7 @@ def make_dir():
 def pull_file(fn):
   print "pull_file: " + fn
   rv = os.system("adb pull"
-    + " /data/data/com.android.launcher/databases/launcher.db"
+    + " /data/data/com.cyanogenmod.trebuchet/databases/launcher.db"
     + " " + fn);
   if rv != 0:
     print "adb pull failed"
diff --git a/proguard.flags b/proguard.flags
index 0cde28ec1..4a279151b 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,4 +1,4 @@
--keep class com.android.launcher2.Launcher {
+-keep class com.cyanogenmod.trebuchet.Launcher {
   public void previousScreen(android.view.View);
   public void nextScreen(android.view.View);
   public void launchHotSeat(android.view.View);
@@ -11,7 +11,7 @@
   public void dismissAllAppsCling(android.view.View);
 }
 
--keep class com.android.launcher2.CellLayout {
+-keep class com.cyanogenmod.trebuchet.CellLayout {
   public float getBackgroundAlpha();
   public void setBackgroundAlpha(float);
   public float getDimmableProgress();
@@ -22,7 +22,7 @@
   public void setHoverAlpha(float);
 }
 
--keep class com.android.launcher2.DragLayer$LayoutParams {
+-keep class com.cyanogenmod.trebuchet.DragLayer$LayoutParams {
   public void setWidth(int);
   public int getWidth();
   public void setHeight(int);
@@ -33,7 +33,7 @@
   public int getY();
 }
 
--keep class com.android.launcher2.CellLayout$LayoutParams {
+-keep class com.cyanogenmod.trebuchet.CellLayout$LayoutParams {
   public void setWidth(int);
   public int getWidth();
   public void setHeight(int);
@@ -44,7 +44,7 @@
   public int getY();
 }
 
--keep class com.android.launcher2.Workspace {
+-keep class com.cyanogenmod.trebuchet.Workspace {
   public float getBackgroundAlpha();
   public void setBackgroundAlpha(float);
   public float getChildrenOutlineAlpha();
@@ -55,10 +55,10 @@
   public float getHorizontalWallpaperOffset();
 }
 
--keep class com.android.launcher2.AllApps3D$Defines {
+-keep class com.cyanogenmod.trebuchet.AllApps3D$Defines {
   *;
 }
 
--keep class com.android.launcher2.ClippedImageView {
+-keep class com.cyanogenmod.trebuchet.ClippedImageView {
   *;
 }
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml
index e89d4c178..e8bd5fa02 100644
--- a/res/layout-land/all_apps_cling.xml
+++ b/res/layout-land/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="all_apps_landscape">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 9ed1fa115..422ecbf4a 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Landscape"
    android:focusable="true"
    android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-land/apps_customize_application.xml b/res/layout-land/apps_customize_application.xml
index ba95b27a6..e79ab75e4 100644
--- a/res/layout-land/apps_customize_application.xml
+++ b/res/layout-land/apps_customize_application.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon
+<com.cyanogenmod.trebuchet.PagedViewIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     style="@style/WorkspaceIcon.Landscape.AppsCustomize"
 
diff --git a/res/layout-land/drop_target_bar.xml b/res/layout-land/drop_target_bar.xml
index 794a79edb..f3fb4001a 100644
--- a/res/layout-land/drop_target_bar.xml
+++ b/res/layout-land/drop_target_bar.xml
@@ -19,7 +19,7 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Delete target -->
-        <com.android.launcher2.DeleteDropTarget
+        <com.cyanogenmod.trebuchet.DeleteDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/delete_target_text"
             android:drawableTop="@drawable/remove_target_selector" />
@@ -29,7 +29,7 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Info target -->
-        <com.android.launcher2.InfoDropTarget
+        <com.cyanogenmod.trebuchet.InfoDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/info_target_text"
             android:drawableTop="@drawable/info_target_selector" />
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml
index 3d7f4f459..2fa73fe26 100644
--- a/res/layout-land/folder_cling.xml
+++ b/res/layout-land/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="folder_landscape">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index 808ff5e7b..5e4126f72 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.FolderIcon
+<com.cyanogenmod.trebuchet.FolderIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
         android:layout_width="@dimen/folder_preview_size"
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
-    <com.android.launcher2.BubbleTextView
+    <com.cyanogenmod.trebuchet.BubbleTextView
         android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Landscape.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.cyanogenmod.trebuchet.FolderIcon>
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index d75919671..2b1334762 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -13,12 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Hotseat
+<com.cyanogenmod.trebuchet.Hotseat
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:cellCountX="1"
     launcher:cellCountY="@integer/hotseat_cell_count">
-    <com.android.launcher2.CellLayout
+    <com.cyanogenmod.trebuchet.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,4 +33,4 @@
         launcher:widthGap="@dimen/hotseat_width_gap"
         launcher:heightGap="@dimen/hotseat_height_gap"
         launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.cyanogenmod.trebuchet.Hotseat>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 6b65f5666..ff25506ce 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     android:id="@+id/drag_layer"
     android:background="@drawable/workspace_bg"
@@ -24,7 +24,7 @@
     android:layout_height="match_parent">
 
     <!-- The workspace contains 5 screens of cells -->
-    <com.android.launcher2.Workspace
+    <com.cyanogenmod.trebuchet.Workspace
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -44,7 +44,7 @@
         <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.android.launcher2.Workspace>
+    </com.cyanogenmod.trebuchet.Workspace>
 
     <include
         android:id="@+id/qsb_divider"
@@ -76,7 +76,7 @@
         android:id="@+id/qsb_bar"
         layout="@layout/qsb_bar" />
 
-    <com.android.launcher2.DrawableStateProxyView
+    <com.cyanogenmod.trebuchet.DrawableStateProxyView
         android:id="@+id/voice_button_proxy"
         android:layout_width="@dimen/qsb_bar_height"
         android:layout_height="@dimen/app_icon_size"
@@ -103,4 +103,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index 88b7bbf4e..25040c11f 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -18,7 +18,7 @@
     android:layout_width="@dimen/qsb_bar_height"
     android:layout_height="match_parent">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicImageView
+   <com.cyanogenmod.trebuchet.HolographicImageView
         style="@style/SearchButton"
         android:id="@+id/search_button"
         android:layout_width="match_parent"
@@ -32,7 +32,7 @@
         android:contentDescription="@string/accessibility_search_button" />
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicImageView
+    <com.cyanogenmod.trebuchet.HolographicImageView
         style="@style/SearchButton"
         android:id="@+id/voice_button"
         android:layout_width="match_parent"
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index b66f1bd8a..130170304 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="workspace_landscape">
     <FrameLayout
         android:layout_width="match_parent"
@@ -50,4 +50,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml
index 09414ce53..ed188e7cf 100644
--- a/res/layout-port/all_apps_cling.xml
+++ b/res/layout-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="all_apps_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index ddc835420..6e2e756d5 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Portrait"
    android:focusable="true"
    android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-port/apps_customize_application.xml b/res/layout-port/apps_customize_application.xml
index 84a8712d7..213fe21f7 100644
--- a/res/layout-port/apps_customize_application.xml
+++ b/res/layout-port/apps_customize_application.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon
+<com.cyanogenmod.trebuchet.PagedViewIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     style="@style/WorkspaceIcon.Portrait.AppsCustomize"
 
diff --git a/res/layout-port/drop_target_bar.xml b/res/layout-port/drop_target_bar.xml
index 5fcddc9a0..dbd1a295d 100644
--- a/res/layout-port/drop_target_bar.xml
+++ b/res/layout-port/drop_target_bar.xml
@@ -19,7 +19,7 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Delete target -->
-        <com.android.launcher2.DeleteDropTarget
+        <com.cyanogenmod.trebuchet.DeleteDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/delete_target_text"
             android:text="@string/delete_zone_label_workspace"
@@ -30,7 +30,7 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Info target -->
-        <com.android.launcher2.InfoDropTarget
+        <com.cyanogenmod.trebuchet.InfoDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/info_target_text"
             android:text="@string/info_target_label"
diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml
index d2796a0e5..c107a5a35 100644
--- a/res/layout-port/folder_cling.xml
+++ b/res/layout-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="folder_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -46,4 +46,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index 5ee1327a3..523edf93c 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.FolderIcon
+<com.cyanogenmod.trebuchet.FolderIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
         android:layout_width="@dimen/folder_preview_size"
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
-    <com.android.launcher2.BubbleTextView
+    <com.cyanogenmod.trebuchet.BubbleTextView
         android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Portrait.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.cyanogenmod.trebuchet.FolderIcon>
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index 376173ae9..0420469eb 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -13,12 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Hotseat
+<com.cyanogenmod.trebuchet.Hotseat
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:cellCountX="@integer/hotseat_cell_count"
     launcher:cellCountY="1">
-    <com.android.launcher2.CellLayout
+    <com.cyanogenmod.trebuchet.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -33,4 +33,4 @@
         launcher:widthGap="@dimen/hotseat_width_gap"
         launcher:heightGap="@dimen/hotseat_height_gap"
         launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.cyanogenmod.trebuchet.Hotseat>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index a4275010b..6f7961779 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     android:id="@+id/drag_layer"
     android:background="@drawable/workspace_bg"
@@ -41,7 +41,7 @@
         android:layout_marginBottom="@dimen/button_bar_height" />
 
     <!-- The workspace contains 5 screens of cells -->
-    <com.android.launcher2.Workspace
+    <com.cyanogenmod.trebuchet.Workspace
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -61,7 +61,7 @@
         <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-    </com.android.launcher2.Workspace>
+    </com.cyanogenmod.trebuchet.Workspace>
 
     <include layout="@layout/hotseat"
         android:id="@+id/hotseat"
@@ -73,7 +73,7 @@
         android:id="@+id/qsb_bar"
         layout="@layout/qsb_bar" />
 
-    <com.android.launcher2.DrawableStateProxyView
+    <com.cyanogenmod.trebuchet.DrawableStateProxyView
         android:id="@+id/voice_button_proxy"
         android:layout_width="80dp"
         android:layout_height="@dimen/qsb_bar_height"
@@ -100,4 +100,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 85da2f155..c069c43e0 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -15,14 +15,14 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     style="@style/SearchDropTargetBar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/search_bar_height"
     android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicLinearLayout
+   <com.cyanogenmod.trebuchet.HolographicLinearLayout
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/search_button"
         android:id="@+id/search_button_container"
@@ -43,10 +43,10 @@
             android:layout_height="match_parent"
             android:src="@drawable/ic_home_search_normal_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.cyanogenmod.trebuchet.HolographicLinearLayout>
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicLinearLayout
+    <com.cyanogenmod.trebuchet.HolographicLinearLayout
         style="@style/SearchButton.Voice"
         launcher:sourceImageViewId="@+id/voice_button"
         android:id="@+id/voice_button_container"
@@ -67,5 +67,5 @@
             android:layout_height="match_parent"
             android:src="@drawable/ic_home_voice_search_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.cyanogenmod.trebuchet.HolographicLinearLayout>
 </RelativeLayout>
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index 10e697620..03f317920 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="workspace_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -53,4 +53,4 @@
         android:layout_marginRight="10dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index 049822408..4ae4a0a4c 100644
--- a/res/layout-sw600dp-port/all_apps_cling.xml
+++ b/res/layout-sw600dp-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="all_apps_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -47,4 +47,4 @@
         android:layout_marginRight="36dp"
         android:layout_gravity="top|right"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index e3a9caa22..5f9495b57 100644
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ b/res/layout-sw600dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="folder_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -48,4 +48,4 @@
         android:layout_marginRight="36dp"
         android:layout_gravity="bottom|right"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp-land/application.xml b/res/layout-sw720dp-land/application.xml
index 9393f7e40..e6e681dc2 100644
--- a/res/layout-sw720dp-land/application.xml
+++ b/res/layout-sw720dp-land/application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Landscape"
    android:focusable="true"
    android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-sw720dp-port/application.xml b/res/layout-sw720dp-port/application.xml
index af7a8a4df..a849355e8 100644
--- a/res/layout-sw720dp-port/application.xml
+++ b/res/layout-sw720dp-port/application.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.cyanogenmod.trebuchet.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-sw720dp-port/folder_cling.xml b/res/layout-sw720dp-port/folder_cling.xml
index 017d0fde9..3a11dff77 100644
--- a/res/layout-sw720dp-port/folder_cling.xml
+++ b/res/layout-sw720dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="folder_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissFolderCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp-port/workspace_cling.xml b/res/layout-sw720dp-port/workspace_cling.xml
index 29bea810d..cf9b614dd 100644
--- a/res/layout-sw720dp-port/workspace_cling.xml
+++ b/res/layout-sw720dp-port/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="workspace_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -49,4 +49,4 @@
         android:layout_gravity="right"
         android:gravity="right"
         android:text="@string/workspace_cling_open_all_apps" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml
index 7079b2107..b2f0f6f05 100644
--- a/res/layout-sw720dp/all_apps_cling.xml
+++ b/res/layout-sw720dp/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="all_apps_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissAllAppsCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml
index 4188804c2..7ab4cb1d5 100644
--- a/res/layout-sw720dp/folder_cling.xml
+++ b/res/layout-sw720dp/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="folder_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissFolderCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 65149f29a..d5f36accb 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.DragLayer
+<com.cyanogenmod.trebuchet.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
 
     android:id="@+id/drag_layer"
@@ -50,4 +50,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
-</com.android.launcher2.DragLayer>
+</com.cyanogenmod.trebuchet.DragLayer>
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 55ec959de..b4c948271 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicImageView
+   <com.cyanogenmod.trebuchet.HolographicImageView
         style="@style/SearchButton"
         android:id="@+id/search_button"
         android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
         android:clickable="true" />
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicImageView
+    <com.cyanogenmod.trebuchet.HolographicImageView
         style="@style/SearchButton.Voice"
         android:id="@+id/voice_button"
         android:layout_width="wrap_content"
@@ -55,7 +55,7 @@
         android:contentDescription="@string/accessibility_voice_search_button" />
 
     <!-- AppsCustomize icon -->
-    <com.android.launcher2.HolographicImageView
+    <com.cyanogenmod.trebuchet.HolographicImageView
         android:id="@+id/all_apps_button"
         android:onClick="onClickAllAppsButton"
         android:layout_width="wrap_content"
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index 5658a4b4f..352c4d709 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -16,9 +16,9 @@
 
 <!-- The workspace contains 5 screens of cells -->
 
-<com.android.launcher2.Workspace
+<com.cyanogenmod.trebuchet.Workspace
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     android:paddingLeft="@dimen/workspace_left_padding"
     android:paddingRight="@dimen/workspace_right_padding"
     android:paddingTop="@dimen/workspace_top_padding"
@@ -30,4 +30,4 @@
       <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
       <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
       <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-</com.android.launcher2.Workspace>
\ No newline at end of file
+</com.cyanogenmod.trebuchet.Workspace>
\ No newline at end of file
diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml
index fd7d4f8b5..959a4f0c4 100644
--- a/res/layout-sw720dp/workspace_cling.xml
+++ b/res/layout-sw720dp/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.cyanogenmod.trebuchet.Cling
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     launcher:drawIdentifier="workspace_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -49,4 +49,4 @@
         android:layout_gravity="right"
         android:gravity="right"
         android:text="@string/workspace_cling_open_all_apps" />
-</com.android.launcher2.Cling>
+</com.cyanogenmod.trebuchet.Cling>
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index efd29a673..f41cd34f3 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.AppsCustomizeTabHost
+<com.cyanogenmod.trebuchet.AppsCustomizeTabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     android:background="#FF000000">
     <LinearLayout
         android:id="@+id/apps_customize_content"
@@ -31,7 +31,7 @@
             android:layout_height="@dimen/apps_customize_tab_bar_height"
             android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top"
             android:layout_gravity="center_horizontal">
-            <com.android.launcher2.FocusOnlyTabWidget
+            <com.cyanogenmod.trebuchet.FocusOnlyTabWidget
                 android:id="@android:id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -50,7 +50,7 @@
             android:id="@android:id/tabcontent"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <com.android.launcher2.AppsCustomizePagedView
+            <com.cyanogenmod.trebuchet.AppsCustomizePagedView
                 android:id="@+id/apps_customize_pane_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -90,4 +90,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
-</com.android.launcher2.AppsCustomizeTabHost>
+</com.cyanogenmod.trebuchet.AppsCustomizeTabHost>
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index abb7508b5..76bcd773b 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.PagedViewWidget
+<com.cyanogenmod.trebuchet.PagedViewWidget
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,7 +26,7 @@
     android:focusable="true">
 
     <!-- The preview of the widget or shortcut. -->
-    <com.android.launcher2.PagedViewWidgetImageView
+    <com.cyanogenmod.trebuchet.PagedViewWidgetImageView
         android:id="@+id/widget_preview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -74,4 +74,4 @@
     </LinearLayout>
 
 
-</com.android.launcher2.PagedViewWidget>
+</com.cyanogenmod.trebuchet.PagedViewWidget>
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index 322dc006f..563026df1 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.SearchDropTargetBar
+<com.cyanogenmod.trebuchet.SearchDropTargetBar
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/QSBBar"
     android:focusable="false">
@@ -30,4 +30,4 @@
         <include
             layout="@layout/drop_target_bar" />
     </LinearLayout>
-</com.android.launcher2.SearchDropTargetBar>
+</com.cyanogenmod.trebuchet.SearchDropTargetBar>
diff --git a/res/layout/tab_widget_indicator.xml b/res/layout/tab_widget_indicator.xml
index df43d3ddd..9a14032b2 100644
--- a/res/layout/tab_widget_indicator.xml
+++ b/res/layout/tab_widget_indicator.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.AccessibleTabView
+<com.cyanogenmod.trebuchet.AccessibleTabView
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/TabIndicator.AppsCustomize" />
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 208390d1e..cd63b1954 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -14,15 +14,15 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.Folder
+<com.cyanogenmod.trebuchet.Folder
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/portal_container_holo">
 
-    <com.android.launcher2.CellLayout
+    <com.cyanogenmod.trebuchet.CellLayout
         android:id="@+id/folder_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
         launcher:cellWidth="@dimen/folder_cell_width"
         launcher:cellHeight="@dimen/folder_cell_height" />
 
-    <com.android.launcher2.FolderEditText
+    <com.cyanogenmod.trebuchet.FolderEditText
         android:id="@+id/folder_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,4 +52,4 @@
         android:gravity="center_horizontal"
         android:singleLine="true"
         android:imeOptions="flagNoExtractUi"/>
-</com.android.launcher2.Folder>
+</com.cyanogenmod.trebuchet.Folder>
diff --git a/res/layout/wallpaper_chooser_base.xml b/res/layout/wallpaper_chooser_base.xml
index fa8ea9372..cf149c0db 100644
--- a/res/layout/wallpaper_chooser_base.xml
+++ b/res/layout/wallpaper_chooser_base.xml
@@ -21,7 +21,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <fragment class="com.android.launcher2.WallpaperChooserDialogFragment"
+    <fragment class="com.cyanogenmod.trebuchet.WallpaperChooserDialogFragment"
         android:id="@+id/wallpaper_chooser_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
index d6e66f69d..37b11dea5 100644
--- a/res/layout/workspace_screen.xml
+++ b/res/layout/workspace_screen.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.CellLayout
+<com.cyanogenmod.trebuchet.CellLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 72ba85526..8922b651d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Lanseerpoort"</string>
     <string name="home" msgid="5921706419368316758">"Tuis"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Kernprogramme"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2319638be..6fd0c86df 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"አስነሺ"</string>
     <string name="home" msgid="5921706419368316758">"መነሻ"</string>
     <string name="uid_name" msgid="3371120195364560632">"የAndroid ኮር ትግበራዎች"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0ddd36970..dd047208e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"المشغل"</string>
     <string name="home" msgid="5921706419368316758">"المنزل"</string>
     <string name="uid_name" msgid="3371120195364560632">"تطبيقات Android المركزية"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 150434f40..333bfc889 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Панэль запуску"</string>
     <string name="home" msgid="5921706419368316758">"На галоўную старонку"</string>
     <string name="uid_name" msgid="3371120195364560632">"Асноўныя прыкладанні для Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f435ff65a..0e5a62076 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Стартов панел"</string>
     <string name="home" msgid="5921706419368316758">"Начало"</string>
     <string name="uid_name" msgid="3371120195364560632">"Основни приложения на Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6ed84db92..c5b9c4815 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Barra d\'execució ràpida"</string>
     <string name="home" msgid="5921706419368316758">"Pàgina d\'inici"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicacions principals d\'Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dea19f6c5..18d63e9ca 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Plocha"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index af00d825b..7e123c5d1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Startside"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android-kerneprogrammer"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0b01e4272..ed3872d00 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Übersicht"</string>
     <string name="home" msgid="5921706419368316758">"Startbildschirm"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 78e153ab0..23de9233c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Αρχική σελίδα"</string>
     <string name="uid_name" msgid="3371120195364560632">"Βασικές εφαρμογές Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ceb215a73..4ed5f7a61 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Home"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc6566dfb..f7b2cbb6b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Casa"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicaciones del núcleo de Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2987f3e51..199d72cab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Casa"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicaciones básicas de Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 78c983a38..67c30bf78 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Käivitaja"</string>
     <string name="home" msgid="5921706419368316758">"Kodu"</string>
     <string name="uid_name" msgid="3371120195364560632">"Androidi tuumrakendused"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d03e82a09..607803a1d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"راه انداز"</string>
     <string name="home" msgid="5921706419368316758">"صفحه اصلی"</string>
     <string name="uid_name" msgid="3371120195364560632">"برنامه های Android Core"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 29f38267f..adf68e80d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Käynnistysohjelma"</string>
     <string name="home" msgid="5921706419368316758">"Aloitusruutu"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core -sovellukset"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 43bf8379e..348c6d44b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Lanceur d\'applications"</string>
     <string name="home" msgid="5921706419368316758">"Accueil"</string>
     <string name="uid_name" msgid="3371120195364560632">"Applications de base Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c5ae89a44..f481e41ce 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"लॉन्चर"</string>
     <string name="home" msgid="5921706419368316758">"मुखपृष्ठ"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android मुख्य एप्लिकेशन"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 665d7b3ff..c10e827ed 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Pokretač"</string>
     <string name="home" msgid="5921706419368316758">"Početna"</string>
     <string name="uid_name" msgid="3371120195364560632">"Matične aplikacije za Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 761ee7217..f090f133d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Indító"</string>
     <string name="home" msgid="5921706419368316758">"Főoldal"</string>
     <string name="uid_name" msgid="3371120195364560632">"Alap Android-alkalmazások"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3ba622584..24c5c9e78 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Peluncur"</string>
     <string name="home" msgid="5921706419368316758">"Beranda"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9a73872e6..ece2e9e01 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Avvio applicazioni"</string>
     <string name="home" msgid="5921706419368316758">"Home"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8dd6cd933..be4a64b22 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"מפעיל"</string>
     <string name="home" msgid="5921706419368316758">"בית"</string>
     <string name="uid_name" msgid="3371120195364560632">"יישומי ליבה של Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7e29730f9..756de5218 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"ランチャー"</string>
     <string name="home" msgid="5921706419368316758">"Home"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 990dcfb63..34515daaf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"홈"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core 애플리케이션"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 885ecf0cf..9f0638eed 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Paleidimo priemonė"</string>
     <string name="home" msgid="5921706419368316758">"Pagrindinis"</string>
     <string name="uid_name" msgid="3371120195364560632">"Pagrindinės „Android“ programos"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c1cd54535..ab730923a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Palaidējs"</string>
     <string name="home" msgid="5921706419368316758">"Sākums"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android kodola lietojumprogrammas"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3f2d0d84b..11a5cc466 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Pelancar"</string>
     <string name="home" msgid="5921706419368316758">"Laman Utama"</string>
     <string name="uid_name" msgid="3371120195364560632">"Apl Teras Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a3455165a..e7bbc3466 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Utskytingsrampe"</string>
     <string name="home" msgid="5921706419368316758">"Home"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android-kjerneapplikasjoner"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 457ac307d..41e91159d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Startpagina"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android-kerntoepassingen"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 20b421737..12596ab08 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Program uruchamiający"</string>
     <string name="home" msgid="5921706419368316758">"Strona główna"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplikacje główne systemu Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d7cedc09f..94025d519 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Página Inicial"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicações Principais do Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 53468bfe4..c289305b6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Início"</string>
     <string name="uid_name" msgid="3371120195364560632">"Principais aplicativos do Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 99f72bb1e..34d47c8bb 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Lantschader"</string>
     <!-- no translation found for home (5921706419368316758) -->
     <skip />
     <string name="uid_name" msgid="3371120195364560632">"Applicaziuns da basa dad Android"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1ed96ac5b..8b1cac315 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Lansator"</string>
     <string name="home" msgid="5921706419368316758">"Ecran de pornire"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c2b88d519..765fa02a1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Главный экран"</string>
     <string name="uid_name" msgid="3371120195364560632">"Основные приложения"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 43c4c1675..d648dc21e 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Spúšťač"</string>
     <string name="home" msgid="5921706419368316758">"Plocha"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3217c0a18..f5af01ccf 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Zaganjalnik"</string>
     <string name="home" msgid="5921706419368316758">"Začetna stran"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5dd726a82..7c0a00dee 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Покретач"</string>
     <string name="home" msgid="5921706419368316758">"Кућни"</string>
     <string name="uid_name" msgid="3371120195364560632">"Основне Android апликације"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 067b5f10b..aed344085 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Startbild"</string>
     <string name="home" msgid="5921706419368316758">"Startsida"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 91070ad77..3deb934aa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"ตัวเรียกใช้งาน"</string>
     <string name="home" msgid="5921706419368316758">"หน้าแรก"</string>
     <string name="uid_name" msgid="3371120195364560632">"แอปหลัก Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index dfa535754..6c68bb5df 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Home"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d9ce91529..0e5100b1c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Ana Ekran"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5031ea996..5f9eaf0fe 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Пан. запуску"</string>
     <string name="home" msgid="5921706419368316758">"Домашня сторінка"</string>
     <string name="uid_name" msgid="3371120195364560632">"Служби Android Core"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 232aa0a13..d77c5a549 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Trình khởi chạy"</string>
     <string name="home" msgid="5921706419368316758">"Trang chủ"</string>
     <string name="uid_name" msgid="3371120195364560632">"Ứng dụng Lõi Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f5eeab19c..7d34eedba 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"启动器"</string>
     <string name="home" msgid="5921706419368316758">"主屏幕"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android 核心应用"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f261ddfb6..f952277f5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"啟動器"</string>
     <string name="home" msgid="5921706419368316758">"住家"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6faa63d01..ed1e57de6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -19,7 +19,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Isiqalisi"</string>
     <string name="home" msgid="5921706419368316758">"Ikhaya"</string>
     <string name="uid_name" msgid="3371120195364560632">"I-Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4aee339e4..69d2055f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,11 @@
     <!-- General -->
     <skip />
     <!-- Application name -->
-    <string name="application_name">Launcher</string>
+    <string name="application_name" translatable="false">Trebuchet</string>
+    <!-- Application copyright -->
+    <string name="application_copyright">Copyright \u00A9 CyanogenMod 2012</string>
+    <!-- Application version -->
+    <string name="application_version">0.1</string>
     <!-- Accessibility-facing application name -->
     <string name="home">Home</string>
     <!-- Name for all applications running as this uid. -->
diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 3afb3b755..bf5060546 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index 6302d7e04..e6651aae2 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/default_workspace.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index f2f4240ab..4c50d8481 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 44a3f9efa..5c2547988 100644
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_workspace.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet">
     <!-- Update the db with new hotseat items.  Note that we reference the browser's original
          package name. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
diff --git a/src/com/android/launcher2/AccessibleTabView.java b/src/com/cyanogenmod/trebuchet/AccessibleTabView.java
index 101f139e7..de5a6893f 100644
--- a/src/com/android/launcher2/AccessibleTabView.java
+++ b/src/com/cyanogenmod/trebuchet/AccessibleTabView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/cyanogenmod/trebuchet/AddAdapter.java
index c2a424b00..5a3d43d05 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/cyanogenmod/trebuchet/AddAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -27,7 +27,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * Adapter showing the types of items that can be added to a {@link Workspace}.
diff --git a/src/com/android/launcher2/Alarm.java b/src/com/cyanogenmod/trebuchet/Alarm.java
index 7cd21c327..61efce42f 100644
--- a/src/com/android/launcher2/Alarm.java
+++ b/src/com/cyanogenmod/trebuchet/Alarm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.os.Handler;
 
diff --git a/src/com/android/launcher2/AllAppsList.java b/src/com/cyanogenmod/trebuchet/AllAppsList.java
index 051b0bd1d..cc0e8cfd5 100644
--- a/src/com/android/launcher2/AllAppsList.java
+++ b/src/com/cyanogenmod/trebuchet/AllAppsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/cyanogenmod/trebuchet/AllAppsView.java
index e8ca61fb3..d47b524f1 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/cyanogenmod/trebuchet/AllAppsView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java
index 882468624..fdd8b3edd 100644
--- a/src/com/android/launcher2/AppWidgetResizeFrame.java
+++ b/src/com/cyanogenmod/trebuchet/AppWidgetResizeFrame.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -13,7 +13,7 @@ import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class AppWidgetResizeFrame extends FrameLayout {
     private LauncherAppWidgetHostView mWidgetView;
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/cyanogenmod/trebuchet/ApplicationInfo.java
index 281d59c68..ffc7a5c53 100644
--- a/src/com/android/launcher2/ApplicationInfo.java
+++ b/src/com/cyanogenmod/trebuchet/ApplicationInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.ComponentName;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
index a50836168..5a58a9a95 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -63,8 +63,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.DropTarget.DragObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
index 9fa2f3237..917f62ed0 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/cyanogenmod/trebuchet/AppsCustomizeTabHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -34,7 +34,7 @@ import android.widget.TabHost;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/cyanogenmod/trebuchet/BubbleTextView.java
index ddc4b9fa0..7b33a5e1f 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/cyanogenmod/trebuchet/BubbleTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/ButtonDropTarget.java b/src/com/cyanogenmod/trebuchet/ButtonDropTarget.java
index 1c9fa5f95..8f819ea2f 100644
--- a/src/com/android/launcher2/ButtonDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/ButtonDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,7 +24,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 
 /**
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index c028ff1dc..39a51d9b7 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -47,8 +47,8 @@ import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LayoutAnimationController;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderIcon.FolderRingAnimator;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.FolderIcon.FolderRingAnimator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/launcher2/CheckLongPressHelper.java b/src/com/cyanogenmod/trebuchet/CheckLongPressHelper.java
index 5c3752ad6..4b17fee4c 100644
--- a/src/com/android/launcher2/CheckLongPressHelper.java
+++ b/src/com/cyanogenmod/trebuchet/CheckLongPressHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.view.View;
 
diff --git a/src/com/android/launcher2/Cling.java b/src/com/cyanogenmod/trebuchet/Cling.java
index 646c54e90..41704a5ba 100644
--- a/src/com/android/launcher2/Cling.java
+++ b/src/com/cyanogenmod/trebuchet/Cling.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -34,7 +34,7 @@ import android.view.View;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class Cling extends FrameLayout {
 
diff --git a/src/com/android/launcher2/DeferredHandler.java b/src/com/cyanogenmod/trebuchet/DeferredHandler.java
index 930da56aa..48582f0ec 100644
--- a/src/com/android/launcher2/DeferredHandler.java
+++ b/src/com/cyanogenmod/trebuchet/DeferredHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.LinkedList;
 
diff --git a/src/com/android/launcher2/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
index 949c035ea..9576566a1 100644
--- a/src/com/android/launcher2/DeleteDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -35,7 +35,7 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class DeleteDropTarget extends ButtonDropTarget {
     private static int DELETE_ANIMATION_DURATION = 285;
diff --git a/src/com/android/launcher2/DragController.java b/src/com/cyanogenmod/trebuchet/DragController.java
index 84f151581..cdb5060f9 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/cyanogenmod/trebuchet/DragController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,7 +33,7 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/cyanogenmod/trebuchet/DragLayer.java
index 4be1914e0..76b74e9c5 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/cyanogenmod/trebuchet/DragLayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -41,7 +41,7 @@ import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/DragScroller.java b/src/com/cyanogenmod/trebuchet/DragScroller.java
index a3ee6c237..5c47fc633 100644
--- a/src/com/android/launcher2/DragScroller.java
+++ b/src/com/cyanogenmod/trebuchet/DragScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 /**
  * Handles scrolling while dragging
diff --git a/src/com/android/launcher2/DragSource.java b/src/com/cyanogenmod/trebuchet/DragSource.java
index 54404770a..3f5ef0ed6 100644
--- a/src/com/android/launcher2/DragSource.java
+++ b/src/com/cyanogenmod/trebuchet/DragSource.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.view.View;
 
-import com.android.launcher2.DropTarget.DragObject;
+import com.cyanogenmod.trebuchet.DropTarget.DragObject;
 
 /**
  * Interface defining an object that can originate a drag.
diff --git a/src/com/android/launcher2/DragView.java b/src/com/cyanogenmod/trebuchet/DragView.java
index b6645e102..9eefe2963 100644
--- a/src/com/android/launcher2/DragView.java
+++ b/src/com/cyanogenmod/trebuchet/DragView.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
@@ -30,7 +30,7 @@ import android.graphics.Rect;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class DragView extends View {
     private static float sDragAlpha = 1f;
diff --git a/src/com/android/launcher2/DrawableStateProxyView.java b/src/com/cyanogenmod/trebuchet/DrawableStateProxyView.java
index 5d2f6e0a2..dcaad352b 100644
--- a/src/com/android/launcher2/DrawableStateProxyView.java
+++ b/src/com/cyanogenmod/trebuchet/DrawableStateProxyView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -23,7 +23,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class DrawableStateProxyView extends LinearLayout {
 
diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/cyanogenmod/trebuchet/DropTarget.java
index d627a4c2e..6a929cb5e 100644
--- a/src/com/android/launcher2/DropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.graphics.PointF;
diff --git a/src/com/android/launcher2/FastBitmapDrawable.java b/src/com/cyanogenmod/trebuchet/FastBitmapDrawable.java
index d317d3302..732e4c1ee 100644
--- a/src/com/android/launcher2/FastBitmapDrawable.java
+++ b/src/com/cyanogenmod/trebuchet/FastBitmapDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/FocusHelper.java b/src/com/cyanogenmod/trebuchet/FocusHelper.java
index e9f986d76..d87fc672e 100644
--- a/src/com/android/launcher2/FocusHelper.java
+++ b/src/com/cyanogenmod/trebuchet/FocusHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.res.Configuration;
 import android.view.KeyEvent;
@@ -24,7 +24,7 @@ import android.view.ViewParent;
 import android.widget.TabHost;
 import android.widget.TabWidget;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/FocusOnlyTabWidget.java b/src/com/cyanogenmod/trebuchet/FocusOnlyTabWidget.java
index 8e9f58c61..795b621e6 100644
--- a/src/com/android/launcher2/FocusOnlyTabWidget.java
+++ b/src/com/cyanogenmod/trebuchet/FocusOnlyTabWidget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index de2e4359a..7f56537c6 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -44,8 +44,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderInfo.FolderListener;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.FolderInfo.FolderListener;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/FolderEditText.java b/src/com/cyanogenmod/trebuchet/FolderEditText.java
index 13169bd51..4504460bf 100644
--- a/src/com/android/launcher2/FolderEditText.java
+++ b/src/com/cyanogenmod/trebuchet/FolderEditText.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/cyanogenmod/trebuchet/FolderIcon.java
index 4919b57f0..4a5ab5099 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/cyanogenmod/trebuchet/FolderIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -39,9 +39,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
-import com.android.launcher2.FolderInfo.FolderListener;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.DropTarget.DragObject;
+import com.cyanogenmod.trebuchet.FolderInfo.FolderListener;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/FolderInfo.java b/src/com/cyanogenmod/trebuchet/FolderInfo.java
index f59707671..dd896fd34 100644
--- a/src/com/android/launcher2/FolderInfo.java
+++ b/src/com/cyanogenmod/trebuchet/FolderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/HandleView.java b/src/com/cyanogenmod/trebuchet/HandleView.java
index d77138b0a..894488855 100644
--- a/src/com/android/launcher2/HandleView.java
+++ b/src/com/cyanogenmod/trebuchet/HandleView.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -24,7 +24,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class HandleView extends ImageView {
     private static final int ORIENTATION_HORIZONTAL = 1;
diff --git a/src/com/android/launcher2/HolographicImageView.java b/src/com/cyanogenmod/trebuchet/HolographicImageView.java
index 9e551e047..d159358f0 100644
--- a/src/com/android/launcher2/HolographicImageView.java
+++ b/src/com/cyanogenmod/trebuchet/HolographicImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/HolographicLinearLayout.java b/src/com/cyanogenmod/trebuchet/HolographicLinearLayout.java
index 0f997d5fa..3af541511 100644
--- a/src/com/android/launcher2/HolographicLinearLayout.java
+++ b/src/com/cyanogenmod/trebuchet/HolographicLinearLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -25,7 +25,7 @@ import android.util.AttributeSet;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class HolographicLinearLayout extends LinearLayout {
 
diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/cyanogenmod/trebuchet/HolographicOutlineHelper.java
index 56d194d4e..e2d2eaaca 100644
--- a/src/com/android/launcher2/HolographicOutlineHelper.java
+++ b/src/com/cyanogenmod/trebuchet/HolographicOutlineHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.graphics.Bitmap;
 import android.graphics.BlurMaskFilter;
diff --git a/src/com/android/launcher2/HolographicViewHelper.java b/src/com/cyanogenmod/trebuchet/HolographicViewHelper.java
index fd499082f..068a8f5a7 100644
--- a/src/com/android/launcher2/HolographicViewHelper.java
+++ b/src/com/cyanogenmod/trebuchet/HolographicViewHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index 15d606d8f..573be1b83 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -25,7 +25,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class Hotseat extends FrameLayout {
     @SuppressWarnings("unused")
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/cyanogenmod/trebuchet/IconCache.java
index aa19545bd..15b49ba77 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/cyanogenmod/trebuchet/IconCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.ActivityManager;
 import android.content.ComponentName;
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
index d6bf5f2cc..c24bf8b3e 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/InfoDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -26,7 +26,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 public class InfoDropTarget extends ButtonDropTarget {
 
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java
index a525d00ee..d40ceba58 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,7 +25,7 @@ import android.content.pm.PackageManager;
 import android.os.Debug;
 import android.widget.Toast;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -34,7 +34,7 @@ import java.util.Set;
 
 public class InstallShortcutReceiver extends BroadcastReceiver {
     public static final String ACTION_INSTALL_SHORTCUT =
-            "com.android.launcher.action.INSTALL_SHORTCUT";
+            "com.cyanogenmod.trebuchet.action.INSTALL_SHORTCUT";
     public static final String NEW_APPS_PAGE_KEY = "apps.new.page";
     public static final String NEW_APPS_LIST_KEY = "apps.new.list";
 
@@ -47,7 +47,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
 
     // A mime-type representing shortcut data
     public static final String SHORTCUT_MIMETYPE =
-            "com.android.launcher/shortcut";
+            "com.cyanogenmod.trebuchet/shortcut";
 
     // The set of shortcuts that are pending install
     private static ArrayList<PendingInstallShortcutInfo> mInstallQueue =
diff --git a/src/com/android/launcher2/InstallWidgetReceiver.java b/src/com/cyanogenmod/trebuchet/InstallWidgetReceiver.java
index a1e9b1187..a133f51e3 100644
--- a/src/com/android/launcher2/InstallWidgetReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/InstallWidgetReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 
 /**
@@ -42,18 +42,18 @@ import com.android.launcher.R;
  */
 public class InstallWidgetReceiver {
     public static final String ACTION_INSTALL_WIDGET =
-            "com.android.launcher.action.INSTALL_WIDGET";
+            "com.cyanogenmod.trebuchet.action.INSTALL_WIDGET";
     public static final String ACTION_SUPPORTS_CLIPDATA_MIMETYPE =
-            "com.android.launcher.action.SUPPORTS_CLIPDATA_MIMETYPE";
+            "com.cyanogenmod.trebuchet.action.SUPPORTS_CLIPDATA_MIMETYPE";
 
     // Currently not exposed.  Put into Intent when we want to make it public.
     // TEMP: Should we call this "EXTRA_APPWIDGET_PROVIDER"?
     public static final String EXTRA_APPWIDGET_COMPONENT =
-        "com.android.launcher.extra.widget.COMPONENT";
+        "com.cyanogenmod.trebuchet.extra.widget.COMPONENT";
     public static final String EXTRA_APPWIDGET_CONFIGURATION_DATA_MIME_TYPE =
-        "com.android.launcher.extra.widget.CONFIGURATION_DATA_MIME_TYPE";
+        "com.cyanogenmod.trebuchet.extra.widget.CONFIGURATION_DATA_MIME_TYPE";
     public static final String EXTRA_APPWIDGET_CONFIGURATION_DATA =
-        "com.android.launcher.extra.widget.CONFIGURATION_DATA";
+        "com.cyanogenmod.trebuchet.extra.widget.CONFIGURATION_DATA";
 
     /**
      * A simple data class that contains per-item information that the adapter below can reference.
diff --git a/src/com/android/launcher2/InterruptibleInOutAnimator.java b/src/com/cyanogenmod/trebuchet/InterruptibleInOutAnimator.java
index 135fa3996..82ec2d8f3 100644
--- a/src/com/android/launcher2/InterruptibleInOutAnimator.java
+++ b/src/com/cyanogenmod/trebuchet/InterruptibleInOutAnimator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/cyanogenmod/trebuchet/ItemInfo.java
index dedc0f4f3..c76108fc5 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/cyanogenmod/trebuchet/ItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.ContentValues;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index f4180cd00..59f5f493d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -93,8 +93,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.common.Search;
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.DropTarget.DragObject;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -149,7 +149,7 @@ public final class Launcher extends Activity
 
     // The Intent extra that defines whether to ignore the launch animation
     static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
-            "com.android.launcher.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
+            "com.cyanogenmod.trebuchet.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
 
     // Type: int
     private static final String RUNTIME_STATE_CURRENT_SCREEN = "launcher.current_screen";
@@ -174,11 +174,11 @@ public final class Launcher extends Activity
     // Type: parcelable
     private static final String RUNTIME_STATE_PENDING_ADD_WIDGET_INFO = "launcher.add_widget_info";
 
-    private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
+    private static final String TOOLBAR_ICON_METADATA_NAME = "com.cyanogenmod.trebuchet.toolbar_icon";
     private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
-            "com.android.launcher.toolbar_search_icon";
+            "com.cyanogenmod.trebuchet.toolbar_search_icon";
     private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
-            "com.android.launcher.toolbar_voice_search_icon";
+            "com.cyanogenmod.trebuchet.toolbar_voice_search_icon";
 
     /** The different states that Launcher can be in. */
     private enum State { WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };
diff --git a/src/com/android/launcher2/LauncherAnimatorUpdateListener.java b/src/com/cyanogenmod/trebuchet/LauncherAnimatorUpdateListener.java
index dd821134d..df9ded1ea 100644
--- a/src/com/android/launcher2/LauncherAnimatorUpdateListener.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherAnimatorUpdateListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHost.java b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetHost.java
index 68d4903da..3f12a036c 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHost.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetHostView.java
index 9970c7675..5eea2806a 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
@@ -27,7 +27,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RemoteViews;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * {@inheritDoc}
diff --git a/src/com/android/launcher2/LauncherAppWidgetInfo.java b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetInfo.java
index f001b2b64..0ab5dae84 100644
--- a/src/com/android/launcher2/LauncherAppWidgetInfo.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherAppWidgetInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/cyanogenmod/trebuchet/LauncherApplication.java
index 28362fd0b..7fa88177b 100644
--- a/src/com/android/launcher2/LauncherApplication.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.Application;
 import android.app.SearchManager;
@@ -26,7 +26,7 @@ import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.os.Handler;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.lang.ref.WeakReference;
 
@@ -36,7 +36,7 @@ public class LauncherApplication extends Application {
     private static boolean sIsScreenLarge;
     private static float sScreenDensity;
     private static int sLongPressTimeout = 300;
-    private static final String sSharedPreferencesKey = "com.android.launcher2.prefs";
+    private static final String sSharedPreferencesKey = "com.cyanogenmod.trebuchet.prefs";
     WeakReference<LauncherProvider> mLauncherProvider;
 
     @Override
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/cyanogenmod/trebuchet/LauncherModel.java
index fc1a26d4b..7e0df1435 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherModel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -47,8 +47,8 @@ import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
-import com.android.launcher.R;
-import com.android.launcher2.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
 
 import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/cyanogenmod/trebuchet/LauncherProvider.java
index 0720259f4..4cdd135e6 100644
--- a/src/com/android/launcher2/LauncherProvider.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.SearchManager;
 import android.appwidget.AppWidgetHost;
@@ -49,8 +49,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.launcher.R;
-import com.android.launcher2.LauncherSettings.Favorites;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.LauncherSettings.Favorites;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -68,7 +68,7 @@ public class LauncherProvider extends ContentProvider {
 
     private static final int DATABASE_VERSION = 12;
 
-    static final String AUTHORITY = "com.android.launcher2.settings";
+    static final String AUTHORITY = "com.cyanogenmod.trebuchet.settings";
 
     static final String TABLE_FAVORITES = "favorites";
     static final String PARAMETER_NOTIFY = "notify";
@@ -76,7 +76,7 @@ public class LauncherProvider extends ContentProvider {
             "DB_CREATED_BUT_DEFAULT_WORKSPACE_NOT_LOADED";
 
     private static final String ACTION_APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE =
-            "com.android.launcher.action.APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE";
+            "com.cyanogenmod.trebuchet.action.APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE";
 
     /**
      * {@link Uri} triggered at any registered {@link android.database.ContentObserver} when
diff --git a/src/com/android/launcher2/LauncherSettings.java b/src/com/cyanogenmod/trebuchet/LauncherSettings.java
index ee003716b..361dd69a0 100644
--- a/src/com/android/launcher2/LauncherSettings.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java
index 88b4cb4b8..d02cb25c6 100644
--- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java
+++ b/src/com/cyanogenmod/trebuchet/LauncherViewPropertyAnimator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/cyanogenmod/trebuchet/PagedView.java
index ad0baf44d..42c9ca9c4 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/cyanogenmod/trebuchet/PagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -43,7 +43,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
 import android.widget.Scroller;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/cyanogenmod/trebuchet/PagedViewCellLayout.java
index 6f73e6341..5eaf92694 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewCellLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * An abstraction of the original CellLayout which supports laying out items
diff --git a/src/com/android/launcher2/PagedViewCellLayoutChildren.java b/src/com/cyanogenmod/trebuchet/PagedViewCellLayoutChildren.java
index 187a22d55..3b1a3fb0f 100644
--- a/src/com/android/launcher2/PagedViewCellLayoutChildren.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewCellLayoutChildren.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/android/launcher2/PagedViewGridLayout.java b/src/com/cyanogenmod/trebuchet/PagedViewGridLayout.java
index 90bfe88ec..546912f39 100644
--- a/src/com/android/launcher2/PagedViewGridLayout.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewGridLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.view.MotionEvent;
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/cyanogenmod/trebuchet/PagedViewIcon.java
index d2aa31f86..6296e67c0 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/src/com/android/launcher2/PagedViewIconCache.java b/src/com/cyanogenmod/trebuchet/PagedViewIconCache.java
index d65f68baf..8086fa709 100644
--- a/src/com/android/launcher2/PagedViewIconCache.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewIconCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/cyanogenmod/trebuchet/PagedViewWidget.java
index 66b7080d4..c1dfcdcfb 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewWidget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -28,7 +28,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * The linear layout used strictly for the widget/wallpaper tab of the customization tray
diff --git a/src/com/android/launcher2/PagedViewWidgetImageView.java b/src/com/cyanogenmod/trebuchet/PagedViewWidgetImageView.java
index 22db0abd8..8182b225b 100644
--- a/src/com/android/launcher2/PagedViewWidgetImageView.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewWidgetImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/PagedViewWithDraggableItems.java b/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java
index 22fd82b69..694c3c7e2 100644
--- a/src/com/android/launcher2/PagedViewWithDraggableItems.java
+++ b/src/com/cyanogenmod/trebuchet/PagedViewWithDraggableItems.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/PendingAddItemInfo.java b/src/com/cyanogenmod/trebuchet/PendingAddItemInfo.java
index 9a133ed27..d31c7e199 100644
--- a/src/com/android/launcher2/PendingAddItemInfo.java
+++ b/src/com/cyanogenmod/trebuchet/PendingAddItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
diff --git a/src/com/android/launcher2/PreloadReceiver.java b/src/com/cyanogenmod/trebuchet/PreloadReceiver.java
index d1bc6393d..0ce8ebecf 100644
--- a/src/com/android/launcher2/PreloadReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/PreloadReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/launcher2/RocketLauncher.java b/src/com/cyanogenmod/trebuchet/RocketLauncher.java
index 268769d2f..54da60643 100644
--- a/src/com/android/launcher2/RocketLauncher.java
+++ b/src/com/cyanogenmod/trebuchet/RocketLauncher.java
@@ -18,7 +18,7 @@
 // background stellar matter:
 //  - add some slow horizontal parallax motion, or perhaps veeeeery gradual outward drift
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -39,7 +39,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.util.HashMap;
 import java.util.Random;
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/cyanogenmod/trebuchet/SearchDropTargetBar.java
index a1d36cdfa..c58178849 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/cyanogenmod/trebuchet/SearchDropTargetBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -27,7 +27,7 @@ import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /*
  * Ths bar will manage the transition between the QSB search bar and the delete drop
diff --git a/src/com/android/launcher2/ShortcutAndWidgetContainer.java b/src/com/cyanogenmod/trebuchet/ShortcutAndWidgetContainer.java
index 8bebdcd45..8c10c94e9 100644
--- a/src/com/android/launcher2/ShortcutAndWidgetContainer.java
+++ b/src/com/cyanogenmod/trebuchet/ShortcutAndWidgetContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.WallpaperManager;
 import android.content.Context;
diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/cyanogenmod/trebuchet/ShortcutInfo.java
index 533059f57..5c77b5f69 100644
--- a/src/com/android/launcher2/ShortcutInfo.java
+++ b/src/com/cyanogenmod/trebuchet/ShortcutInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/SmoothPagedView.java b/src/com/cyanogenmod/trebuchet/SmoothPagedView.java
index 7e47f1a3f..86caf9e25 100644
--- a/src/com/android/launcher2/SmoothPagedView.java
+++ b/src/com/cyanogenmod/trebuchet/SmoothPagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/cyanogenmod/trebuchet/SpringLoadedDragController.java
index d96aab794..e5b27981a 100644
--- a/src/com/android/launcher2/SpringLoadedDragController.java
+++ b/src/com/cyanogenmod/trebuchet/SpringLoadedDragController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 public class SpringLoadedDragController implements OnAlarmListener {
     // how long the user must hover over a mini-screen before it unshrinks
diff --git a/src/com/android/launcher2/StrokedTextView.java b/src/com/cyanogenmod/trebuchet/StrokedTextView.java
index 4e28d17d7..007ddf525 100644
--- a/src/com/android/launcher2/StrokedTextView.java
+++ b/src/com/cyanogenmod/trebuchet/StrokedTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -27,7 +27,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * This class adds a stroke to the generic TextView allowing the text to stand out better against
diff --git a/src/com/android/launcher2/SymmetricalLinearTween.java b/src/com/cyanogenmod/trebuchet/SymmetricalLinearTween.java
index da02242c8..240305f25 100644
--- a/src/com/android/launcher2/SymmetricalLinearTween.java
+++ b/src/com/cyanogenmod/trebuchet/SymmetricalLinearTween.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.os.Handler;
 import android.os.SystemClock;
diff --git a/src/com/android/launcher2/TweenCallback.java b/src/com/cyanogenmod/trebuchet/TweenCallback.java
index 380a21774..88b8dffa2 100644
--- a/src/com/android/launcher2/TweenCallback.java
+++ b/src/com/cyanogenmod/trebuchet/TweenCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 interface TweenCallback {
     void onTweenValueChanged(float value, float oldValue);
diff --git a/src/com/android/launcher2/UninstallShortcutReceiver.java b/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java
index 02590c9f6..77959d084 100644
--- a/src/com/android/launcher2/UninstallShortcutReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -25,7 +25,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.widget.Toast;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ import java.util.Set;
 
 public class UninstallShortcutReceiver extends BroadcastReceiver {
     private static final String ACTION_UNINSTALL_SHORTCUT =
-            "com.android.launcher.action.UNINSTALL_SHORTCUT";
+            "com.cyanogenmod.trebuchet.action.UNINSTALL_SHORTCUT";
 
     // The set of shortcuts that are pending uninstall
     private static ArrayList<PendingUninstallShortcutInfo> mUninstallQueue =
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/cyanogenmod/trebuchet/Utilities.java
index b27f7bb11..d80cd9dc6 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/cyanogenmod/trebuchet/Utilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import java.util.Random;
 
@@ -35,7 +35,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.PaintDrawable;
 import android.util.DisplayMetrics;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 /**
  * Various utilities shared amongst the Launcher's classes.
diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/cyanogenmod/trebuchet/WallpaperChooser.java
index 77e1e6ffb..d3ca00659 100644
--- a/src/com/android/launcher2/WallpaperChooser.java
+++ b/src/com/cyanogenmod/trebuchet/WallpaperChooser.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import android.app.Activity;
 import android.app.DialogFragment;
diff --git a/src/com/android/launcher2/WallpaperChooserDialogFragment.java b/src/com/cyanogenmod/trebuchet/WallpaperChooserDialogFragment.java
index b99d8ecb3..aa323bf67 100644
--- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java
+++ b/src/com/cyanogenmod/trebuchet/WallpaperChooserDialogFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -41,7 +41,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.SpinnerAdapter;
 
-import com.android.launcher.R;
+import com.cyanogenmod.trebuchet.R;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -50,7 +50,7 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
         AdapterView.OnItemSelectedListener, AdapterView.OnItemClickListener {
 
     private static final String TAG = "Launcher.WallpaperChooserDialogFragment";
-    private static final String EMBEDDED_KEY = "com.android.launcher2."
+    private static final String EMBEDDED_KEY = "com.cyanogenmod.trebuchet."
             + "WallpaperChooserDialogFragment.EMBEDDED_KEY";
 
     private boolean mEmbedded;
@@ -194,8 +194,8 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
 
         final Resources resources = getResources();
         // Context.getPackageName() may return the "original" package name,
-        // com.android.launcher2; Resources needs the real package name,
-        // com.android.launcher. So we ask Resources for what it thinks the
+        // com.cyanogenmod.trebuchet; Resources needs the real package name,
+        // com.cyanogenmod.trebuchet. So we ask Resources for what it thinks the
         // package name should be.
         final String packageName = resources.getResourcePackageName(R.array.wallpapers);
 
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 2d2340a3e..38f4abbd4 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.cyanogenmod.trebuchet;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -55,9 +55,9 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderIcon.FolderRingAnimator;
-import com.android.launcher2.LauncherSettings.Favorites;
+import com.cyanogenmod.trebuchet.R;
+import com.cyanogenmod.trebuchet.FolderIcon.FolderRingAnimator;
+import com.cyanogenmod.trebuchet.LauncherSettings.Favorites;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
diff --git a/tests/stress/Android.mk b/tests/stress/Android.mk
index 68289bd3e..4678f677d 100644
--- a/tests/stress/Android.mk
+++ b/tests/stress/Android.mk
@@ -22,10 +22,10 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := LauncherRotationStressTest
+LOCAL_PACKAGE_NAME := TrebuchetRotationStressTest
 
 LOCAL_CERTIFICATE := shared
 
-LOCAL_INSTRUMENTATION_FOR := Launcher2
+LOCAL_INSTRUMENTATION_FOR := Trebuchet
 
 include $(BUILD_PACKAGE)
diff --git a/tests/stress/AndroidManifest.xml b/tests/stress/AndroidManifest.xml
index 0df3a9da3..71c9e7afd 100644
--- a/tests/stress/AndroidManifest.xml
+++ b/tests/stress/AndroidManifest.xml
@@ -24,6 +24,6 @@
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="com.android.launcher"
-        android:label="Rotation stress test using Launcher2">
+        android:label="Rotation stress test using Trebuchet">
     </instrumentation>
 </manifest>
diff --git a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java b/tests/stress/src/com/cyanogenmod/trebuchet/stress/LauncherRotationStressTest.java
index d21fd53ba..e2ced63a6 100644
--- a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
+++ b/tests/stress/src/com/cyanogenmod/trebuchet/stress/LauncherRotationStressTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.launcher2.stress;
+package com.cyanogenmod.trebuchet.stress;
 
 
-import com.android.launcher2.Launcher;
+import com.cyanogenmod.trebuchet.Launcher;
 
 import android.content.pm.ActivityInfo;
 import android.os.SystemClock;
@@ -26,13 +26,13 @@ import android.test.RepetitiveTest;
 import android.util.Log;
 
 /**
- * Run rotation stress test using Launcher2 for 50 iterations.
+ * Run rotation stress test using Trebuchet for 50 iterations.
  */
 public class LauncherRotationStressTest extends ActivityInstrumentationTestCase2<Launcher> {
 
     private static final int NUM_ITERATIONS = 50;
     private static final int WAIT_TIME_MS = 500;
-    private static final String LOG_TAG = "LauncherRotationStressTest";
+    private static final String LOG_TAG = "TrebuchetRotationStressTest";
 
     public LauncherRotationStressTest() {
         super(Launcher.class);