diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 42a8818..9cb1407 100755
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -72,27 +72,27 @@ ARCH_UPPER=$(echo "$ARCH" | tr '[:lower:]' '[:upper:]')
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
 	FDT_NODE="
-		fdt@$FDTNUM {
+		fdt-$FDTNUM {
 			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
 			data = /incbin/(\"${DTB}\");
 			type = \"flat_dt\";
 			arch = \"${ARCH}\";
 			compression = \"none\";
-			hash@1 {
+			hash-1 {
 				algo = \"crc32\";
 			};
-			hash@2 {
+			hash-2 {
 				algo = \"sha1\";
 			};
 		};
 "
-	FDT_PROP="fdt = \"fdt@$FDTNUM\";"
+	FDT_PROP="fdt = \"fdt-$FDTNUM\";"
 fi
 
 # Conditionally create script information
 if [ -n "${UBOOT_SCRIPT}" ]; then
 	SCRIPT="\
-		script@1 {
+		script-1 {
 			description = \"U-Boot Script\";
 			data = /incbin/(\"${UBOOT_SCRIPT}\");
 			type = \"script\";
@@ -101,16 +101,16 @@ if [ -n "${UBOOT_SCRIPT}" ]; then
 			load = <0>;
 			entry = <0>;
 			compression = \"none\";
-			hash@1 {
+			hash-1 {
 				algo = \"crc32\";
 			};
-			hash@2 {
+			hash-2 {
 				algo = \"sha1\";
 			};
 		};\
 "
 	LOADABLES="\
-			loadables = \"script@1\";\
+			loadables = \"script-1\";\
 "
 	SIGN_IMAGES="\
 				sign-images = \"fdt\", \"kernel\", \"loadables\";\
@@ -147,7 +147,7 @@ DATA="/dts-v1/;
 	#address-cells = <1>;
 
 	images {
-		kernel@1 {
+		kernel-1 {
 			description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\";
 			data = /incbin/(\"${KERNEL}\");
 			type = \"kernel\";
@@ -156,10 +156,10 @@ DATA="/dts-v1/;
 			compression = \"${COMPRESS}\";
 			load = <${LOAD_ADDR}>;
 			entry = <${ENTRY_ADDR}>;
-			hash@1 {
+			hash-1 {
 				algo = \"crc32\";
 			};
-			hash@2 {
+			hash-2 {
 				algo = \"sha1\";
 			};
 		};
@@ -173,7 +173,7 @@ ${SCRIPT}
 			description = \"OpenWrt\";
 ${FIT_AR_VER}
 ${LOADABLES}
-			kernel = \"kernel@1\";
+			kernel = \"kernel-1\";
 			${FDT_PROP}
 ${SIGNATURE}
 		};
diff --git a/include/image-commands.mk b/include/image-commands.mk
index 51e7459..5a3f624 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -202,7 +202,7 @@ define Build/fit
 		$(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \
 		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 		$(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
-		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config@1") \
+		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
 		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new
 	@mv $@.new $@