diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index d07e9c31b..e08b9e362 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:name="a.a"
+        android:name="a.q"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
diff --git a/app/src/full/java/a/a.java b/app/src/full/java/a/a.java
index d9444ecb7..f3ebc910e 100644
--- a/app/src/full/java/a/a.java
+++ b/app/src/full/java/a/a.java
@@ -1,7 +1,10 @@
 package a;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.BootSigner;
 
-public class a extends MagiskManager {
+import androidx.annotation.Keep;
+
+@Keep
+public class a extends BootSigner {
     /* stub */
 }
diff --git a/app/src/full/java/a/q.java b/app/src/full/java/a/q.java
new file mode 100644
index 000000000..19dfec84f
--- /dev/null
+++ b/app/src/full/java/a/q.java
@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.MagiskManager;
+
+public class q extends MagiskManager {
+    /* stub */
+}
diff --git a/app/src/full/java/com/topjohnwu/magisk/Data.java b/app/src/full/java/com/topjohnwu/magisk/Data.java
index 865b90c05..e02b18a98 100644
--- a/app/src/full/java/com/topjohnwu/magisk/Data.java
+++ b/app/src/full/java/com/topjohnwu/magisk/Data.java
@@ -72,7 +72,7 @@ public class Data {
     public static int repoOrder;
 
     static {
-        classMap.put(MagiskManager.class, a.a.class);
+        classMap.put(MagiskManager.class, a.q.class);
         classMap.put(MainActivity.class, a.b.class);
         classMap.put(SplashActivity.class, a.c.class);
         classMap.put(AboutActivity.class, a.d.class);
diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh
index c0ea9801d..4e54515bd 100644
--- a/scripts/util_functions.sh
+++ b/scripts/util_functions.sh
@@ -19,7 +19,9 @@ $BOOTMODE || ps -A | grep zygote | grep -qv grep && BOOTMODE=true
 [ -z $IMG ] && IMG=$NVBASE/magisk.img
 [ -z $MOUNTPATH ] && MOUNTPATH=/sbin/.core/img
 
-BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK com.topjohnwu.magisk.utils.BootSigner"
+# Bootsigner related stuff
+BOOTSIGNERCLASS=a.a
+BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK \$BOOTSIGNERCLASS"
 BOOTSIGNED=false
 
 setup_flashable() {