diff --git a/iopsys-brcm63xx-arm/image/Makefile b/iopsys-brcm63xx-arm/image/Makefile
index 334bfbf6c71087b586017a404a14a4055cc35a4a..c1557d0d0ea452b34fae523d1412e623e4d2a45f 100644
--- a/iopsys-brcm63xx-arm/image/Makefile
+++ b/iopsys-brcm63xx-arm/image/Makefile
@@ -32,8 +32,8 @@ else
 endif
 
 
-IHGSP_VERSION:=$(CONFIG_TARGET_FAMILY)-$(DSL_MODE)-$(CONFIG_TARGET_CUSTOMER)-$(CONFIG_TARGET_VERSION)-$(shell date '+%y%m%d_%H%M')
-IHGSP_BUILD_VERSION:=$(shell echo $(IHGSP_VERSION) | sed s/\"//g)
+IOPSYS_VERSION:=$(CONFIG_TARGET_FAMILY)-$(DSL_MODE)-$(CONFIG_TARGET_CUSTOMER)-$(CONFIG_TARGET_VERSION)-$(shell date '+%y%m%d_%H%M')
+export IOPSYS_BUILD_VERSION:=$(shell echo $(IOPSYS_VERSION) | sed s/\"//g)
 imageNameMigrator := $(CONFIG_TARGET_FAMILY)-$(DSL_MODE)-$(CONFIG_TARGET_CUSTOMER)-$(CONFIG_TARGET_VERSION)-Migrator4-$(shell date '+%y%m%d_%H%M')
 BUILD_DIR_ROOT:=$(BUILD_DIR)/root-$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 KERNEL_ENTRY = $(if $(wildcard $(KDIR)/vmlinux.bcm.elf), $(shell readelf -h $(KDIR)/vmlinux.bcm.elf | grep Entry | awk '{print $$4}'))
@@ -95,7 +95,7 @@ define Image/Prepare
         # to avoid unneeded differences
 	rm $(BUILD_DIR_ROOT)/etc/os-release
 	echo "NAME=\"IOPSYS\""					>$(BUILD_DIR_ROOT)/etc/os-release
-	echo "VERSION=\"$(IHGSP_BUILD_VERSION)\""		>>$(BUILD_DIR_ROOT)/etc/os-release
+	echo "VERSION=\"$(IOPSYS_BUILD_VERSION)\""		>>$(BUILD_DIR_ROOT)/etc/os-release
 	echo "ID=\"iopsys\""					>>$(BUILD_DIR_ROOT)/etc/os-release
 	echo "ID_LIKE=\"openwrt\""				>>$(BUILD_DIR_ROOT)/etc/os-release
 	echo "VARIANT=\"$(CONFIG_TARGET_CUSTOMER)\""		>>$(BUILD_DIR_ROOT)/etc/os-release
@@ -131,7 +131,7 @@ endif
 
 # add/set version info
 	mkdir -p $(BUILD_DIR_ROOT)/etc/board-db/version
-	echo $(IHGSP_BUILD_VERSION)  > $(BUILD_DIR_ROOT)/etc/board-db/version/iop_version
+	echo $(IOPSYS_BUILD_VERSION)  > $(BUILD_DIR_ROOT)/etc/board-db/version/iop_version
 	echo $(CONFIG_TARGET_CUSTOMER)> $(BUILD_DIR_ROOT)/etc/board-db/version/iop_customer
 
     ifneq ($(CONFIG_TARGET_NO_1STBOOT_MARK),y)
@@ -204,7 +204,7 @@ define Image/Build/HeaderY3
 	echo "chip $(CONFIG_BCM_CHIP_ID)" >>$(KDIR)/hdr				&& \
 	echo "arch all $(CONFIG_TARGET_ARCH_PACKAGES)" >>$(KDIR)/hdr		&& \
 	echo "model $(CONFIG_TARGET_FAMILY)" >>$(KDIR)/hdr			&& \
-	echo "release $(IHGSP_VERSION)" >>$(KDIR)/hdr				&& \
+	echo "release $(IOPSYS_VERSION)" >>$(KDIR)/hdr				&& \
 	echo "customer $(CONFIG_TARGET_CUSTOMER)" >>$(KDIR)/hdr			&& \
 	echo "loaderofs $$$$loader_ofs" >>$(KDIR)/hdr					&& \
 	echo "loader $$$$loader_sz" >>$(KDIR)/hdr					&& \
@@ -320,13 +320,13 @@ ifeq ($(BUILD_ECC_USE_BOARDIDS),1)
 		cd $(KDIR) ; $(HOSTTOOLS_DIR)/editnvram $(TARGET_IMAGE_IS_LITTLE_ENDIAN) --boardid="$(boardid)" --voiceboardid="$(voice_boardid)" --production=$(TARGET_IMAGE_PRODUCTION_FLAG) $(TARGET_IMAGE_MAC_NUM) $(TARGET_IMAGE_BASE_MAC) -O $(CONFIG_TARGET_IMAGE_PRODUCTION_NVRAM_OFFSET) cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp.$(boardid) cfe$(CONFIG_BCM_CHIP_ID)_nand.v.out && mv cfe$(CONFIG_BCM_CHIP_ID)_nand.v.out cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp.$(boardid); \
 		cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp.$(boardid) -o cfe$(CONFIG_BCM_CHIP_ID)_nand.$(boardid).ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) -p $(CONFIG_TARGET_NAND_PAGESZ) -s $(CONFIG_TARGET_NAND_SPARE_SIZE) -e $(CONFIG_TARGET_NAND_BCH_LEVEL) -m $(FIELD_ORDER); \
 		cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i root.ubi -o root-nand.$(boardid).ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) -p $(CONFIG_TARGET_NAND_PAGESZ) -s $(CONFIG_TARGET_NAND_SPARE_SIZE) -e $(CONFIG_TARGET_NAND_BCH_LEVEL) -m $(FIELD_ORDER); \
