diff --git a/usr/bin/archboot-cpio.sh b/usr/bin/archboot-cpio.sh
index e2bc81cb3..ffe2e2344 100755
--- a/usr/bin/archboot-cpio.sh
+++ b/usr/bin/archboot-cpio.sh
@@ -26,9 +26,9 @@ if [[ ! -f "${_KERNEL}" ]]; then
     _abort "kernel image does not exist!"
 fi
 _KERNELVERSION="$(_kver "${_KERNEL}")"
-_MODULE_DIR="/lib/modules/${_KERNELVERSION}"
-[[ -d "${_MODULE_DIR}" ]] || _abort "${_MODULE_DIR} is not a valid kernel module directory!"
-_ALL_MODS="$(find "${_MODULE_DIR}" -name '*.ko*' 2>"${_NO_LOG}")"
+_MOD_DIR="/lib/modules/${_KERNELVERSION}"
+[[ -d "${_MOD_DIR}" ]] || _abort "${_MOD_DIR} is not a valid kernel module directory!"
+_ALL_MODS="$(find "${_MOD_DIR}" -name '*.ko*' 2>"${_NO_LOG}")"
 _BUILD_DIR="$(_init_rootfs "${_KERNELVERSION}" "${_TARGET_DIR}")" || exit 1
 _ROOTFS="${_TARGET_DIR:-${_BUILD_DIR}/root}"
 if [[ -n "${_GENERATE_IMAGE}" ]]; then
diff --git a/usr/lib/archboot/cpio/cpio.sh b/usr/lib/archboot/cpio/cpio.sh
index 64f13c40e..d2f174e46 100644
--- a/usr/lib/archboot/cpio/cpio.sh
+++ b/usr/lib/archboot/cpio/cpio.sh
@@ -185,7 +185,7 @@ _install_mods() {
                 | tr " " "\n" | sort -u)"
         _DEP_COUNT2="$(wc -w <<< "${_MOD_DEPS}")"
     done
-    _map _file "${_MODULE_DIR}"/modules.{builtin,builtin.modinfo,order}
+    _map _file "${_MOD_DIR}"/modules.{builtin,builtin.modinfo,order}
     _install_files
     # Adding kernel modules:
     # - pull in all modules with depends
@@ -198,7 +198,7 @@ _install_mods() {
     depmod -b "${_ROOTFS}" "${_KERNELVERSION}"
     # remove all non-binary module.* files (except devname for on-demand module loading
     # and builtin.modinfo for checking on builtin modules)
-    rm "${_ROOTFS}${_MODULE_DIR}"/modules.{alias,builtin,dep,order,symbols}
+    rm "${_ROOTFS}${_MOD_DIR}"/modules.{alias,builtin,dep,order,symbols}
 }
 
 _install_libs() {