diff --git a/mk_mmc.sh b/mk_mmc.sh
index bae67a6..3bd041b 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -442,19 +442,15 @@ function boot_uenv_txt_template {
 	fi
 
 	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-		kernel_addr=${kernel_addr}
-		initrd_addr=${initrd_addr}
-		dtb_addr=${dtb_addr}
 		dtb_file=${dtb_file}
 
-
 		console=DICONSOLE
 
 		mmcroot=/dev/ram0 rw
 
-		xyz_load_image=fatload mmc 0:1 \${kernel_addr} \${kernel_file}
-		xyz_load_initrd=fatload mmc 0:1 \${initrd_addr} \${initrd_file}
-		xyz_load_dtb=fatload mmc 0:1 \${dtb_addr} \${dtb_file}
+		xyz_load_image=fatload mmc 0:1 ${kernel_addr} \${kernel_file}
+		xyz_load_initrd=fatload mmc 0:1 ${initrd_addr} \${initrd_file}
+		xyz_load_dtb=fatload mmc 0:1 ${dtb_addr} \${dtb_file}
 
 		xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
 
@@ -463,20 +459,16 @@ function boot_uenv_txt_template {
 	__EOF__
 
 	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-		kernel_addr=${kernel_addr}
-		initrd_addr=${initrd_addr}
-		dtb_addr=${dtb_addr}
 		dtb_file=${dtb_file}
 
-
 		console=SERIAL_CONSOLE
 
 		mmcroot=FINAL_PART ro
 		mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
 
-		xyz_load_image=fatload mmc 0:1 \${kernel_addr} \${kernel_file}
-		xyz_load_initrd=fatload mmc 0:1 \${initrd_addr} \${initrd_file}
-		xyz_load_dtb=fatload mmc 0:1 \${dtb_addr} \${dtb_file}
+		xyz_load_image=fatload mmc 0:1 ${kernel_addr} \${kernel_file}
+		xyz_load_initrd=fatload mmc 0:1 ${initrd_addr} \${initrd_file}
+		xyz_load_dtb=fatload mmc 0:1 ${dtb_addr} \${dtb_file}
 
 		xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
 
@@ -488,70 +480,70 @@ function boot_uenv_txt_template {
 	beagle_bx|beagle_cx)
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 		;;
 	beagle_xm)
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 		;;
 	crane|igepv2|mx51evk|mx53loco|panda|panda_es)
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 		;;
 	bone)
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			deviceargs=setenv device_args ip=\${ip_method}
-			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			deviceargs=setenv device_args ip=\${ip_method}
-			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}
 
 		__EOF__
 		;;
 	bone_zimage)
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			deviceargs=setenv device_args ip=\${ip_method}
-			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			deviceargs=setenv device_args ip=\${ip_method}
-			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} \${kernel_addr} \${initrd_addr}:\${filesize}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; \${boot} ${kernel_addr} ${initrd_addr}:\${filesize}
 
 
 		__EOF__