diff --git a/overlay/AOSPAFrameworksOverlay/res/values/config.xml b/overlay/AOSPAFrameworksOverlay/res/values/config.xml
index b75c9700..df16729f 100644
--- a/overlay/AOSPAFrameworksOverlay/res/values/config.xml
+++ b/overlay/AOSPAFrameworksOverlay/res/values/config.xml
@@ -50,7 +50,7 @@
         <item>"/system/system_ext/lib64/liblayerext.qti.so"</item>
         <item>"/system/system_ext/lib64/libpenguin.so"</item>
         <item>"/system/system_ext/lib64/libpenguin_impl.so"</item>
-        <item>"/system/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
+        <item>"/system/system_ext/priv-app/ParanoidSystemUI/ParanoidSystemUI.apk"</item>
         <item>"/vendor/lib/libcamxexternalformatutils.so"</item>
         <item>"/vendor/lib/libipebpsstriping170.so"</item>
         <item>"/vendor/lib/libipebpsstriping.so"</item>
diff --git a/overlay/AOSPASystemUIOverlay/res/values/config.xml b/overlay/AOSPASystemUIOverlay/res/values/config.xml
index 71f15dee..3858bcdc 100644
--- a/overlay/AOSPASystemUIOverlay/res/values/config.xml
+++ b/overlay/AOSPASystemUIOverlay/res/values/config.xml
@@ -27,10 +27,4 @@
          increase the rate of unintentional unlocks. -->
     <bool name="config_lockscreenAntiFalsingClassifierEnabled">false</bool>
 
-    <!-- SystemUIFactory component -->
-    <!--<string name="config_systemUIFactoryComponent" translatable="false">co.aospa.android.systemui.AospaSystemUIFactory</string>-->
-
-    <!-- SystemUI vendor service, used in config_systemUIServiceComponents. -->
-    <!--<string name="config_systemUIVendorServiceComponent">co.aospa.android.systemui.AospaServices</string>-->
-
 </resources>
diff --git a/target/product/aospa-target.mk b/target/product/aospa-target.mk
index 0d188911..88a47a29 100644
--- a/target/product/aospa-target.mk
+++ b/target/product/aospa-target.mk
@@ -72,7 +72,7 @@ PRODUCT_COPY_FILES += \
 
 # Pre-optimization
 PRODUCT_DEXPREOPT_SPEED_APPS += \
-    SystemUI
+    ParanoidSystemUI
 
 # Compile SystemUI on device with `speed`.
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/target/product/packages.mk b/target/product/packages.mk
index dee833db..6e3af4e8 100644
--- a/target/product/packages.mk
+++ b/target/product/packages.mk
@@ -57,6 +57,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     ParanoidThemePicker
 
+# Paranoid SystemUI
+PRODUCT_PACKAGES += \
+    ParanoidSystemUI
+
 # Gestures
 PRODUCT_PACKAGES += \
     vendor.aospa.power-service