diff --git a/Android.mk b/Android.mk
index add576a..b01179c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := ksigam
+LOCAL_MODULE := magisk
 LOCAL_SRC_FILES := magisk.apk 
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
diff --git a/device.mk b/device.mk
index 48f871e..7a3c925 100644
--- a/device.mk
+++ b/device.mk
@@ -1,8 +1,8 @@
 
 PRODUCT_PACKAGES += \
-    ksigam
+    magisk
 
 PRODUCT_COPY_FILES += \
-    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ksigam.rc \
+    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/magisk.rc \
     $(call find-copy-subdir-files,*,vendor/magisk/rootfs/vendor/etc/init,$(TARGET_COPY_OUT_VENDOR)/etc/init) \
 
diff --git a/extract.py b/extract.py
index ff734a4..aeeee05 100644
--- a/extract.py
+++ b/extract.py
@@ -12,8 +12,8 @@ def main():
     apk_path = os.path.join(current_path, "magisk.apk")
     unzip_path = os.path.join(current_path, "temp")
     overlay_path = os.path.join(current_path, "rootfs")
-    overlay_magisk_path = os.path.join(overlay_path, "vendor", "etc", "init", "ksigam")
-    overlay_init_path = os.path.join(overlay_path, "vendor", "etc", "init", "ksigam.rc")
+    overlay_magisk_path = os.path.join(overlay_path, "vendor", "etc", "init", "magisk")
+    overlay_init_path = os.path.join(overlay_path, "vendor", "etc", "init", "magisk.rc")
 
     shutil.rmtree(unzip_path, ignore_errors=True)
     os.makedirs(unzip_path, exist_ok=True)
diff --git a/magisk.rc b/magisk.rc
index d7fb8e5..ab48767 100644
--- a/magisk.rc
+++ b/magisk.rc
@@ -1,10 +1,11 @@
 
-on post-fs-data
+
+on post-fs-data && property:ro.boot.redroid_magisk=1
     start logd
-    chmod 0755 /vendor/etc/init/ksigam/magisk64
-    chmod 0755 /vendor/etc/init/ksigam/magiskpolicy
-    exec u:r:su:s0 root root -- /vendor/etc/init/ksigam/magisk64 --auto-selinux --setup-sbin /vendor/etc/init/ksigam
-    exec u:r:su:s0 root root -- /vendor/etc/init/ksigam/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
+    chmod 0755 /vendor/etc/init/magisk/magisk64
+    chmod 0755 /vendor/etc/init/magisk/magiskpolicy
+    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magisk64 --setup-sbin /vendor/etc/init/magisk
+    exec u:r:su:s0 root root -- /vendor/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
     mkdir /sbin/.magisk 700
     mkdir /sbin/.magisk/mirror 700
     mkdir /sbin/.magisk/block 700
@@ -12,25 +13,28 @@ on post-fs-data
     start 7zKkuZ1ZhD
     wait /dev/.magisk_unblock 40
     rm /dev/.magisk_unblock
+    start wHgGlkRCtMoIQw
 
-service 7zKkuZ1ZhD /sbin/magisk --auto-selinux --post-fs-data
+service 7zKkuZ1ZhD /sbin/magisk --post-fs-data
     user root
     seclabel u:r:su:s0
     oneshot
+    disabled
 
-service wHgGlkRCtMoIQw /sbin/magisk --auto-selinux --service
-    class late_start
+service wHgGlkRCtMoIQw /sbin/magisk --service
     user root
     seclabel u:r:su:s0
     oneshot
+    disabled
 
-on property:sys.boot_completed=1
+on property:sys.boot_completed=1 && property:ro.boot.redroid_magisk=1
     mkdir /data/adb/magisk 755
-    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete
-    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /vendor/etc/init/ksigam/ksigam.apk ; fi"
+    exec u:r:su:s0 root root -- /sbin/magisk --boot-complete
+    exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /vendor/etc/init/magisk/magisk.apk ; fi"
 
-on property:init.svc.zygote=restarting
-    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
+on property:init.svc.zygote=restarting && property:ro.boot.redroid_magisk=1
+    exec u:r:su:s0 root root -- /sbin/magisk --zygote-restart
+
+on property:init.svc.zygote=stopped && property:ro.boot.redroid_magisk=1
+    exec u:r:su:s0 root root -- /sbin/magisk --zygote-restart
 
-on property:init.svc.zygote=stopped
-    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
diff --git a/rootfs/vendor/etc/init/ksigam/busybox b/rootfs/vendor/etc/init/magisk/busybox
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/busybox
rename to rootfs/vendor/etc/init/magisk/busybox
diff --git a/rootfs/vendor/etc/init/ksigam/magisk32 b/rootfs/vendor/etc/init/magisk/magisk32
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/magisk32
rename to rootfs/vendor/etc/init/magisk/magisk32
diff --git a/rootfs/vendor/etc/init/ksigam/magisk64 b/rootfs/vendor/etc/init/magisk/magisk64
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/magisk64
rename to rootfs/vendor/etc/init/magisk/magisk64
diff --git a/rootfs/vendor/etc/init/ksigam/magiskboot b/rootfs/vendor/etc/init/magisk/magiskboot
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/magiskboot
rename to rootfs/vendor/etc/init/magisk/magiskboot
diff --git a/rootfs/vendor/etc/init/ksigam/magiskinit b/rootfs/vendor/etc/init/magisk/magiskinit
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/magiskinit
rename to rootfs/vendor/etc/init/magisk/magiskinit
diff --git a/rootfs/vendor/etc/init/ksigam/magiskpolicy b/rootfs/vendor/etc/init/magisk/magiskpolicy
similarity index 100%
rename from rootfs/vendor/etc/init/ksigam/magiskpolicy
rename to rootfs/vendor/etc/init/magisk/magiskpolicy