-		cp $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.$(boardid).ecc $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe.$(boardid).ecc; \
-		cp $(KDIR)/root-nand.$(boardid).ecc $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_root.$(boardid).ecc; \
+		cp $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.$(boardid).ecc $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_cfe.$(boardid).ecc; \
+		cp $(KDIR)/root-nand.$(boardid).ecc $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_root.$(boardid).ecc; \
 		echo -e "Part \tStart \tEnd \tProg \tBadBlock \tPart-Name" > $(BIN_DIR)/nand-partition.$(boardid).txt; \
 		echo -e "0 \t$(CFE_START_BLOCK) \t$(CFE_END_BLOCK) \t0 \t0 \t\tBootloader" >> $(BIN_DIR)/nand-partition.$(boardid).txt; \
 		echo -e "1 \t$(UBI_START_BLOCK) \t$(UBI_END_BLOCK) \t0 \t0 \t\tSystem" >> $(BIN_DIR)/nand-partition.$(boardid).txt; \
-		ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe.$(boardid).ecc $(BIN_DIR)/cfe.$(boardid).ecc; \
-		ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_root.$(boardid).ecc $(BIN_DIR)/root.$(boardid).ecc; \
+		ln -sf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_cfe.$(boardid).ecc $(BIN_DIR)/cfe.$(boardid).ecc; \
+		ln -sf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_root.$(boardid).ecc $(BIN_DIR)/root.$(boardid).ecc; \
 		rm $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp.$(boardid); \
 		$(eval i=$(shell echo $$(($(i)+1)))) \
 	)
@@ -344,16 +344,16 @@ endif
 	cd $(KDIR) ; $(STAGING_DIR_HOST)/bin/nand-image-builder -i root.ubi -o root-nand.ecc -b $(CONFIG_TARGET_NAND_BLOCKSZ) \
 		-p $(CONFIG_TARGET_NAND_PAGESZ) -s $(CONFIG_TARGET_NAND_SPARE_SIZE) -e $(CONFIG_TARGET_NAND_BCH_LEVEL) -m $(FIELD_ORDER)
 
