diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 96a9161..b25fede 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -2,11 +2,10 @@
 #http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
 #        --dtb am335x-bone-serial (BeagleBone (v3.8.x) Serial Install)
 
-board="BEAGLEBONE_A"
-
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="BEAGLEBONE_A"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="fatfs_boot"
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 547a7fb..ec7bb6b 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -2,11 +2,10 @@
 #http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
 #        --dtb am335x-bone-video (BeagleBone (v3.8.x) Video Install (with cape adapter))
 
-board="BEAGLEBONE_A"
-
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="BEAGLEBONE_A"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="fatfs_boot"
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index e25c519..e395122 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -2,11 +2,10 @@
 #http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
 #        --dtb am335x-boneblack (BeagleBone Black (v3.8.x))
 
-board="BEAGLEBONE_A"
-
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_conf_board="BEAGLEBONE_A"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="fatfs_boot"
diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf
index 3a083f0..1a49da7 100644
--- a/hwpack/am335x-evmsk.conf
+++ b/hwpack/am335x-evmsk.conf
@@ -2,11 +2,10 @@
 #http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
 #        --dtb am335x-evmsk (AM335X EVM-SK (v3.8.x))
 
-board="BEAGLEBONE_A"
-
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="BEAGLEBONE_A"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="fatfs_boot"
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index ef57dfb..db6dd1f 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -7,8 +7,6 @@ So, the plan for <device>.conf.. Ignore [] seperaters when creating your own *.c
 #http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
 #        --dtb am335x-bone (BeagleBone (v3.8.x))
 
