diff --git a/configs/beaglebone_black_debian_emmc_config b/configs/beaglebone_black_debian_emmc_config
index 50e513f..fff03d8 100644
--- a/configs/beaglebone_black_debian_emmc_config
+++ b/configs/beaglebone_black_debian_emmc_config
@@ -5,4 +5,4 @@ BEAGLEBONE_BLACK_CONFIG="beaglebone_black_debian_emmc"
 source configs/beaglebone_black_base_config
 MENDER_STORAGE_TOTAL_SIZE_MB="3648"
 MENDER_DEVICE_TYPE="beaglebone-emmc"
-MENDER_STORAGE_DEVICE="/dev/mmcblk1p"
+MENDER_STORAGE_DEVICE_BASE="/dev/mmcblk1p"
diff --git a/configs/beaglebone_black_debian_sdcard_config b/configs/beaglebone_black_debian_sdcard_config
index 63a7df7..d72e5e5 100644
--- a/configs/beaglebone_black_debian_sdcard_config
+++ b/configs/beaglebone_black_debian_sdcard_config
@@ -1,4 +1,4 @@
 BEAGLEBONE_BLACK_CONFIG="beaglebone_black_debian_sdcard"
 source configs/beaglebone_black_base_config
 MENDER_DEVICE_TYPE="beaglebone-sdcard"
-MENDER_STORAGE_DEVICE="/dev/mmcblk0p"
+MENDER_STORAGE_DEVICE_BASE="/dev/mmcblk0p"
diff --git a/configs/mender_convert_config b/configs/mender_convert_config
index 9071ad1..cb4a1b1 100644
--- a/configs/mender_convert_config
+++ b/configs/mender_convert_config
@@ -102,23 +102,23 @@ MENDER_STORAGE_URL="https://d1b0l86ne08fsf.cloudfront.net"
 # Mender GitHub organization URL prefix
 MENDER_GITHUB_ORG="https://github.com/mendersoftware"
 
-# Device file corresponding to the root filesystem partitions, without index.
-MENDER_STORAGE_DEVICE=/dev/mmcblk0p
+# Device file corresponding to the root filesystem partitions, without number.
+MENDER_STORAGE_DEVICE_BASE=/dev/mmcblk0p
 
-# Partition index of boot partition
-MENDER_BOOT_PART_INDEX="1"
+# Partition number of boot partition
+MENDER_BOOT_PART_NUMBER="1"
 
-# Partition index of root filesystem A
-MENDER_ROOTFS_PART_A_INDEX="2"
+# Partition number of root filesystem A
+MENDER_ROOTFS_PART_A_NUMBER="2"
 
-# Partition index of root filesystem B
-MENDER_ROOTFS_PART_B_INDEX="3"
+# Partition number of root filesystem B
+MENDER_ROOTFS_PART_B_NUMBER="3"
 
-# Partition index of persistent data partition
-MENDER_DATA_PART_INDEX="4"
+# Partition number of persistent data partition
+MENDER_DATA_PART_NUMBER="4"
 
 # Basename of DTB that should be loaded by the bootloader.
-MENDER_KERNEL_DEVICETREE=kernel.dtb
+MENDER_DTB_NAME=kernel.dtb
 
 # Generate bmap index files
 #
diff --git a/configs/qemux86-64_config b/configs/qemux86-64_config
index 42e2b67..7113688 100644
--- a/configs/qemux86-64_config
+++ b/configs/qemux86-64_config
@@ -12,7 +12,7 @@
 #
 #    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/ovmf/x64/OVMF_CODE.fd -drive format=raw,file=qemux86_64-release-1.sdimg
 
-MENDER_STORAGE_DEVICE=/dev/sda
+MENDER_STORAGE_DEVICE_BASE=/dev/sda
 MENDER_DEVICE_TYPE="qemux86_64"
 
 # Nothing to copy
diff --git a/configs/rockpro64_emmc_config b/configs/rockpro64_emmc_config
index f2988ed..0765806 100644
--- a/configs/rockpro64_emmc_config
+++ b/configs/rockpro64_emmc_config
@@ -1,4 +1,4 @@
 ROCKPRO64_CONFIG="rockpro64_emmc"
-MENDER_STORAGE_DEVICE=/dev/mmcblk1p
+MENDER_STORAGE_DEVICE_BASE=/dev/mmcblk1p
 
 source configs/rockpro64_config
diff --git a/mender-convert-modify b/mender-convert-modify
index e6cd741..2073a38 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -119,13 +119,13 @@ if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
   fi
 
   cat <<- EOF > work/grub-mender-grubenv-${MENDER_GRUBENV_VERSION}/mender_grubenv_defines
