diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java b/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java
index 4aa6cd123..f08090f30 100644
--- a/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java
+++ b/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java
@@ -72,8 +72,7 @@ public class DownloadApp {
                 progress.update();
                 patched = new File(apk.getParent(), "patched.apk");
                 try {
-                    JarMap jarMap = new JarMap(apk);
-                    PatchAPK.patch(jarMap, app.getPackageName());
+                    JarMap jarMap = PatchAPK.patch(apk.getPath(), app.getPackageName());
                     SignAPK.sign(jarMap, new BufferedOutputStream(new FileOutputStream(patched)));
                 } catch (Exception e) {
                     return;
diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java b/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
index 8cb43bda9..c8bd1d32c 100644
--- a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
+++ b/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java
@@ -23,10 +23,11 @@ import java.nio.ByteOrder;
 import java.nio.CharBuffer;
 import java.nio.IntBuffer;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.jar.JarEntry;
 
 import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
 
 public class PatchAPK {
 
@@ -42,7 +43,7 @@ public class PatchAPK {
         builder.append(prefix);
         length -= prefix.length();
         SecureRandom random = new SecureRandom();
-        char next, prev = '.';
+        char next, prev = prefix.charAt(prefix.length() - 1);
         for (int i = 0; i < length; ++i) {
             if (prev == '.' || i == length - 1) {
                 next = ALPHA.charAt(random.nextInt(ALPHA.length()));
@@ -55,30 +56,30 @@ public class PatchAPK {
         return builder.toString();
     }
 
-    private static boolean findAndPatch(byte xml[], String a, String b) {
-        if (a.length() != b.length())
+    private static boolean findAndPatch(byte xml[], String from, String to) {
+        if (from.length() != to.length())
             return false;
-        char[] from = a.toCharArray(), to = b.toCharArray();
         CharBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
-        int offset = -1;
-        for (int i = 0; i < buf.length() - from.length; ++i) {
+        List<Integer> offList = new ArrayList<>();
+        for (int i = 0; i < buf.length() - from.length(); ++i) {
             boolean match = true;
-            for (int j = 0; j < from.length; ++j) {
-                if (buf.get(i + j) != from[j]) {
+            for (int j = 0; j < from.length(); ++j) {
+                if (buf.get(i + j) != from.charAt(j)) {
                     match = false;
                     break;
                 }
             }
-            // Make sure it is null terminated
-            if (match && buf.get(i + from.length) == '\0') {
-                offset = i;
-                break;
+            if (match) {
+                offList.add(i);
+                i += from.length();
             }
         }
-        if (offset < 0)
+        if (offList.isEmpty())
             return false;
-        buf.position(offset);
-        buf.put(to);
+        for (int off : offList) {
+            buf.position(off);
+            buf.put(to);
+        }
         return true;
     }
 
@@ -102,8 +103,8 @@ public class PatchAPK {
         String pkg = genPackageName("com.", BuildConfig.APPLICATION_ID.length());
 
         try {
-            JarMap apk = new JarMap(app.getPackageCodePath());
-            if (!patch(apk, pkg))
+            JarMap apk;
+            if ((apk = patch(app.getPackageCodePath(), pkg)) == null)
                 return false;
             SignAPK.sign(apk, new BufferedOutputStream(new FileOutputStream(repack)));
         } catch (Exception e) {
@@ -113,7 +114,7 @@ public class PatchAPK {
         // Install the application
         repack.setReadable(true, false);
         if (!ShellUtils.fastCmdResult("pm install " + repack))
-            return false;;
+            return false;
 
         app.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
         Data.exportPrefs();
@@ -122,23 +123,23 @@ public class PatchAPK {
         return true;
     }
 
-    public static boolean patch(JarMap apk, String pkg) {
+    public static JarMap patch(String apk, String pkg) {
         try {
-            JarEntry je = apk.getJarEntry(Const.ANDROID_MANIFEST);
-            byte xml[] = apk.getRawData(je);
+            JarMap jar = new JarMap(apk);
+            JarEntry je = jar.getJarEntry(Const.ANDROID_MANIFEST);
+            byte xml[] = jar.getRawData(je);
 
             if (!findAndPatch(xml, BuildConfig.APPLICATION_ID, pkg) ||
-                    !findAndPatch(xml, BuildConfig.APPLICATION_ID + ".provider", pkg + ".provider") ||
                     !findAndPatch(xml, R.string.app_name, R.string.re_app_name))
-                return false;
+                return null;
 
             // Write in changes
-            apk.getOutputStream(je).write(xml);
+            jar.getOutputStream(je).write(xml);
+            return jar;
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return null;
         }
-        return true;
     }
 
     public static void hideManager() {
@@ -146,10 +147,9 @@ public class PatchAPK {
             App app = App.self;
             NotificationCompat.Builder progress =
                     Notifications.progress(app.getString(R.string.hide_manager_title));
-            NotificationManagerCompat mgr = NotificationManagerCompat.from(app);
-            mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build());
+            Notifications.mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build());
             boolean b = patchAndHide();
-            mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID);
+            Notifications.mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID);
             if (!b) Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
         });
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17f5675a4..01adc1fa4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.topjohnwu.magisk.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data