diff --git a/beaglebone-black.sh b/beaglebone-black.sh
index 51b5dc3..31d6c79 100755
--- a/beaglebone-black.sh
+++ b/beaglebone-black.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-bbb}
+imagename=${3:-kali-linux-$1-beaglebone-black}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/chromebook-arm-exynos.sh b/chromebook-exynos.sh
similarity index 99%
rename from chromebook-arm-exynos.sh
rename to chromebook-exynos.sh
index 5ad8244..e71240f 100755
--- a/chromebook-arm-exynos.sh
+++ b/chromebook-exynos.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-exynos}
+imagename=${3:-kali-linux-$1-chromebook-exynos}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/chromebook-arm-nyan.sh b/chromebook-nyan.sh
similarity index 99%
rename from chromebook-arm-nyan.sh
rename to chromebook-nyan.sh
index 8b18b9a..533d2d9 100755
--- a/chromebook-arm-nyan.sh
+++ b/chromebook-nyan.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-nyan}
+imagename=${3:-kali-linux-$1-chromebook-nyan}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/chromebook-arm-veyron.sh b/chromebook-veyron.sh
similarity index 99%
rename from chromebook-arm-veyron.sh
rename to chromebook-veyron.sh
index 796a383..2de3057 100755
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-veyron.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-veyron}
+imagename=${3:-kali-linux-$1-chromebook-veyron}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/cubox-i4-pro.sh b/cubox-i4pro.sh
similarity index 99%
rename from cubox-i4-pro.sh
rename to cubox-i4pro.sh
index 05da409..a4bfbcc 100755
--- a/cubox-i4-pro.sh
+++ b/cubox-i4pro.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-cuboxi}
+imagename=${3:-kali-linux-$1-cubox-i4pro}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/mini-x.sh b/mini-x.sh
index cf7fb35..73daff3 100755
--- a/mini-x.sh
+++ b/mini-x.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-minix}
+imagename=${3:-kali-linux-$1-mini-x}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/nanopc-t3.sh b/nanopc-t.sh
similarity index 99%
rename from nanopc-t3.sh
rename to nanopc-t.sh
index 0fb50de..5aa7f04 100755
--- a/nanopc-t3.sh
+++ b/nanopc-t.sh
@@ -16,7 +16,7 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"nanopi3"}
+hw_model=${hw_model:-"nanopc-t"}
 # Architecture
 architecture=${architecture:-"arm64"}
 # Variant name for image and dir build
diff --git a/nanopi-neo-plus2-minimal.sh b/nanopi-neo-plus2-minimal.sh
index f219bf0..50467b6 100755
--- a/nanopi-neo-plus2-minimal.sh
+++ b/nanopi-neo-plus2-minimal.sh
@@ -16,11 +16,11 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"nanopi-neo-plus2-minimal"}
+hw_model=${hw_model:-"nanopi-neo-plus2"}
 # Architecture
 architecture=${architecture:-"arm64"}
 # Variant name for image and dir build
-variant=${variant:-"${architecture}"}
+variant=${variant:-"minimal-${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"none"}
 
diff --git a/odroid-c.sh b/odroid-c.sh
index 72e2a9a..a9c3839 100755
--- a/odroid-c.sh
+++ b/odroid-c.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-odroidc}
+imagename=${3:-kali-linux-$1-odroid-c}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/odroid-u2.sh b/odroid-u2.sh
index d2fa4c7..de24d66 100755
--- a/odroid-u2.sh
+++ b/odroid-u2.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-odroidu2}
+imagename=${3:-kali-linux-$1-odroid-u}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/riotboard.sh b/riotboard.sh
index 86cf20e..9eac5fa 100755
--- a/riotboard.sh
+++ b/riotboard.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-riot}
+imagename=${3:-kali-linux-$1-riotboard}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/rpi3-64-minimal.sh b/rpi-64bit-minimal.sh
similarity index 99%
rename from rpi3-64-minimal.sh
rename to rpi-64bit-minimal.sh
index 19e00d3..c2f5d6e 100755
--- a/rpi3-64-minimal.sh
+++ b/rpi-64bit-minimal.sh
@@ -20,7 +20,7 @@ hw_model=${hw_model:-"rpi4"}
 # Architecture
 architecture=${architecture:-"arm64"}
 # Variant name for image and dir build
-variant=${variant:-"nexmon-${architecture}-lite"}
+variant=${variant:-"minimal-${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"none"}
 
diff --git a/rpi3-64.sh b/rpi-64bit.sh
similarity index 98%
rename from rpi3-64.sh
rename to rpi-64bit.sh
index 7aaee30..cb42df5 100755
--- a/rpi3-64.sh
+++ b/rpi-64bit.sh
@@ -16,11 +16,11 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"rpi4"}
+hw_model=${hw_model:-"rpi"}
 # Architecture
 architecture=${architecture:-"arm64"}
 # Variant name for image and dir build