-board="BEAGLEBONE_A"
-
 [(2) Bootloader TI/OMAP]
 [For the xM: http://rcn-ee.net/deb/tools/latest/bootloader-ng ]
 [format of file:]
@@ -16,8 +14,9 @@ board="BEAGLEBONE_A"
 [ABI2:BEAGLEBOARD_XM:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img]
 
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="BEAGLEBONE_A"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 [(3) Partition Setup]
 [omap and a mainline u-boot]
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index b31a8c6..9145887 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -2,12 +2,12 @@
 #https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc6
 #        --dtb imx51-babbage (Freescale i.MX51 Babbage Board:supported)
 
-board="MX51EVK"
 SYSTEM="mx51evk"
 
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="MX51EVK"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="dd_uboot_boot"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index d5555c3..28f4606 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -2,12 +2,12 @@
 #https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc6
 #        --dtb imx53-qsb (Freescale i.MX53 Quick Start Development Board:supported)
 
-board="MX53LOCO"
 SYSTEM="mx53loco"
 
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="MX53LOCO"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="dd_uboot_boot"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 9058aa6..8a963b8 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -2,12 +2,12 @@
 #https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc6
 #        --dtb imx6q-sabrelite (Boundary Devices: Freescale i.MX6Q Board:supported)
 
-board="MX6QSABRELITE_D"
 SYSTEM="mx6qsabrelite"
 
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="MX6QSABRELITE_D"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="dd_uboot_boot"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index d6a1dc6..634a8ea 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -2,11 +2,10 @@
 #https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc6
 #        --dtb imx6q-sabresd (Freescale i.MX6q SABRE Board for Smart Devices:supported)
 
-board="MX6QSABRESD"
-
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="MX6QSABRESD"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="dd_uboot_boot"
diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf
index b407d54..53e7696 100644
--- a/hwpack/omap3-beagle-xm-v3.9.conf
+++ b/hwpack/omap3-beagle-xm-v3.9.conf
@@ -2,12 +2,12 @@
 #https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc2
 #        --dtb omap3-beagle-xm (BeagleBoard xM (v3.9.x))
 
-board="BEAGLEBOARD_XM"
 SYSTEM="beagle_xm"
 
 #Bootloader:
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+conf_board="BEAGLEBOARD_XM"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 bootloader_location="fatfs_boot"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 284d783..efbf464 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -2,15 +2,12 @@
 #Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
 #        --dtb omap3-beagle-xm (BeagleBoard xM:supported)
 
-board="BEAGLEBOARD_XM"
 SYSTEM="beagle_xm"
 
-#Bootloader: http://rcn-ee.net/deb/tools/latest/bootloader-ng
-#ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
-#ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
-
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+#Bootloader:
+conf_board="BEAGLEBOARD_XM"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 bootloader_location="fatfs_boot"
 boot_partition_size="64"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index f0451b1..680cd85 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -2,15 +2,12 @@
 #Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
 #        --dtb omap4-panda (PandaBoard:supported)
 
-board="PANDABOARD"
 SYSTEM="panda"
 
-#Bootloader: http://rcn-ee.net/deb/tools/latest/bootloader-ng
-#ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
-#ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
-
-bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-bootloader_latest_file="bootloader-ng"
+#Bootloader:
+conf_board="PANDABOARD"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_listfile="bootloader-ng"
 
 bootloader_location="fatfs_boot"
 boot_partition_size="64"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index e9b7967..2152ecc 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -156,14 +156,14 @@ function dl_bootloader {
 	mkdir -p ${TEMPDIR}/dl/${DISTARCH}
 	mkdir -p "${DIR}/dl/${DISTARCH}"
 
-	wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${bootloader_http}/${bootloader_latest_file}
+	wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${conf_bl_http}/${conf_bl_listfile}
 
-	if [ ! -f ${TEMPDIR}/dl/${bootloader_latest_file} ] ; then
+	if [ ! -f ${TEMPDIR}/dl/${conf_bl_listfile} ] ; then
 		echo "error: can't connect to rcn-ee.net, retry in a few minutes..."
 		exit
 	fi
 
-	boot_version=$(cat ${TEMPDIR}/dl/${bootloader_latest_file} | grep "VERSION:" | awk -F":" '{print $2}')
+	boot_version=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "VERSION:" | awk -F":" '{print $2}')
 	if [ "x${boot_version}" != "x${minimal_boot}" ] ; then
 		echo "Error: This script is out of date and unsupported..."
 		echo "Please Visit: https://github.com/RobertCNelson to find updates..."
@@ -177,7 +177,7 @@ function dl_bootloader {
 	fi
 
 	if [ "${spl_name}" ] ; then
-		MLO=$(cat ${TEMPDIR}/dl/${bootloader_latest_file} | grep "${ABI}:${board}:SPL" | awk '{print $2}')
+		MLO=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:SPL" | awk '{print $2}')
 		wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MLO}
 		MLO=${MLO##*/}
 		echo "SPL Bootloader: ${MLO}"
@@ -186,7 +186,7 @@ function dl_bootloader {
 	fi
 
 	if [ "${boot_name}" ] ; then
-		UBOOT=$(cat ${TEMPDIR}/dl/${bootloader_latest_file} | grep "${ABI}:${board}:BOOT" | awk '{print $2}')
+		UBOOT=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:BOOT" | awk '{print $2}')
 		wget --directory-prefix=${TEMPDIR}/dl/ ${UBOOT}
 		UBOOT=${UBOOT##*/}
 		echo "UBOOT Bootloader: ${UBOOT}"
@@ -1030,7 +1030,7 @@ function initrd_device_settings {
 	cat > ${TEMPDIR}/initrd-tree/etc/hwpack/SOC.sh <<-__EOF__
 		#!/bin/sh
 		format=1.0
-		board=${board}
+		board=${conf_board}
 
 		bootloader_location=${bootloader_location}
 		dd_spl_uboot_seek=${dd_spl_uboot_seek}
@@ -1043,11 +1043,11 @@ function initrd_device_settings {
 		boot_fstype=${boot_fstype}
 
 		serial_tty=${SERIAL}
-		conf_loadaddr=${conf_loadaddr}
-		conf_initrdaddr=${conf_initrdaddr}
-		conf_zreladdr=${conf_zreladdr}
-		conf_fdtaddr=${conf_fdtaddr}
-		conf_fdtfile=${conf_fdtfile}
+		loadaddr=${conf_loadaddr}
+		initrdaddr=${conf_initrdaddr}
+		zreladdr=${conf_zreladdr}
+		fdtaddr=${conf_fdtaddr}
+		fdtfile=${conf_fdtfile}
 
 		usbnet_mem=${usbnet_mem}
 
@@ -1321,7 +1321,7 @@ function populate_boot {
 		cat > ${TEMPDIR}/disk/SOC.sh <<-__EOF__
 			#!/bin/sh
 			format=1.0
-			board=${board}
+			board=${conf_board}
 
 			bootloader_location=${bootloader_location}
 			dd_spl_uboot_seek=${dd_spl_uboot_seek}
@@ -1334,11 +1334,11 @@ function populate_boot {
 			boot_fstype=${boot_fstype}
 
 			serial_tty=${SERIAL}
-			conf_loadaddr=${conf_loadaddr}
-			conf_initrdaddr=${conf_initrdaddr}
-			conf_zreladdr=${conf_zreladdr}
-			conf_fdtaddr=${conf_fdtaddr}
-			conf_fdtfile=${conf_fdtfile}
+			loadaddr=${conf_loadaddr}
+			initrdaddr=${conf_initrdaddr}
+			zreladdr=${conf_zreladdr}
+			fdtaddr=${conf_fdtaddr}
+			fdtfile=${conf_fdtfile}
 
 			usbnet_mem=${usbnet_mem}
 
@@ -1480,8 +1480,8 @@ function convert_uboot_to_dtb_board {
 
 function check_uboot_type {
 	#New defines for hwpack:
-	bootloader_http="http://rcn-ee.net/deb/tools/latest/"
-	bootloader_latest_file="bootloader-ng"
+	conf_bl_http="http://rcn-ee.net/deb/tools/latest"
+	conf_bl_listfile="bootloader-ng"
 
 	unset IN_VALID_UBOOT
 	unset USE_UIMAGE
@@ -1508,7 +1508,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="beagle_bx"
-		board="BEAGLEBOARD_BX"
+		conf_board="BEAGLEBOARD_BX"
 		is_omap
 		#conf_fdtfile="omap3-beagle.dtb"
 		usbnet_mem="8192"
@@ -1521,7 +1521,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="beagle_cx"
-		board="BEAGLEBOARD_CX"
+		conf_board="BEAGLEBOARD_CX"
 		is_omap
 		#conf_fdtfile="omap3-beagle.dtb"
 		usbnet_mem="8192"
@@ -1541,7 +1541,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="bone"
-		board="BEAGLEBONE_A"
+		conf_board="BEAGLEBONE_A"
 		is_omap
 		SERIAL="ttyO0"
 		SERIAL_CONSOLE="${SERIAL},115200n8"
@@ -1564,7 +1564,7 @@ function check_uboot_type {
 	igepv2)
 		uboot_SCRIPT_ENTRY="loaduimage"
 		SYSTEM="igepv2"
-		board="IGEP00X0"
+		conf_board="IGEP00X0"
 		is_omap
 
 		SERIAL_MODE=1
@@ -1578,7 +1578,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="panda_dtb"
-		board="PANDABOARD"
+		conf_board="PANDABOARD"
 		is_omap
 		VIDEO_OMAP_RAM="16MB"
 		KMS_VIDEOB="video=HDMI-A-1"
@@ -1592,7 +1592,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="panda_es"
-		board="PANDABOARD_ES"
+		conf_board="PANDABOARD_ES"
 		is_omap
 		#conf_fdtfile="omap4-panda.dtb"
 		VIDEO_OMAP_RAM="16MB"
@@ -1603,7 +1603,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="panda_es_dtb"
-		board="PANDABOARD_ES"
+		conf_board="PANDABOARD_ES"
 		is_omap
 		VIDEO_OMAP_RAM="16MB"
 		KMS_VIDEOB="video=HDMI-A-1"
@@ -1616,7 +1616,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="panda_es"
-		board="PANDABOARD_ES"
+		conf_board="PANDABOARD_ES"
 		is_omap
 		#conf_fdtfile="omap4-panda.dtb"
 
@@ -1631,7 +1631,7 @@ function check_uboot_type {
 		uboot_SCRIPT_ENTRY="loaduimage"
 		uboot_CMD_LOAD="fatload"
 		SYSTEM="crane"
-		board="CRANEBOARD"
+		conf_board="CRANEBOARD"
 		is_omap
 
 		kernel_repo="TESTING"