diff --git a/extract-files.sh b/extract-files.sh
index cefc787..6afa5f6 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -61,6 +61,9 @@ function blob_fixup() {
         system/lib64/libcamera_algoup_jni.xiaomi.so|system/lib64/libcamera_mianode_jni.xiaomi.so)
             patchelf --replace-needed libgui.so libgui-xiaomi.so "${2}"
             ;;
+        system/priv-app/MiuiCamera/MiuiCamera.apk)
+            split --bytes=20M -d "${2}" "${2}".part
+            ;;
     esac
 }
 
@@ -70,5 +73,3 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
-
-split -b 20M proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk proprietary/system/priv-app/MiuiCamera/MiuiCamera.part
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaa b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaa
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part00
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partab b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partab
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part01
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partac b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partac
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part02
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partad b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partad
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part03
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partae b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partae
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part04
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaf b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaf
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part05
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partag b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partag
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part06
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partah b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partah
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part07
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partai b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part08
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partai
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part08
diff --git a/proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaj b/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part09
similarity index 100%
rename from proprietary/system/priv-app/MiuiCamera/MiuiCamera.partaj
rename to proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part09
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 817053a..cc83c46 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,2 @@
 # Lets assemble MiuiCamera.apk from its split parts
-
-cat vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.part* > vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk
\ No newline at end of file
+cat vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk.part* > vendor/xiaomi/camera/proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk