diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh
index 00fa007d..3c35bc38 100755
--- a/files/initrd/opt/arc/include/update.sh
+++ b/files/initrd/opt/arc/include/update.sh
@@ -140,29 +140,29 @@ function updateLoader() {
         local SHA="https://github.com/AuxXxilium/arc/releases/download/${TAG}/checksum.sha256"
       fi
       if [ "${ARCNIC}" == "auto" ]; then
-        curl -#kL "${URL}" -o "${TMP_PATH}/update-${ARCBRANCH}.zip" 2>&1 | while IFS= read -r -n1 char; do
+        curl -#kL "${URL}" -o "${TMP_PATH}/update.zip" 2>&1 | while IFS= read -r -n1 char; do
           [[ $char =~ [0-9] ]] && keep=1 ;
           [[ $char == % ]] && echo "Download: $progress%" && progress="" && keep=0 ;
           [[ $keep == 1 ]] && progress="$progress$char" ;
         done
-        curl -skL "${SHA}" -o "${TMP_PATH}/checksum-${ARCBRANCH}.sha256"
+        curl -skL "${SHA}" -o "${TMP_PATH}/checksum.sha256"
       else
-        curl --interface ${ARCNIC} -#kL "${URL}" -o "${TMP_PATH}/update-${ARCBRANCH}.zip" 2>&1 | while IFS= read -r -n1 char; do
+        curl --interface ${ARCNIC} -#kL "${URL}" -o "${TMP_PATH}/update.zip" 2>&1 | while IFS= read -r -n1 char; do
           [[ $char =~ [0-9] ]] && keep=1 ;
           [[ $char == % ]] && echo "Download: $progress%" && progress="" && keep=0 ;
           [[ $keep == 1 ]] && progress="$progress$char" ;
         done
-        curl --interface ${ARCNIC} -skL "${SHA}" -o "${TMP_PATH}/checksum-${ARCBRANCH}.sha256"
+        curl --interface ${ARCNIC} -skL "${SHA}" -o "${TMP_PATH}/checksum.sha256"
       fi
-      if [ "$(sha256sum "${TMP_PATH}/update-${ARCBRANCH}.zip" | awk '{print $1}')" = "$(cat ${TMP_PATH}/checksum-${ARCBRANCH}.sha256 | awk '{print $1}')" ]; then
+      if [ "$(sha256sum "${TMP_PATH}/update.zip" | awk '{print $1}')" = "$(cat ${TMP_PATH}/checksum.sha256 | awk '{print $1}')" ]; then
         echo "Download successful!"
-        unzip -oq "${TMP_PATH}/update-${ARCBRANCH}.zip" -d "${TMP_PATH}"
+        unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}"
         echo "Installing new Loader Image..."
         mv -f "${TMP_PATH}/grub.cfg" "${USER_GRUB_CONFIG}"
         mv -f "${TMP_PATH}/ARC-VERSION" "${PART1_PATH}/ARC-VERSION"
         mv -f "${TMP_PATH}/bzImage-arc" "${ARC_BZIMAGE_FILE}"
         mv -f "${TMP_PATH}/initrd-arc" "${ARC_RAMDISK_FILE}"
-        rm -f "${TMP_PATH}/update-${ARCBRANCH}.zip"
+        rm -f "${TMP_PATH}/update.zip"
       else
         echo "Error getting new Version!"
         sleep 5
diff --git a/img-gen.sh b/img-gen.sh
index ba530dd8..2fe3252a 100755
--- a/img-gen.sh
+++ b/img-gen.sh
@@ -19,7 +19,7 @@ getBuildroot "latest" "brx"
 getBuildroot "stable" "brs"
 
 # Xbase
-IMAGE_FILE="arc-x.img"
+IMAGE_FILE="arc.img"
 gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
@@ -37,9 +37,9 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 [[ ! -f "brx/bzImage-arc" || ! -f "brx/initrd-arc" ]] && return 1
 
 VERSION=$(date +'%y.%-m.dev')
-echo "${VERSION}-x" >files/p1/ARC-VERSION
-echo "${VERSION}-x" >VERSION
-sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}-x'"/' -i files/initrd/opt/arc/include/consts.sh
+echo "${VERSION}" >files/p1/ARC-VERSION
+echo "${VERSION}" >VERSION
+sed 's/^ARC_VERSION=.*/ARC_VERSION="'${VERSION}'"/' -i files/initrd/opt/arc/include/consts.sh
 
 echo "Repack initrd"
 cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
@@ -58,9 +58,9 @@ rmdir "/tmp/p3"
 
 sudo losetup --detach ${LOOPX}
 
-qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-x-dyn.vmdk
-qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc-x.vmdk
-qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc-x.vhdx
+qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk
+qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
+qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx
 
 # Sbase
 IMAGE_FILE="arc-s.img"