-variant=${variant:-"nexmon-${architecture}"}
+variant=${variant:-"${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"xfce"}
 
diff --git a/rpi3-nexmon.sh b/rpi.sh
similarity index 98%
rename from rpi3-nexmon.sh
rename to rpi.sh
index a68404f..724e47a 100755
--- a/rpi3-nexmon.sh
+++ b/rpi.sh
@@ -16,11 +16,11 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"rpi4"}
+hw_model=${hw_model:-"rpi"}
 # Architecture
 architecture=${architecture:-"armhf"}
 # Variant name for image and dir build
-variant=${variant:-"nexmon-${architecture}"}
+variant=${variant:-"${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"xfce"}
 
diff --git a/rpi0w-nexmon-minimal.sh b/rpi0w-minimal.sh
similarity index 99%
rename from rpi0w-nexmon-minimal.sh
rename to rpi0w-minimal.sh
index 40ee629..40f4e56 100755
--- a/rpi0w-nexmon-minimal.sh
+++ b/rpi0w-minimal.sh
@@ -20,7 +20,7 @@ hw_model=${hw_model:-"rpi0w"}
 # Architecture
 architecture=${architecture:-"armel"}
 # Variant name for image and dir build
-variant=${variant:-"nexmon-${architecture}-lite"}
+variant=${variant:-"ninimal-${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"none"}
 
diff --git a/rpi0w-nexmon-p4wnp1-aloa.sh b/rpi0w-p4wnp1-aloa.sh
similarity index 99%
rename from rpi0w-nexmon-p4wnp1-aloa.sh
rename to rpi0w-p4wnp1-aloa.sh
index c2cb019..04d38ee 100755
--- a/rpi0w-nexmon-p4wnp1-aloa.sh
+++ b/rpi0w-p4wnp1-aloa.sh
@@ -27,7 +27,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-rpi0w-p4wnp1}
+imagename=${3:-kali-linux-$1-rpi0w-p4wnp1-aloa}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/rpi0w-nexmon.sh b/rpi0w.sh
similarity index 99%
rename from rpi0w-nexmon.sh
rename to rpi0w.sh
index 540f4e5..6af33fd 100755
--- a/rpi0w-nexmon.sh
+++ b/rpi0w.sh
@@ -20,7 +20,7 @@ hw_model=${hw_model:-"rpi0w"}
 # Architecture
 architecture=${architecture:-"armel"}
 # Variant name for image and dir build
-variant=${variant:-"nexmon-${architecture}"}
+variant=${variant:-"${architecture}"}
 # Desktop manager (xfce, gnome, i3, kde, lxde, mate, e17 or none)
 desktop=${desktop:-"xfce"}
 
diff --git a/rpi1.sh b/rpi1.sh
index 6cfff29..7f0c67f 100755
--- a/rpi1.sh
+++ b/rpi1.sh
@@ -16,7 +16,7 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"rpi"}
+hw_model=${hw_model:-"rpi1"}
 # Architecture
 architecture=${architecture:-"armel"}
 # Variant name for image and dir build
diff --git a/usb-armory-mk1.sh b/usb-armory-mki.sh
similarity index 99%
rename from usb-armory-mk1.sh
rename to usb-armory-mki.sh
index 28f88ce..7932802 100755
--- a/usb-armory-mk1.sh
+++ b/usb-armory-mki.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-usbarmory}
+imagename=${3:-kali-linux-$1-usbarmory-mki}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}
diff --git a/usb-armory-mk2.sh b/usb-armory-mkii.sh
similarity index 99%
rename from usb-armory-mk2.sh
rename to usb-armory-mkii.sh
index f3156c8..edba347 100755
--- a/usb-armory-mk2.sh
+++ b/usb-armory-mkii.sh
@@ -16,7 +16,7 @@ set -e
 source ./common.d/functions.sh
 
 # Hardware model
-hw_model=${hw_model:-"usbarmory-mk2"}
+hw_model=${hw_model:-"usbarmory-mkii"}
 # Architecture
 architecture=${architecture:-"armhf"}
 # Variant name for image and dir build
diff --git a/utilite-pro.sh b/utilite-pro.sh
index b99df2f..7a0c4ac 100755
--- a/utilite-pro.sh
+++ b/utilite-pro.sh
@@ -25,7 +25,7 @@ machine=$(tr -cd 'A-Za-z0-9' < /dev/urandom | head -c16 ; echo)
 # Custom hostname variable
 hostname=${2:-kali}
 # Custom image file name variable - MUST NOT include .img at the end
-imagename=${3:-kali-linux-$1-utilite}
+imagename=${3:-kali-linux-$1-utilite-pro}
 # Suite to use, valid options are:
 # kali-rolling, kali-dev, kali-bleeding-edge, kali-dev-only, kali-experimental, kali-last-snapshot
 suite=${suite:-"kali-rolling"}