diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index f94ec844d8e..0bb34f8aa7a 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -48,18 +48,11 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
+########################
 include $(CLEAR_VARS)
-LOCAL_MODULE := projekt.substratum.theme.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := substratum_theme.xml
+LOCAL_MODULE := substratum-theme-feature.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/data/etc/projekt.substratum.theme.xml b/data/etc/projekt.substratum.theme.xml
deleted file mode 100644
index eb14a3d4e1c..00000000000
--- a/data/etc/projekt.substratum.theme.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018 Project Substratum
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<permissions>
-    <privapp-permissions package="android.substratum.service">
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-    </privapp-permissions>
-
-</permissions>
diff --git a/data/etc/substratum_theme.xml b/data/etc/substratum-theme-feature.xml
similarity index 96%
rename from data/etc/substratum_theme.xml
rename to data/etc/substratum-theme-feature.xml
index 8ac5a9af302..b7d97fcd586 100644
--- a/data/etc/substratum_theme.xml
+++ b/data/etc/substratum-theme-feature.xml
@@ -15,11 +15,11 @@
     limitations under the License.
 -->
 
-<permissions>
+<config>
     <!-- Limitation permission to block out themes from being visible on stock
          AOSP, or non-OMS devices. -->
 
     <!-- This is an alias for projekt.substratum.theme -->
     <feature name="projekt.substratum.theme" />
 
-</permissions>
+</config>
diff --git a/packages/SubstratumService/Android.mk b/packages/SubstratumHelperService/Android.mk
similarity index 87%
rename from packages/SubstratumService/Android.mk
rename to packages/SubstratumHelperService/Android.mk
index 28eeaf1acc1..78908d9312d 100644
--- a/packages/SubstratumService/Android.mk
+++ b/packages/SubstratumHelperService/Android.mk
@@ -22,13 +22,11 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_REQUIRED_MODULES := \
-      projekt.substratum.theme.xml \
-      substratum_theme.xml
+      substratum-theme-feature.xml
 
-LOCAL_PACKAGE_NAME := SubstratumService
+LOCAL_PACKAGE_NAME := SubstratumHelperService
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
-include $(BUILD_PACKAGE)
-
+include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/packages/SubstratumService/AndroidManifest.xml b/packages/SubstratumHelperService/AndroidManifest.xml
similarity index 80%
rename from packages/SubstratumService/AndroidManifest.xml
rename to packages/SubstratumHelperService/AndroidManifest.xml
index 4a78d555d39..d28dbc68c2f 100644
--- a/packages/SubstratumService/AndroidManifest.xml
+++ b/packages/SubstratumHelperService/AndroidManifest.xml
@@ -19,26 +19,26 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.substratum.service"
+    package="projekt.substratum.helper"
     android:sharedUserId="android.uid.system"
     android:versionCode="2"
     android:versionName="two" >
 
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+    
     <uses-feature name="projekt.substratum.theme" required="true"/>
 
     <application
         android:allowBackup="false"
-        android:label="Substratum Service">
+        android:label="Substratum Helper Service">
 
-        <service android:name="android.substratum.service.SubstratumHelperService"
+        <service android:name="projekt.substratum.helper.SubstratumHelperService"
                  android:enabled="true"
                  android:exported="true">
             <intent-filter>
-                <action android:name="android.substratum.service.SubstratumHelperService" />
+                <action android:name="projekt.substratum.helper.SubstratumHelperService" />
             </intent-filter>
         </service>
 
diff --git a/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java b/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
similarity index 98%
rename from packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
rename to packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
index fe0b5542164..09bb31d545b 100644
--- a/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
+++ b/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package android.substratum.service;
+package projekt.substratum.helper;
 
 import android.app.Service;
 import android.content.Intent;
@@ -30,7 +30,7 @@
 import java.io.File;
 
 public class SubstratumHelperService extends Service {
-    private static final String TAG = "SubstratumService";
+    private static final String TAG = "SubstratumHelperService";
 
     private final File EXTERNAL_CACHE_DIR =
             new File(Environment.getExternalStorageDirectory(), ".substratum");
diff --git a/services/core/java/com/android/server/substratum/SubstratumService.java b/services/core/java/com/android/server/substratum/SubstratumService.java
index 5d3e1c61a26..c8b1214097e 100644
--- a/services/core/java/com/android/server/substratum/SubstratumService.java
+++ b/services/core/java/com/android/server/substratum/SubstratumService.java
@@ -211,8 +211,8 @@ public void onSwitchUser(final int newUserId) {
 
     private void waitForHelperConnection() {
         if (mHelperService == null) {
-            Intent intent = new Intent("android.substratum.service.SubstratumHelperService");
-            intent.setPackage("android.substratum.service");
+            Intent intent = new Intent("projekt.substratum.helper.SubstratumHelperService");
+            intent.setPackage("projekt.substratum.helper");
             mContext.bindServiceAsUser(intent, mHelperConnection,
                     Context.BIND_AUTO_CREATE, UserHandle.SYSTEM);
         }