-mender_rootfsa_part=${MENDER_ROOTFS_PART_A_INDEX}
-mender_rootfsb_part=${MENDER_ROOTFS_PART_B_INDEX}
-mender_kernel_root_base=${MENDER_STORAGE_DEVICE}
+mender_rootfsa_part=${MENDER_ROOTFS_PART_A_NUMBER}
+mender_rootfsb_part=${MENDER_ROOTFS_PART_B_NUMBER}
+mender_kernel_root_base=${MENDER_STORAGE_DEVICE_BASE}
 mender_grub_storage_device=${MENDER_GRUB_STORAGE_DEVICE}
 kernel_imagetype=${kernel_imagetype}
 initrd_imagetype=${initrd_imagetype}
-kernel_devicetree=${MENDER_KERNEL_DEVICETREE}
+kernel_devicetree=${MENDER_DTB_NAME}
 EOF
 
   if [ -n "${MENDER_GRUB_KERNEL_BOOT_ARGS}" ]; then
@@ -183,8 +183,8 @@ run_and_log_cmd "sudo ln -sf /data/mender work/rootfs/var/lib/mender"
 
 cat <<- EOF > work/mender.conf.data
 {
-  "RootfsPartA": "${MENDER_STORAGE_DEVICE}${MENDER_ROOTFS_PART_A_INDEX}",
-  "RootfsPartB": "${MENDER_STORAGE_DEVICE}${MENDER_ROOTFS_PART_B_INDEX}"
+  "RootfsPartA": "${MENDER_STORAGE_DEVICE_BASE}${MENDER_ROOTFS_PART_A_NUMBER}",
+  "RootfsPartB": "${MENDER_STORAGE_DEVICE_BASE}${MENDER_ROOTFS_PART_B_NUMBER}"
 }
 EOF
 
@@ -225,8 +225,8 @@ sudo bash -c "cat <<- EOF > work/rootfs/etc/fstab
 /dev/root            /                    auto       defaults              1  1
 proc                 /proc                proc       defaults              0  0
 
-${MENDER_STORAGE_DEVICE}${MENDER_BOOT_PART_INDEX}   ${boot_part_mountpoint}          auto       defaults,sync    0  0
-${MENDER_STORAGE_DEVICE}${MENDER_DATA_PART_INDEX}   /data          auto       ${MENDER_DATA_PART_FSTAB_OPTS}      0  0
+${MENDER_STORAGE_DEVICE_BASE}${MENDER_BOOT_PART_NUMBER}   ${boot_part_mountpoint}          auto       defaults,sync    0  0
+${MENDER_STORAGE_DEVICE_BASE}${MENDER_DATA_PART_NUMBER}   /data          auto       ${MENDER_DATA_PART_FSTAB_OPTS}      0  0
 EOF"
 
 log_info "Performing platform specific modifications (if any)"
diff --git a/mender-convert-package b/mender-convert-package
index c2bf1ea..f5faf2f 100755
--- a/mender-convert-package
+++ b/mender-convert-package
@@ -286,16 +286,16 @@ fi
 distro_feature="${distro_feature} mender-convert"
 
 cat <<- EOF > deploy/${image_name}.cfg
-MENDER_BOOT_PART="${MENDER_STORAGE_DEVICE}${MENDER_BOOT_PART_INDEX}"
-MENDER_ROOTFS_PART_A="${MENDER_STORAGE_DEVICE}${MENDER_ROOTFS_PART_A_INDEX}"
-MENDER_ROOTFS_PART_B="${MENDER_STORAGE_DEVICE}${MENDER_ROOTFS_PART_B_INDEX}"
+MENDER_BOOT_PART="${MENDER_STORAGE_DEVICE_BASE}${MENDER_BOOT_PART_NUMBER}"
+MENDER_ROOTFS_PART_A="${MENDER_STORAGE_DEVICE_BASE}${MENDER_ROOTFS_PART_A_NUMBER}"
+MENDER_ROOTFS_PART_B="${MENDER_STORAGE_DEVICE_BASE}${MENDER_ROOTFS_PART_B_NUMBER}"
 MENDER_BOOT_PART_MOUNT_LOCATION="${boot_part_mountpoint}"
 MENDER_BOOT_PART_SIZE_MB="$(disk_sectors_to_mb ${boot_part_sectors})"
 MENDER_DATA_PART_SIZE_MB="${MENDER_DATA_PART_SIZE_MB}"
 MENDER_DEVICE_TYPE="${device_type}"
 MENDER_PARTITIONING_OVERHEAD_KB="$(( (${overhead_sectors} * 512) / 1024 ))"
 MENDER_PARTITION_ALIGNMENT="${MENDER_PARTITION_ALIGNMENT}"
-MENDER_STORAGE_DEVICE="${MENDER_STORAGE_DEVICE}"
+MENDER_STORAGE_DEVICE_BASE="${MENDER_STORAGE_DEVICE_BASE}"
 MENDER_STORAGE_TOTAL_SIZE_MB="${MENDER_STORAGE_TOTAL_SIZE_MB}"
 MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET="12582912"
 MENDER_ARTIFACT_NAME="${artifact_name}"