-	cp $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.ecc $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe.ecc
-	cp $(KDIR)/root-nand.ecc $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_root.ecc
+	cp $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.ecc $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_cfe.ecc
+	cp $(KDIR)/root-nand.ecc $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_root.ecc
 
 	echo -e "Part \tStart \tEnd \tProg \tBadBlock \tPart-Name" > $(BIN_DIR)/nand-partition.txt
 	#Need to fix the bad block and udes block in nand-partition.txt file.
 	echo -e "0 \t$(CFE_START_BLOCK) \t$(CFE_END_BLOCK) \t0 \t0 \t\tBootloader" >> $(BIN_DIR)/nand-partition.txt
 	echo -e "1 \t$(UBI_START_BLOCK) \t$(UBI_END_BLOCK) \t0 \t0 \t\tSystem" >> $(BIN_DIR)/nand-partition.txt
 
-	ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_cfe.ecc $(BIN_DIR)/cfe.ecc
-	ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_root.ecc $(BIN_DIR)/root.ecc
+	ln -sf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_cfe.ecc $(BIN_DIR)/cfe.ecc
+	ln -sf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_root.ecc $(BIN_DIR)/root.ecc
 	rm $(KDIR)/cfe$(CONFIG_BCM_CHIP_ID)_nand.v.tmp
 endif
 endef
@@ -383,12 +383,12 @@ define Image/Image/Y3
 		$(KDIR)/rootfs.squashfs \
 		$(KDIR)/test_metadata.bin_headered \
 		$(KDIR)/pkginfo \
-		$(KDIR)/bundled-migrator-script.tar.gz >$(BIN_DIR)/$(IHGSP_BUILD_VERSION).y3
+		$(KDIR)/bundled-migrator-script.tar.gz >$(BIN_DIR)/$(IOPSYS_BUILD_VERSION).y3
 
 	# Attach checksum to combined image
-	md5sum -b $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y3 |awk '{printf "%s",$$$$1}' \
-		>>$(BIN_DIR)/$(IHGSP_BUILD_VERSION).y3
-	ln -sf $(BIN_DIR)/$(IHGSP_BUILD_VERSION).y3 $(BIN_DIR)/last.y3
+	md5sum -b $(BIN_DIR)/$(IOPSYS_BUILD_VERSION).y3 |awk '{printf "%s",$$$$1}' \
+		>>$(BIN_DIR)/$(IOPSYS_BUILD_VERSION).y3
+	ln -sf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION).y3 $(BIN_DIR)/last.y3
 
 endef
 
@@ -417,9 +417,9 @@ define Iopsys/Image/FIT
 	cp $(PROFILE_DIR)/bcm$(CONFIG_BCM_KERNEL_PROFILE)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_loader_update.pkgtb $(BIN_DIR)/
 
         # rename them as iopsys images
-	mv $(BIN_DIR)/bcm$(CONFIG_BCM_KERNEL_PROFILE)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb;
-	mv $(BIN_DIR)/bcm$(CONFIG_BCM_KERNEL_PROFILE)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_loader_update.pkgtb $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_loader_update.pkgtb;
-	ln -srf $(BIN_DIR)/$(IHGSP_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb $(BIN_DIR)/last.pkgtb
+	mv $(BIN_DIR)/bcm$(CONFIG_BCM_KERNEL_PROFILE)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb;
+	mv $(BIN_DIR)/bcm$(CONFIG_BCM_KERNEL_PROFILE)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_loader_update.pkgtb $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_loader_update.pkgtb;
+	ln -srf $(BIN_DIR)/$(IOPSYS_BUILD_VERSION)_$(CONFIG_BCM_FIRMWARE_TYPE_STR)_update.pkgtb $(BIN_DIR)/last.pkgtb
 endef
 
 define Image/Build