diff --git a/target/linux/mediatek/image/mt7986.mk b/target/linux/mediatek/image/mt7986.mk
index 5d1ae25..e1617be 100644
--- a/target/linux/mediatek/image/mt7986.mk
+++ b/target/linux/mediatek/image/mt7986.mk
@@ -1,19 +1,19 @@
 KERNEL_LOADADDR := 0x44080000
 
-define Device/mt7986a-mt7975-ax6000-rfb1
+define Device/mt7986a-ax6000-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7975-ax6000-rfb1
-  DEVICE_DTS := mt7986a-mt7975-ax6000-rfb1
+  DEVICE_MODEL := mt7986a-ax6000-nor-rfb
+  DEVICE_DTS := mt7986a-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7975-ax6000-rfb1
+TARGET_DEVICES += mt7986a-ax6000-nor-rfb
 
-define Device/mt7986a-mt7975-ax6000-rfb1-snand
+define Device/mt7986a-ax6000-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7975-ax6000-rfb1 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7975-ax6000-rfb1
+  DEVICE_MODEL := mt7986a-ax6000-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986a-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986a-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -23,22 +23,22 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7975-ax6000-rfb1-snand
+TARGET_DEVICES += mt7986a-ax6000-snand-rfb
 
-define Device/mt7986a-mt7976-ax6000-rfb2
+define Device/mt7986a-ax7800-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax6000-rfb2
-  DEVICE_DTS := mt7986a-mt7976-ax6000-rfb2
+  DEVICE_MODEL := mt7986a-ax7800-nor-rfb
+  DEVICE_DTS := mt7986a-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax6000-rfb2
+TARGET_DEVICES += mt7986a-ax7800-nor-rfb
 
-define Device/mt7986a-mt7976-ax6000-rfb2-snand
+define Device/mt7986a-ax7800-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax6000-rfb2 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7976-ax6000-rfb2
+  DEVICE_MODEL := mt7986a-ax7800-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986a-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986a-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -48,22 +48,22 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax6000-rfb2-snand
+TARGET_DEVICES += mt7986a-ax7800-snand-rfb
 
-define Device/mt7986a-mt7976-ax7800-rfb2
+define Device/mt7986b-ax6000-nor-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax7800-rfb2
-  DEVICE_DTS := mt7986a-mt7976-ax7800-rfb2
+  DEVICE_MODEL := mt7986b-ax6000-nor-rfb
+  DEVICE_DTS := mt7986b-nor-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax7800-rfb2
+TARGET_DEVICES += mt7986b-ax6000-nor-rfb
 
-define Device/mt7986a-mt7976-ax7800-rfb2-snand
+define Device/mt7986b-ax6000-snand-rfb
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986a-mt7976-ax7800-rfb2 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986a-mt7976-ax7800-rfb2
+  DEVICE_MODEL := mt7986b-ax6000-snand-rfb (SPI-NAND,UBI)
+  DEVICE_DTS := mt7986b-snand-rfb
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986b-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048
@@ -73,47 +73,14 @@
   IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
 endef
-TARGET_DEVICES += mt7986a-mt7976-ax7800-rfb2-snand
-
-define Device/mt7986b-mt7975-ax6000-rfb1
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-endef
-TARGET_DEVICES += mt7986b-mt7975-ax6000-rfb1
-
-define Device/mt7986b-mt7975-ax6000-rfb1-snand
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7975-ax6000-rfb1 (SPI-NAND,UBI)
-  DEVICE_DTS := mt7986b-mt7975-ax6000-rfb1
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
-  UBINIZE_OPTS := -E 5
-  BLOCKSIZE := 128k
-  PAGESIZE := 2048
-  IMAGE_SIZE := 65536k
-  KERNEL_IN_UBI := 1
-  IMAGES += factory.bin
-  IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-endef
-TARGET_DEVICES += mt7986b-mt7975-ax6000-rfb1-snand
-
-define Device/mt7986b-mt7976-ax6000-rfb4
-  DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4
-  DEVICE_DTS := mt7986b-mt7976-ax6000-rfb4
-  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-endef
-TARGET_DEVICES += mt7986b-mt7976-ax6000-rfb4
+TARGET_DEVICES += mt7986b-ax6000-snand-rfb
 
 define Device/mt7986b-mt7976-ax6000-rfb4-snand
   DEVICE_VENDOR := MediaTek
-  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4 (SPI-NAND,UBI)
+  DEVICE_MODEL := mt7986b-mt7976-ax6000-rfb4-snand (SPI-NAND,UBI)
   DEVICE_DTS := mt7986b-mt7976-ax6000-rfb4
   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-  SUPPORTED_DEVICES := mediatek,mt7986-rfb-snand
+  SUPPORTED_DEVICES := mediatek,mt7986b-snand-rfb
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048