diff --git a/edxp-core/template_override/customize.sh b/edxp-core/template_override/customize.sh
index fe1dd82f..95f06f3e 100644
--- a/edxp-core/template_override/customize.sh
+++ b/edxp-core/template_override/customize.sh
@@ -20,7 +20,10 @@ getRandomNameExist() {
 }
 
 RIRU_PATH="/data/adb/riru"
-RIRU_EDXP="edxp"
+RIRU_EDXP="$(getRandomNameExist 4 "libriru_" ".so" "
+/system/lib
+/system/lib64
+")"
 RIRU_MODULES="${RIRU_PATH}/modules"
 RIRU_TARGET="${RIRU_MODULES}/${RIRU_EDXP}"
 
@@ -33,6 +36,12 @@ PROP_PRODUCT=$(getprop ro.build.product)
 PROP_BRAND=$(getprop ro.product.brand)
 PROP_MANUFACTURER=$(getprop ro.product.manufacturer)
 
+LIB_RIRU_EDXP="libriru_${RIRU_EDXP}.so"
+LIB_SANDHOOK_EDXP="lib$(getRandomNameExist 13 "lib" ".so" "
+/system/lib
+/system/lib64
+").so"
+
 MODEL="
 HD1900
 HD1910
@@ -296,6 +305,27 @@ rm -rf "/data/misc/$MISC_PATH/framework"
 mv "${MODPATH}/system/framework" "/data/misc/$MISC_PATH/framework"
 set_perm_recursive /data/misc/$MISC_PATH/framework root root 0755 0644 "u:object_r:magisk_file:s0" || abort "! Can't set permission"
 
+mv "${MODPATH}/system/lib/libriru_edxp.so" "${MODPATH}/system/lib/${LIB_RIRU_EDXP}"
+if [[ "${IS64BIT}" == true ]]; then
+    mv "${MODPATH}/system/lib64/libriru_edxp.so" "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}"
+fi
+
+if [[ "${VARIANTS}" == "SandHook" ]]; then
+    mv "${MODPATH}/system/lib/libsandhook.edxp.so" "${MODPATH}/system/lib/${LIB_SANDHOOK_EDXP}"
+    if [[ "${IS64BIT}" == true ]]; then
+        mv "${MODPATH}/system/lib64/libsandhook.edxp.so" "${MODPATH}/system/lib64/${LIB_SANDHOOK_EDXP}"
+    fi
+fi
+
+ui_print "- Resetting libraries path"
+sed -i 's:libriru_edxp.so:'"${LIB_RIRU_EDXP}"':g' "${MODPATH}/system/lib/${LIB_RIRU_EDXP}"
+sed -i 's:libsandhook.edxp.so:'"${LIB_SANDHOOK_EDXP}"':g' "${MODPATH}/system/lib/${LIB_RIRU_EDXP}"
+
+if [[ "${IS64BIT}" == true ]]; then
+    sed -i 's:libriru_edxp.so:'"${LIB_RIRU_EDXP}"':g' "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}"
+    sed -i 's:libsandhook.edxp.so:'"${LIB_SANDHOOK_EDXP}"':g' "${MODPATH}/system/lib64/${LIB_RIRU_EDXP}"
+fi
+
 ui_print "- Removing old configuration"
 
 if [[ -f "${RIRU_MODULES}/edxp.prop" ]]; then