diff --git a/RootStock-NG.sh b/RootStock-NG.sh
index 4d33939918584d8335017b5237b4a3c8a782a98f..f22df0fc39a5f4afc7439a1b7ca28ac46cf54939 100755
--- a/RootStock-NG.sh
+++ b/RootStock-NG.sh
@@ -58,7 +58,7 @@ run_project () {
 	#Optional:
 	#3.7.6-x8-dtbs.tar.gz
 	#3.7.6-x8-firmware.tar.gz
-	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/v3.7.6-x8/ ${mirror}/${deb_codename}-${dpkg_arch}/v3.2.33-psp26/ ${mirror}/${deb_codename}-${dpkg_arch}/v3.8.0-rc6-bone3/"
+	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/v3.7.6-x8/ ${mirror}/${deb_codename}-${deb_arch}/v3.2.33-psp26/ ${mirror}/${deb_codename}-${deb_arch}/v3.8.0-rc6-bone3/"
 
 	tempdir=$(mktemp -d -p ${DIR}/ignore)
 
@@ -68,7 +68,7 @@ run_project () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 
 		deb_mirror="${deb_mirror}"
 		deb_components="${deb_components}"
diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index 1b0aae254fab9b9d329934a62d0ae2ef2c73eb6e..dd8bd9413a69fd6af7b5091670b0cc0b72a0537c 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -79,21 +79,21 @@ minimal_armel () {
 	case "${deb_codename}" in
 	wheezy)
 		#http://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	quantal)
-		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
 		;;
 	esac
 
 	#When doing offical releases, always hard lock the kernel version...
-	#chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/v3.8.13-bone41/"
+	#chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/v3.8.13-bone41/"
 
 	tempdir=$(mktemp -d -p ${DIR}/ignore)
 
@@ -103,7 +103,7 @@ minimal_armel () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		deb_mirror="${deb_mirror}"
@@ -257,7 +257,7 @@ kernel_chooser () {
 		rm -rf ${tempdir}/LATEST-${SUBARCH} || true
 	fi
 
-	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${dpkg_arch}/LATEST-${SUBARCH}
+	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${deb_arch}/LATEST-${SUBARCH}
 	FTP_DIR=$(cat ${tempdir}/LATEST-${SUBARCH} | grep "ABI:1 ${KERNEL_ABI}" | awk '{print $3}')
 	FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
 }
@@ -266,7 +266,7 @@ select_rcn_ee_net_kernel () {
 	SUBARCH="omap-psp"
 	KERNEL_ABI="STABLE"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 }
 
 pkg_list () {
@@ -436,7 +436,7 @@ chroot_multiarch_armel="enable"
 
 third_party_modules="enable"
 
-dpkg_arch="armhf"
+deb_arch="armhf"
 DEFAULT_RELEASES="wheezy"
 for REL in ${RELEASES:-$DEFAULT_RELEASES} ; do
 	${REL}_release
diff --git a/eewiki_barefs_image.sh b/eewiki_barefs_image.sh
index 1fc1a5c73019c87f1e43cf1cceff1170945baa70..f7e11184fecea276a7790426d9802afc7badefd3 100755
--- a/eewiki_barefs_image.sh
+++ b/eewiki_barefs_image.sh
@@ -40,16 +40,16 @@ minimal_armel () {
 	case "${deb_codename}" in
 	wheezy)
 		#http://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	quantal)
-		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
 		;;
 	esac
 
@@ -61,7 +61,7 @@ minimal_armel () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		deb_mirror="${deb_mirror}"
@@ -293,11 +293,11 @@ no_pkgs="enable"
 #chroot_enable_debian_backports=""
 #chroot_debian_backports_pkg_list=""
 
-dpkg_arch="armel"
+deb_arch="armel"
 wheezy_release
 #jessie_release
 
-dpkg_arch="armhf"
+deb_arch="armhf"
 wheezy_release
 #jessie_release
 #saucy_release
diff --git a/eewiki_base_image.sh b/eewiki_base_image.sh
index 928953df8347f0c0dd16edd141348198b8f7499c..5de40c3d9ee355fe07d517df073f95e10c1e917b 100755
--- a/eewiki_base_image.sh
+++ b/eewiki_base_image.sh
@@ -41,16 +41,16 @@ minimal_armel () {
 	case "${deb_codename}" in
 	wheezy)
 		#http://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	quantal)
-		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
 		;;
 	esac
 
@@ -62,7 +62,7 @@ minimal_armel () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		deb_mirror="${deb_mirror}"
@@ -296,11 +296,11 @@ chroot_generic_startup_scripts="enable"
 #chroot_enable_debian_backports=""
 #chroot_debian_backports_pkg_list=""
 
-dpkg_arch="armel"
+deb_arch="armel"
 wheezy_release
 #jessie_release
 
-dpkg_arch="armhf"
+deb_arch="armhf"
 wheezy_release
 #jessie_release
 saucy_release
diff --git a/generic_image.sh b/generic_image.sh
index 17ebd5a7f6fff548b65e1df4c78b6a13417687c3..b1d33f927e57d2efa04914bbef7deafed2a88f72 100755
--- a/generic_image.sh
+++ b/generic_image.sh
@@ -47,7 +47,7 @@ run_rootstock () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		apt_proxy="${apt_proxy}"
@@ -102,14 +102,14 @@ if [ ! "${deb_codename}" ] ; then
 		#deb_codename="trusty"
 	fi
 fi
-if [ ! "${dpkg_arch}" ] ; then
+if [ ! "${deb_arch}" ] ; then
 	##Selects which base archtecture
 	if [ "x${deb_distribution}" = "xdebian" ] ; then
-		dpkg_arch="armhf"
-		#dpkg_arch="armel"
+		deb_arch="armhf"
+		#deb_arch="armel"
 	fi
 	if [ "x${deb_distribution}" = "xubuntu" ] ; then
-		dpkg_arch="armhf"
+		deb_arch="armhf"
 	fi
 fi
 if [ ! "${image_name}" ] ; then
@@ -118,7 +118,7 @@ if [ ! "${image_name}" ] ; then
 fi
 if [ ! "${export_filename}" ] ; then
 	##Generic file name
-	export_filename="${deb_distribution}-${deb_codename}-${image_name}-${dpkg_arch}-${time}"
+	export_filename="${deb_distribution}-${deb_codename}-${image_name}-${deb_arch}-${time}"
 fi
 rfs_hostname=${rfs_hostname:-"arm"}
 rfs_username=${rfs_username:-"${deb_distribution}"}
diff --git a/rcn-ee_image.sh b/rcn-ee_image.sh
index 211b31f436bd282273593ea0c0c4e44de35d1b9e..a3ba67dda7eaafcc6aeb35c3e12c522b0598bd57 100755
--- a/rcn-ee_image.sh
+++ b/rcn-ee_image.sh
@@ -44,23 +44,23 @@ minimal_armel () {
 	case "${deb_codename}" in
 	wheezy)
 		#http://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	quantal)
-		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
 		;;
 	esac
 
 #	if [ -f ${DIR}/release ] ; then
 #		chroot_KERNEL_HTTP_DIR="\
-#${mirror}/${deb_codename}-${dpkg_arch}/v3.13.3-armv7-x10/ \
-#${mirror}/${deb_codename}-${dpkg_arch}/v3.8.13-bone40/"
+#${mirror}/${deb_codename}-${deb_arch}/v3.13.3-armv7-x10/ \
+#${mirror}/${deb_codename}-${deb_arch}/v3.8.13-bone40/"
 #	fi
 
 	tempdir=$(mktemp -d -p ${DIR}/ignore)
@@ -71,7 +71,7 @@ minimal_armel () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		deb_mirror="${deb_mirror}"
@@ -207,7 +207,7 @@ kernel_chooser () {
 		rm -rf ${tempdir}/LATEST-${SUBARCH} || true
 	fi
 
-	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${dpkg_arch}/LATEST-${SUBARCH}
+	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${deb_arch}/LATEST-${SUBARCH}
 	FTP_DIR=$(cat ${tempdir}/LATEST-${SUBARCH} | grep "ABI:1 ${KERNEL_ABI}" | awk '{print $3}')
 	FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
 }
@@ -216,12 +216,12 @@ select_rcn_ee_net_kernel () {
 	SUBARCH="armv7"
 	KERNEL_ABI="STABLE"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 
 	SUBARCH="omap-psp"
 	KERNEL_ABI="STABLE"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} ${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} ${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 }
 
 pkg_list () {
@@ -373,7 +373,7 @@ chroot_generic_startup_scripts="enable"
 #chroot_enable_debian_backports=""
 #chroot_debian_backports_pkg_list=""
 
-dpkg_arch="armhf"
+deb_arch="armhf"
 DEFAULT_RELEASES="saucy trusty wheezy jessie"
 for REL in ${RELEASES:-$DEFAULT_RELEASES} ; do
 	${REL}_release
diff --git a/rcn-ee_test_image.sh b/rcn-ee_test_image.sh
index 8384a1330e4bdd78ca542ef105edbb7edf92a486..5cf7558ed916d727686707fcb7913ed52bd4c02d 100755
--- a/rcn-ee_test_image.sh
+++ b/rcn-ee_test_image.sh
@@ -44,23 +44,23 @@ minimal_armel () {
 	case "${deb_codename}" in
 	wheezy)
 		#http://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	quantal)
-		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${quantal_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
 		;;
 	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${dpkg_arch}-${time}"
+		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
 		;;
 	esac
 
 #	if [ -f ${DIR}/release ] ; then
 #		chroot_KERNEL_HTTP_DIR="\
-#${mirror}/${deb_codename}-${dpkg_arch}/v3.13.3-armv7-x10/ \
-#${mirror}/${deb_codename}-${dpkg_arch}/v3.8.13-bone40/"
+#${mirror}/${deb_codename}-${deb_arch}/v3.13.3-armv7-x10/ \
+#${mirror}/${deb_codename}-${deb_arch}/v3.8.13-bone40/"
 #	fi
 
 	tempdir=$(mktemp -d -p ${DIR}/ignore)
@@ -71,7 +71,7 @@ minimal_armel () {
 
 		deb_distribution="${deb_distribution}"
 		deb_codename="${deb_codename}"
-		dpkg_arch="${dpkg_arch}"
+		deb_arch="${deb_arch}"
 		time="${time}"
 
 		deb_mirror="${deb_mirror}"
@@ -178,7 +178,7 @@ kernel_chooser () {
 		rm -rf ${tempdir}/LATEST-${SUBARCH} || true
 	fi
 
-	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${dpkg_arch}/LATEST-${SUBARCH}
+	wget --no-verbose --directory-prefix=${tempdir}/ ${mirror}/${deb_codename}-${deb_arch}/LATEST-${SUBARCH}
 	FTP_DIR=$(cat ${tempdir}/LATEST-${SUBARCH} | grep "ABI:1 ${KERNEL_ABI}" | awk '{print $3}')
 	FTP_DIR=$(echo ${FTP_DIR} | awk -F'/' '{print $6}')
 }
@@ -187,12 +187,12 @@ select_rcn_ee_net_kernel () {
 	SUBARCH="armv7"
 	KERNEL_ABI="STABLE"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 
 	SUBARCH="omap-psp"
 	KERNEL_ABI="STABLE"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} ${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR} ${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 }
 
 pkg_list () {
@@ -344,7 +344,7 @@ chroot_generic_startup_scripts="enable"
 #chroot_enable_debian_backports=""
 #chroot_debian_backports_pkg_list=""
 
-dpkg_arch="armhf"
+deb_arch="armhf"
 DEFAULT_RELEASES="wheezy"
 for REL in ${RELEASES:-$DEFAULT_RELEASES} ; do
 	${REL}_release
diff --git a/releases.sh b/releases.sh
index 94050b73c502c28d51eaa7dc84e88ba1758018c7..d521d07ce8da9c9db517147945b524672a6b9ff9 100644
--- a/releases.sh
+++ b/releases.sh
@@ -6,7 +6,7 @@ select_custom_kernel () {
 	SUBARCH="armv7"
 	KERNEL_ABI="TESTING"
 	kernel_chooser
-	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${dpkg_arch}/${FTP_DIR}/"
+	chroot_KERNEL_HTTP_DIR="${mirror}/${deb_codename}-${deb_arch}/${FTP_DIR}/"
 
 	SUBARCH="omap-psp"
 	KERNEL_ABI="STABLE"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index a284c0e640c4ea865a48b03a034f034a2c10c347..fe84cb7ca792dc3ae6a7cf09282ca249aa21cf44 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -47,8 +47,8 @@ check_defines () {
 		exit 1
 	fi
 
-	if [ ! "${dpkg_arch}" ] ; then
-		echo "scripts/deboostrap_first_stage.sh: Error: dpkg_arch undefined"
+	if [ ! "${deb_arch}" ] ; then
+		echo "scripts/deboostrap_first_stage.sh: Error: deb_arch undefined"
 		exit 1
 	fi
 
@@ -845,20 +845,20 @@ if [ "x${chroot_COPY_SETUP_SDCARD}" = "xenable" ] ; then
 fi
 
 if [ "x${chroot_ENABLE_DEB_SRC}" = "xenable" ] ; then
-	echo "Log: packaging src files: [${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar]"
+	echo "Log: packaging src files: [${deb_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar]"
 	cd ${tempdir}/tmp/pkg_src/
-	sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar .
+	sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${deb_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar .
 	cd ${tempdir}
-	ls -lh ${DIR}/deploy/${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar
+	ls -lh ${DIR}/deploy/${deb_arch}-rootfs-${deb_distribution}-${deb_codename}-${time}-src.tar
 	sudo rm -rf ${tempdir}/tmp/pkg_src/ || true
 	report_size
 fi
 
 cd ${tempdir}
-echo "Log: packaging rootfs: [${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}.tar]"
-sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${export_filename}/${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}.tar .
+echo "Log: packaging rootfs: [${deb_arch}-rootfs-${deb_distribution}-${deb_codename}.tar]"
+sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${export_filename}/${deb_arch}-rootfs-${deb_distribution}-${deb_codename}.tar .
 cd ${DIR}/
-ls -lh ${DIR}/deploy/${export_filename}/${dpkg_arch}-rootfs-${deb_distribution}-${deb_codename}.tar
+ls -lh ${DIR}/deploy/${export_filename}/${deb_arch}-rootfs-${deb_distribution}-${deb_codename}.tar
 
 sudo chown -R ${USER}:${USER} ${DIR}/deploy/${export_filename}/
 #
diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh
index 5744520b2712462554c811177682a00610e89e15..36c9a7f467621af9433771a688a416a866b20449 100755
--- a/scripts/debootstrap.sh
+++ b/scripts/debootstrap.sh
@@ -40,8 +40,8 @@ check_defines () {
 		exit 1
 	fi
 
-	if [ ! "${dpkg_arch}" ] ; then
-		echo "scripts/deboostrap_first_stage.sh: Error: dpkg_arch undefined"
+	if [ ! "${deb_arch}" ] ; then
+		echo "scripts/deboostrap_first_stage.sh: Error: deb_arch undefined"
 		exit 1
 	fi
 
@@ -79,14 +79,14 @@ report_size () {
 
 check_defines
 
-echo "Log: Creating: [${deb_distribution}] [${deb_codename}] image for: [${dpkg_arch}]"
+echo "Log: Creating: [${deb_distribution}] [${deb_codename}] image for: [${deb_arch}]"
 
 if [ "${apt_proxy}" ] ; then
 	echo "Log: using apt proxy: [${apt_proxy}]"
 fi
 
 echo "Log: Running: debootstrap in [${tempdir}]"
-echo "Log: [sudo debootstrap ${include} ${exclude} --foreign --arch ${dpkg_arch} ${deb_codename} ${tempdir} http://${apt_proxy}${deb_mirror}]"
-sudo debootstrap ${include} ${exclude} --foreign --arch ${dpkg_arch} ${deb_codename} ${tempdir} http://${apt_proxy}${deb_mirror}
+echo "Log: [sudo debootstrap ${include} ${exclude} --foreign --arch ${deb_arch} ${deb_codename} ${tempdir} http://${apt_proxy}${deb_mirror}]"
+sudo debootstrap ${include} ${exclude} --foreign --arch ${deb_arch} ${deb_codename} ${tempdir} http://${apt_proxy}${deb_mirror}
 report_size
 #