diff --git a/Android.mk b/Android.mk
index 628019b..1e6c217 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,8 +54,8 @@ LOCAL_SRC_FILES += \
     $(call all-Iaidl-files-under, $(cyanogenmod_app_src))
 
 LOCAL_INTERMEDIATE_SOURCES := \
-    $(cm_platform_res)/org/cyanogenmod/platform/R.java \
-    $(cm_platform_res)/org/cyanogenmod/platform/Manifest.java \
+    $(cm_platform_res)/cyanogenmod/platform/R.java \
+    $(cm_platform_res)/cyanogenmod/platform/Manifest.java \
     $(cm_platform_res)/org/cyanogenmod/platform/internal/R.java
 
 # Include aidl files from cyanogenmod.app namespace as well as internal src aidl files
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
index c4184ea..2dd21ac 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
@@ -338,13 +338,13 @@ public class CMStatusBarManagerService extends SystemService {
 
     private void enforceCustomTilePublish() {
         mContext.enforceCallingOrSelfPermission(
-                org.cyanogenmod.platform.Manifest.permission.PUBLISH_CUSTOM_TILE,
+                cyanogenmod.platform.Manifest.permission.PUBLISH_CUSTOM_TILE,
                 "StatusBarManagerService");
     }
 
     private void enforceBindCustomTileListener() {
         mContext.enforceCallingOrSelfPermission(
-                org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE,
+                cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE,
                 "StatusBarManagerService");
     }
 
@@ -369,7 +369,7 @@ public class CMStatusBarManagerService extends SystemService {
             //TODO: Implement this in the future
             //c.secureSettingName = Settings.Secure.ENABLED_CUSTOM_TILE_LISTENERS;
             c.bindPermission =
-                    org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE;
+                    cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE;
             //TODO: Implement this in the future
             //c.settingsAction = Settings.ACTION_CUSTOM_TILE_LISTENER_SETTINGS;
             c.clientLabel = R.string.custom_tile_listener_binding_label;
diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml
index 54a2b66..8a52e54 100644
--- a/cm/res/AndroidManifest.xml
+++ b/cm/res/AndroidManifest.xml
@@ -17,7 +17,7 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.cyanogenmod.platform"
+    package="cyanogenmod.platform"
     coreApp="true" android:sharedUserId="android.uid.system"
     android:sharedUserLabel="@string/cyanogenmod_system_label">