diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 0664c1a..96a9161 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file="am335x-bone.dtb"
+conf_fdtfile="am335x-bone.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index da0ff43..547a7fb 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file="am335x-bone.dtb"
+conf_fdtfile="am335x-bone.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index a798c2c..e25c519 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file="am335x-boneblack.dtb"
+conf_fdtfile="am335x-boneblack.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf
index 6b21acb..3a083f0 100644
--- a/hwpack/am335x-evmsk.conf
+++ b/hwpack/am335x-evmsk.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file="am335x-evmsk.dtb"
+conf_fdtfile="am335x-evmsk.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index 97d2c9a..ef57dfb 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -70,7 +70,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file="am335x-bone.dtb"
+conf_fdtfile="am335x-bone.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index d88698c..b31a8c6 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -37,7 +37,7 @@ conf_loadaddr="0x90010000"
 conf_initrdaddr="0x92000000"
 conf_zreladdr="0x90008000"
 conf_fdtaddr="0x91ff0000"
-dtb_file="imx51-babbage.dtb"
+conf_fdtfile="imx51-babbage.dtb"
 need_dtbs=1
 
 SERIAL="ttymxc0"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index 20bdf10..d5555c3 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -37,7 +37,7 @@ conf_loadaddr="0x70010000"
 conf_initrdaddr="0x72000000"
 conf_zreladdr="0x70008000"
 conf_fdtaddr="0x71ff0000"
-dtb_file="imx53-qsb.dtb"
+conf_fdtfile="imx53-qsb.dtb"
 need_dtbs=1
 
 SERIAL="ttymxc0"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 823fcac..9058aa6 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -39,7 +39,7 @@ conf_loadaddr="0x10000000"
 conf_initrdaddr="0x12000000"
 conf_zreladdr="0x10008000"
 conf_fdtaddr="0x11ff0000"
-dtb_file="imx6q-sabrelite.dtb"
+conf_fdtfile="imx6q-sabrelite.dtb"
 need_dtbs=1
 
 SERIAL="ttymxc1"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index 6063409..d6a1dc6 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -37,7 +37,7 @@ conf_loadaddr="0x10000000"
 conf_initrdaddr="0x12000000"
 conf_zreladdr="0x10008000"
 conf_fdtaddr="0x11ff0000"
-dtb_file="imx6q-sabresd.dtb"
+conf_fdtfile="imx6q-sabresd.dtb"
 need_dtbs=1
 
 SERIAL="ttymxc0"
diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf
index 7b8ccb0..b407d54 100644
--- a/hwpack/omap3-beagle-xm-v3.9.conf
+++ b/hwpack/omap3-beagle-xm-v3.9.conf
@@ -34,7 +34,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file=
+conf_fdtfile=
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 1e26f3e..284d783 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file=
+conf_fdtfile=
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index 8c05e37..f0451b1 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -33,7 +33,7 @@ conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
 conf_fdtaddr="0x815f0000"
-dtb_file=
+conf_fdtfile=
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 73f827a..210f52e 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -360,14 +360,14 @@ function boot_uenv_txt_template {
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff
-			dtb_file=${dtb_file}
+			conf_fdtfile=${conf_fdtfile}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff
-			dtb_file=${dtb_file}
+			conf_fdtfile=${conf_fdtfile}
 
 		__EOF__
 	fi
@@ -409,26 +409,26 @@ function boot_uenv_txt_template {
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file}
+			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
 
 		__EOF__
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${dtb_file}
+			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
 
 		__EOF__
 	else
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file}
+			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
 
 		__EOF__
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${dtb_file}
+			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${conf_fdtfile}
 
 		__EOF__
 	fi
@@ -1051,7 +1051,7 @@ function initrd_device_settings {
 		conf_initrdaddr=${conf_initrdaddr}
 		conf_zreladdr=${conf_zreladdr}
 		conf_fdtaddr=${conf_fdtaddr}
-		dtb_file=${dtb_file}
+		conf_fdtfile=${conf_fdtfile}
 
 		usbnet_mem=${usbnet_mem}
 
@@ -1342,7 +1342,7 @@ function populate_boot {
 			conf_initrdaddr=${conf_initrdaddr}
 			conf_zreladdr=${conf_zreladdr}
 			conf_fdtaddr=${conf_fdtaddr}
-			dtb_file=${dtb_file}
+			conf_fdtfile=${conf_fdtfile}
 
 			usbnet_mem=${usbnet_mem}
 
@@ -1490,7 +1490,7 @@ function check_uboot_type {
 	unset IN_VALID_UBOOT
 	unset USE_UIMAGE
 	unset USE_KMS
-	unset dtb_file
+	unset conf_fdtfile
 	unset need_dtbs
 	kernel_repo="STABLE"
 
@@ -1514,7 +1514,7 @@ function check_uboot_type {
 		SYSTEM="beagle_bx"
 		board="BEAGLEBOARD_BX"
 		is_omap
-		#dtb_file="omap3-beagle.dtb"
+		#conf_fdtfile="omap3-beagle.dtb"
 		usbnet_mem="8192"
 		echo "-----------------------------"
 		echo "Warning: Support for the Original BeagleBoard Ax/Bx is broken.. (board locks up during hardware detect)"
@@ -1527,7 +1527,7 @@ function check_uboot_type {
 		SYSTEM="beagle_cx"
 		board="BEAGLEBOARD_CX"
 		is_omap
-		#dtb_file="omap3-beagle.dtb"
+		#conf_fdtfile="omap3-beagle.dtb"
 		usbnet_mem="8192"
 		echo "-----------------------------"
 		echo "Warning: Support for the BeagleBoard C1/C2 is broken.. (board locks up during hardware detect)"
@@ -1588,7 +1588,7 @@ function check_uboot_type {
 		KMS_VIDEOB="video=HDMI-A-1"
 		usbnet_mem="32768"
 
-		dtb_file="omap4-panda.dtb"
+		conf_fdtfile="omap4-panda.dtb"
 		EXPERIMENTAL_KERNEL=1
 		need_dtbs=1
 		;;
@@ -1598,7 +1598,7 @@ function check_uboot_type {
 		SYSTEM="panda_es"
 		board="PANDABOARD_ES"
 		is_omap
-		#dtb_file="omap4-panda.dtb"
+		#conf_fdtfile="omap4-panda.dtb"
 		VIDEO_OMAP_RAM="16MB"
 		KMS_VIDEOB="video=HDMI-A-1"
 		usbnet_mem="32768"
@@ -1613,7 +1613,7 @@ function check_uboot_type {
 		KMS_VIDEOB="video=HDMI-A-1"
 		usbnet_mem="32768"
 
-		dtb_file="omap4-pandaES.dtb"
+		conf_fdtfile="omap4-pandaES.dtb"
 		need_dtbs=1
 		;;
 	panda_es_kms)
@@ -1622,7 +1622,7 @@ function check_uboot_type {
 		SYSTEM="panda_es"
 		board="PANDABOARD_ES"
 		is_omap
-		#dtb_file="omap4-panda.dtb"
+		#conf_fdtfile="omap4-panda.dtb"
 
 		USE_KMS=1
 		unset HAS_OMAPFB_DSS2