ramips: convert DEVICE_TITLE to new variables

Also unify naming and add details where they were missing.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

6 files changed, 704 insertions, 323 deletions

diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 077834edc8..a060717400 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -38,7 +38,8 @@ endef
 define Device/ai-br100
   DTS := AI-BR100
   IMAGE_SIZE := 7936k
-  DEVICE_TITLE := Aigale Ai-BR100
+  DEVICE_VENDOR := Aigale
+  DEVICE_MODEL := Ai-BR100
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ai-br100
@@ -46,7 +47,8 @@ TARGET_DEVICES += ai-br100
 define Device/alfa-network_ac1200rm
   DTS := AC1200RM
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := ALFA Network AC1200RM
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := AC1200RM
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += alfa-network_ac1200rm
@@ -54,7 +56,8 @@ TARGET_DEVICES += alfa-network_ac1200rm
 define Device/alfa-network_tube-e4g
   DTS := TUBE-E4G
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := ALFA Network Tube-E4G
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := Tube-E4G
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci uboot-envtools uqmi \
 	-iwinfo -kmod-rt2800-soc -wpad-basic
 endef
@@ -70,6 +73,7 @@ define Device/amit_jboot
 endef
 
 define Device/Archer
+  DEVICE_VENDOR := TP-Link
   TPLINK_HWREVADD := 0
   TPLINK_HVERSION := 3
   KERNEL := $(KERNEL_DTB)
@@ -87,7 +91,7 @@ define Device/ArcherC20i
   TPLINK_HWREV := 58
   IMAGES += factory.bin
   DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_TITLE := TP-Link ArcherC20i
+  DEVICE_MODEL := Archer C20i
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC20i
@@ -102,7 +106,8 @@ define Device/ArcherC50v1
   IMAGES += factory-us.bin factory-eu.bin
   IMAGE/factory-us.bin := tplink-v2-image -e -w 0
   IMAGE/factory-eu.bin := tplink-v2-image -e -w 2
-  DEVICE_TITLE := TP-Link ArcherC50v1
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ArcherC50v1
@@ -115,21 +120,23 @@ define Device/ArcherMR200
   TPLINK_HWID := 0xd7500001
   TPLINK_HWREV := 0x4a
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb-enablemodem
-  DEVICE_TITLE := TP-Link ArcherMR200
+  DEVICE_MODEL := Archer MR200
 endef
 TARGET_DEVICES += ArcherMR200
 
 define Device/bdcom_wap2100-sk
   DTS := BDCOM-WAP2100-SK
   IMAGE_SIZE := 15808k
-  DEVICE_TITLE := BDCOM WAP2100-SK (ZTE ZXECS EBG3130)
+  DEVICE_VENDOR := BDCOM
+  DEVICE_MODEL := WAP2100-SK (ZTE ZXECS EBG3130)
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-mt76x2 kmod-mt76x0e kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
 define Device/bocco
   DTS := BOCCO
-  DEVICE_TITLE := YUKAI Engineering BOCCO
+  DEVICE_VENDOR := YUKAI Engineering
+  DEVICE_MODEL := BOCCO
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
 TARGET_DEVICES += bocco
@@ -137,20 +144,23 @@ TARGET_DEVICES += bocco
 define Device/c108
   DTS := C108
   IMAGE_SIZE := 16777216
-  DEVICE_TITLE := HNET C108
+  DEVICE_VENDOR := HNET
+  DEVICE_MODEL := C108
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += c108
 
 define Device/cf-wr800n
   DTS := CF-WR800N
-  DEVICE_TITLE := Comfast CF-WR800N
+  DEVICE_VENDOR := Comfast
+  DEVICE_MODEL := CF-WR800N
 endef
 TARGET_DEVICES += cf-wr800n
 
 define Device/cs-qr10
   DTS := CS-QR10
-  DEVICE_TITLE := Planex CS-QR10
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := CS-QR10
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci \
 	kmod-sound-core kmod-sound-mt7620 \
 	kmod-i2c-ralink kmod-sdhci-mt7620
@@ -160,14 +170,16 @@ TARGET_DEVICES += cs-qr10
 define Device/d240
   DTS := D240
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Sanlinking Technologies D240
+  DEVICE_VENDOR := Sanlinking Technologies
+  DEVICE_MODEL := D240
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += d240
 
 define Device/db-wrt01
   DTS := DB-WRT01
-  DEVICE_TITLE := Planex DB-WRT01
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := DB-WRT01
 endef
 TARGET_DEVICES += db-wrt01
 
@@ -177,7 +189,8 @@ define Device/dch-m225
   BLOCKSIZE := 4k
   SEAMA_SIGNATURE := wapn22_dlink.2013gui_dap1320b
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := D-Link DCH-M225
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCH-M225
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
 endef
 TARGET_DEVICES += dch-m225
@@ -185,7 +198,8 @@ TARGET_DEVICES += dch-m225
 define Device/dir-810l
   DTS := DIR-810L
   DEVICE_PACKAGES := kmod-mt76x0e
-  DEVICE_TITLE := D-Link DIR-810L
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-810L
   IMAGE_SIZE := 6720k
 endef
 TARGET_DEVICES += dir-810l
@@ -193,7 +207,8 @@ TARGET_DEVICES += dir-810l
 define Device/dlink_dir-510l
   $(Device/amit_jboot)
   DTS := DIR-510L
-  DEVICE_TITLE := D-Link DIR-510L
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-510L
   DEVICE_PACKAGES += kmod-mt76x0e
   DLINK_ROM_ID := DLK6E3805001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -205,7 +220,9 @@ TARGET_DEVICES += dlink_dir-510l
 define Device/dlink_dwr-116-a1
   $(Device/amit_jboot)
   DTS := DWR-116-A1
-  DEVICE_TITLE := D-Link DWR-116 A1/A2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-116
+  DEVICE_VARIANT := A1/A2
   DLINK_ROM_ID := DLK6E3803001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0x7E0000
@@ -215,7 +232,9 @@ TARGET_DEVICES += dlink_dwr-116-a1
 define Device/dlink_dwr-118-a1
   $(Device/amit_jboot)
   DTS := DWR-118-A1
-  DEVICE_TITLE := D-Link DWR-118 A1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-118
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES += kmod-mt76x0e
   DLINK_ROM_ID := DLK6E3811001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -226,7 +245,9 @@ TARGET_DEVICES += dlink_dwr-118-a1
 define Device/dlink_dwr-118-a2
   $(Device/amit_jboot)
   DTS := DWR-118-A2
-  DEVICE_TITLE := D-Link DWR-118 A2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-118
+  DEVICE_VARIANT := A2
   DEVICE_PACKAGES += kmod-mt76x2
   DLINK_ROM_ID := DLK6E3814001
   DLINK_FAMILY_MEMBER := 0x6E38
@@ -238,7 +259,9 @@ define Device/dlink_dwr-921-c1
   $(Device/amit_jboot)
   DTS := DWR-921-C1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DWR-921 C1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-921
+  DEVICE_VARIANT := C1
   DLINK_ROM_ID := DLK6E2414001
   DLINK_FAMILY_MEMBER := 0x6E24
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -248,7 +271,9 @@ TARGET_DEVICES += dlink_dwr-921-c1
 
 define Device/dlink_dwr-921-c3
   $(Device/dlink_dwr-921-c1)
-  DEVICE_TITLE := D-Link DWR-921 C3
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-921
+  DEVICE_VARIANT := C3
   DLINK_ROM_ID := DLK6E2414009
   SUPPORTED_DEVICES := dlink,dwr-921-c1
 endef
@@ -258,7 +283,9 @@ define Device/dlink_dwr-922-e2
   $(Device/amit_jboot)
   DTS := DWR-922-E2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DWR-922 E2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-922
+  DEVICE_VARIANT := E2
   DLINK_ROM_ID := DLK6E2414005
   DLINK_FAMILY_MEMBER := 0x6E24
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -271,7 +298,8 @@ define Device/e1700
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x013326
-  DEVICE_TITLE := Linksys E1700
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := E1700
 endef
 TARGET_DEVICES += e1700
 
@@ -285,7 +313,8 @@ define Device/ex2700
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	netgear-dni
-  DEVICE_TITLE := Netgear EX2700
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX2700
 endef
 TARGET_DEVICES += ex2700
 
@@ -297,7 +326,8 @@ define Device/ex3700-ex3800
   IMAGES += factory.chk
   IMAGE/factory.chk := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | netgear-chk
   DEVICE_PACKAGES := kmod-mt76x2
-  DEVICE_TITLE := Netgear EX3700/EX3800
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX3700/EX3800
   SUPPORTED_DEVICES := ex3700
 endef
 TARGET_DEVICES += ex3700-ex3800
@@ -305,7 +335,8 @@ TARGET_DEVICES += ex3700-ex3800
 define Device/gl-mt300a
   DTS := GL-MT300A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT300A
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT300A
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt300a
@@ -313,7 +344,9 @@ TARGET_DEVICES += gl-mt300a
 define Device/u25awf-h1
   DTS := U25AWF-H1
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Kimax U25AWF-H1
+  DEVICE_VENDOR := Kimax
+  DEVICE_MODEL := U25AWF
+  DEVICE_VARIANT := H1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += u25awf-h1
@@ -321,7 +354,8 @@ TARGET_DEVICES += u25awf-h1
 define Device/gl-mt300n
   DTS := GL-MT300N
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT300N
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT300N
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt300n
@@ -329,7 +363,8 @@ TARGET_DEVICES += gl-mt300n
 define Device/gl-mt750
   DTS := GL-MT750
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := GL-Inet GL-MT750
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT750
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt750
@@ -337,7 +372,8 @@ TARGET_DEVICES += gl-mt750
 define Device/hc5661
   DTS := HC5661
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5661
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5661
   DEVICE_PACKAGES := kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += hc5661
@@ -345,7 +381,8 @@ TARGET_DEVICES += hc5661
 define Device/hc5761
   DTS := HC5761
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5761
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5761
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5761
@@ -353,7 +390,8 @@ TARGET_DEVICES += hc5761
 define Device/hc5861
   DTS := HC5861
   IMAGE_SIZE := 15872k
-  DEVICE_TITLE := HiWiFi HC5861
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5861
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hc5861
@@ -361,7 +399,8 @@ TARGET_DEVICES += hc5861
 define Device/head-weblink_hdrm200
   DTS := HDRM200
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Head Weblink HDRM2000
+  DEVICE_VENDOR := Head Weblink
+  DEVICE_MODEL := HDRM2000
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
 		     uqmi kmod-usb-serial kmod-usb-serial-option
 endef
@@ -369,7 +408,8 @@ TARGET_DEVICES += head-weblink_hdrm200
 
 define Device/iodata_wn-ac1167gr
   DTS := WN-AC1167GR
-  DEVICE_TITLE := I-O DATA WN-AC1167GR
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-AC1167GR
   IMAGE_SIZE := 6864k
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -381,7 +421,8 @@ TARGET_DEVICES += iodata_wn-ac1167gr
 
 define Device/iodata_wn-ac733gr3
   DTS := WN-AC733GR3
-  DEVICE_TITLE := I-O DATA WN-AC733GR3
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-AC733GR3
   IMAGE_SIZE := 6992k
   IMAGES += factory.bin
   IMAGE/factory.bin := \
@@ -394,7 +435,8 @@ TARGET_DEVICES += iodata_wn-ac733gr3
 define Device/kimax_u35wf
   DTS := U35WF
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Kimax U35WF
+  DEVICE_VENDOR := Kimax
+  DEVICE_MODEL := U35WF
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += kimax_u35wf
@@ -402,7 +444,8 @@ TARGET_DEVICES += kimax_u35wf
 define Device/kng_rc
   DTS := kng_rc
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := ZyXEL Keenetic Viva
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Viva
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -413,7 +456,8 @@ TARGET_DEVICES += kng_rc
 
 define Device/kn_rc
   DTS := kn_rc
-  DEVICE_TITLE := ZyXEL Keenetic Omni
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -424,7 +468,8 @@ TARGET_DEVICES += kn_rc
 
 define Device/kn_rf
   DTS := kn_rf
-  DEVICE_TITLE := ZyXEL Keenetic Omni II
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Omni II
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
@@ -436,7 +481,8 @@ TARGET_DEVICES += kn_rf
 define Device/microwrt
   DTS := MicroWRT
   IMAGE_SIZE := 16128k
-  DEVICE_TITLE := Microduino MicroWRT
+  DEVICE_VENDOR := Microduino
+  DEVICE_MODEL := MicroWRT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += microwrt
@@ -444,7 +490,8 @@ TARGET_DEVICES += microwrt
 define Device/lava_lr-25g001
   $(Device/amit_jboot)
   DTS := LR-25G001
-  DEVICE_TITLE := LAVA LR-25G001
+  DEVICE_VENDOR := LAVA
+  DEVICE_MODEL := LR-25G001
   DLINK_ROM_ID := LVA6E3804001
   DLINK_FAMILY_MEMBER := 0x6E38
   DLINK_FIRMWARE_SIZE := 0xFE0000
@@ -455,7 +502,8 @@ TARGET_DEVICES += lava_lr-25g001
 define Device/miwifi-mini
   DTS := MIWIFI-MINI
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Xiaomi MiWiFi Mini
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := MiWiFi Mini
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += miwifi-mini
@@ -463,7 +511,8 @@ TARGET_DEVICES += miwifi-mini
 define Device/mlw221
   DTS := MLW221
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Kingston MLW221
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLW221
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlw221
@@ -471,27 +520,31 @@ TARGET_DEVICES += mlw221
 define Device/mlwg2
   DTS := MLWG2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Kingston MLWG2
+  DEVICE_VENDOR := Kingston
+  DEVICE_MODEL := MLWG2
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += mlwg2
 
 define Device/mt7620a
   DTS := MT7620a
-  DEVICE_TITLE := MediaTek MT7620a EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a EVB
 endef
 TARGET_DEVICES += mt7620a
 
 define Device/mt7620a_mt7530
   DTS := MT7620a_MT7530
-  DEVICE_TITLE := MediaTek MT7620a + MT7530 EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7530 EVB
   SUPPORTED_DEVICES := mt7620a_mt7530
 endef
 TARGET_DEVICES += mt7620a_mt7530
 
 define Device/mt7620a_mt7610e
   DTS := MT7620a_MT7610e
-  DEVICE_TITLE := MediaTek MT7620a + MT7610e EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a + MT7610e EVB
   DEVICE_PACKAGES := kmod-mt76x0e
   SUPPORTED_DEVICES := mt7620a_mt7610e
 endef
@@ -499,27 +552,31 @@ TARGET_DEVICES += mt7620a_mt7610e
 
 define Device/mt7620a_v22sg
   DTS := MT7620a_V22SG
-  DEVICE_TITLE := MediaTek MT7620a V22SG
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7620a V22SG
   SUPPORTED_DEVICES := mt7620a_v22sg
 endef
 TARGET_DEVICES += mt7620a_v22sg
 
 define Device/mzk-750dhp
   DTS := MZK-750DHP
-  DEVICE_TITLE := Planex MZK-750DHP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-750DHP
   DEVICE_PACKAGES := kmod-mt76x0e
 endef
 TARGET_DEVICES += mzk-750dhp
 
 define Device/mzk-ex300np
   DTS := MZK-EX300NP
-  DEVICE_TITLE := Planex MZK-EX300NP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX300NP
 endef
 TARGET_DEVICES += mzk-ex300np
 
 define Device/mzk-ex750np
   DTS := MZK-EX750NP
-  DEVICE_TITLE := Planex MZK-EX750NP
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-EX750NP
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += mzk-ex750np
@@ -527,7 +584,8 @@ TARGET_DEVICES += mzk-ex750np
 define Device/na930
   DTS := NA930
   IMAGE_SIZE := 20m
-  DEVICE_TITLE := Sercomm NA930
+  DEVICE_VENDOR := Sercomm
+  DEVICE_MODEL := NA930
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += na930
@@ -535,21 +593,25 @@ TARGET_DEVICES += na930
 define Device/oy-0001
   DTS := OY-0001
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Oh Yeah OY-0001
+  DEVICE_VENDOR := Oh Yeah
+  DEVICE_MODEL := OY-0001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += oy-0001
 
 define Device/psg1208
   DTS := PSG1208
-  DEVICE_TITLE := Phicomm PSG1208
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1208
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += psg1208
 
 define Device/psg1218a
   DTS := PSG1218A
-  DEVICE_TITLE := Phicomm PSG1218 rev.Ax
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1218
+  DEVICE_VARIANT:= Ax
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += psg1218
 endef
@@ -557,7 +619,9 @@ TARGET_DEVICES += psg1218a
 
 define Device/psg1218b
   DTS := PSG1218B
-  DEVICE_TITLE := Phicomm PSG1218 rev.Bx
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := PSG1218
+  DEVICE_VARIANT := Bx
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += psg1218
 endef
@@ -566,27 +630,31 @@ TARGET_DEVICES += psg1218b
 define Device/phicomm_k2g
   DTS := K2G
   IMAGE_SIZE := 7552k
-  DEVICE_TITLE := Phicomm K2G
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := K2G
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += phicomm_k2g
 
 define Device/rp-n53
   DTS := RP-N53
-  DEVICE_TITLE := Asus RP-N53
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RP-N53
   DEVICE_PACKAGES := kmod-rt2800-pci
 endef
 TARGET_DEVICES += rp-n53
 
 define Device/rt-n12p
   DTS := RT-N12-PLUS
-  DEVICE_TITLE := Asus RT-N11P/RT-N12+/RT-N12Eb1
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
 endef
 TARGET_DEVICES += rt-n12p
 
 define Device/rt-n14u
   DTS := RT-N14U
-  DEVICE_TITLE := Asus RT-N14u
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N14u
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += rt-n14u
@@ -594,21 +662,25 @@ TARGET_DEVICES += rt-n14u
 define Device/rt-ac51u
   DTS := RT-AC51U
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Asus RT-AC51U
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-AC51U
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += rt-ac51u
 
 define Device/tiny-ac
   DTS := TINY-AC
-  DEVICE_TITLE := Dovado Tiny AC
+  DEVICE_VENDOR := Dovado
+  DEVICE_MODEL := Tiny AC
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += tiny-ac
 
 define Device/edimax_br-6478ac-v2
   DTS := BR-6478AC-V2
-  DEVICE_TITLE := Edimax BR-6478AC V2
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := BR-6478AC
+  DEVICE_VARIANT := V2
   BLOCKSIZE := 64k
   IMAGE_SIZE := 7616k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -620,7 +692,8 @@ TARGET_DEVICES += edimax_br-6478ac-v2
 
 define Device/edimax_ew-7476rpc
   DTS := EW-7476RPC
-  DEVICE_TITLE := Edimax EW-7476RPC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7476RPC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -632,7 +705,8 @@ TARGET_DEVICES += edimax_ew-7476rpc
 
 define Device/edimax_ew-7478ac
   DTS := EW-7478AC
-  DEVICE_TITLE := Edimax EW-7478AC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478AC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -644,7 +718,8 @@ TARGET_DEVICES += edimax_ew-7478ac
 
 define Device/edimax_ew-7478apc
   DTS := EW-7478APC
-  DEVICE_TITLE := Edimax EW-7478APC
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := EW-7478APC
   BLOCKSIZE := 4k
   IMAGE_SIZE := 7744k
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
@@ -661,7 +736,8 @@ define Device/tplink_c2-v1
   TPLINK_HWID := 0xc7500001
   TPLINK_HWREV := 50
   IMAGES += factory.bin
-  DEVICE_TITLE := TP-Link Archer C2 v1
+  DEVICE_MODEL := Archer C2
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
 endef
 TARGET_DEVICES += tplink_c2-v1
@@ -674,7 +750,8 @@ define Device/tplink_c20-v1
   TPLINK_HWREV := 0x44
   TPLINK_HWREVADD := 0x1
   IMAGES += factory.bin
-  DEVICE_TITLE := TP-Link ArcherC20 v1
+  DEVICE_MODEL := Archer C20
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += tplink_c20-v1
@@ -683,14 +760,16 @@ define Device/vonets_var11n-300
   DTS := VAR11N-300
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   BLOCKSIZE := 4k
-  DEVICE_TITLE := Vonets VAR11N-300
+  DEVICE_VENDOR := Vonets
+  DEVICE_MODEL := VAR11N-300
 endef
 TARGET_DEVICES += vonets_var11n-300
 
 define Device/ravpower_wd03
   DTS := WD03
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := Ravpower WD03
+  DEVICE_VENDOR := Ravpower
+  DEVICE_MODEL := WD03
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += ravpower_wd03
@@ -698,7 +777,8 @@ TARGET_DEVICES += ravpower_wd03
 define Device/whr-1166d
   DTS := WHR-1166D
   IMAGE_SIZE := 15040k
-  DEVICE_TITLE := Buffalo WHR-1166D
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-1166D
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += whr-1166d
@@ -706,21 +786,24 @@ TARGET_DEVICES += whr-1166d
 define Device/whr-300hp2
   DTS := WHR-300HP2
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := Buffalo WHR-300HP2
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-300HP2
 endef
 TARGET_DEVICES += whr-300hp2
 
 define Device/whr-600d
   DTS := WHR-600D
   IMAGE_SIZE := 6848k
-  DEVICE_TITLE := Buffalo WHR-600D
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-600D
   DEVICE_PACKAGES := kmod-rt2800-pci
 endef
 TARGET_DEVICES += whr-600d
 
 define Device/wmr-300
   DTS := WMR-300
-  DEVICE_TITLE := Buffalo WMR-300
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WMR-300
 endef
 TARGET_DEVICES += wmr-300
 
@@ -733,7 +816,9 @@ define Device/wn3000rpv3
   KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-uImage-fakehdr filesystem
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	netgear-dni
-  DEVICE_TITLE := Netgear WN3000RPv3
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WN3000RP
+  DEVICE_VARIANT := v3
 endef
 TARGET_DEVICES += wn3000rpv3
 
@@ -743,7 +828,8 @@ define Device/wrh-300cr
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	elecom-header
-  DEVICE_TITLE := Elecom WRH-300CR
+  DEVICE_VENDOR := Elecom
+  DEVICE_MODEL := WRH-300CR
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrh-300cr
@@ -751,7 +837,8 @@ TARGET_DEVICES += wrh-300cr
 define Device/wrtnode
   DTS := WRTNODE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WRTNode
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := WRTNode
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrtnode
@@ -764,7 +851,9 @@ define Device/wt3020-4M
   SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 4M
-  DEVICE_TITLE := Nexx WT3020 (4MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 4M
 endef
 TARGET_DEVICES += wt3020-4M
 
@@ -774,7 +863,9 @@ define Device/wt3020-8M
   SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 8M
-  DEVICE_TITLE := Nexx WT3020 (8MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT3020
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wt3020-8M
@@ -782,7 +873,8 @@ TARGET_DEVICES += wt3020-8M
 define Device/y1
   DTS := Y1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1
@@ -790,7 +882,8 @@ TARGET_DEVICES += y1
 define Device/y1s
   DTS := Y1S
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Lenovo Y1S
+  DEVICE_VENDOR := Lenovo
+  DEVICE_MODEL := Y1S
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += y1s
@@ -798,7 +891,8 @@ TARGET_DEVICES += y1s
 define Device/youku-yk1
   DTS := YOUKU-YK1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := YOUKU YK1
+  DEVICE_VENDOR := YOUKU
+  DEVICE_MODEL := YK1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += youku-yk1
@@ -807,35 +901,41 @@ define Device/we1026-5g-16m
   DTS := WE1026-5G-16M
   IMAGE_SIZE := 16777216
   SUPPORTED_DEVICES += we1026-5g-16m
-  DEVICE_TITLE := Zbtlink ZBT-WE1026-5G (16M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE1026-5G
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += we1026-5g-16m
 
 define Device/zbt-ape522ii
   DTS := ZBT-APE522II
-  DEVICE_TITLE := Zbtlink ZBT-APE522II
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-APE522II
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += zbt-ape522ii
 
 define Device/zbt-cpe102
   DTS := ZBT-CPE102
-  DEVICE_TITLE := Zbtlink ZBT-CPE102
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-CPE102
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-cpe102
 
 define Device/zbt-wa05
   DTS := ZBT-WA05
-  DEVICE_TITLE := Zbtlink ZBT-WA05
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WA05
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wa05
 
 define Device/zbt-we2026
   DTS := ZBT-WE2026
-  DEVICE_TITLE := Zbtlink ZBT-WE2026
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE2026
 endef
 TARGET_DEVICES += zbt-we2026
 
@@ -843,7 +943,9 @@ define Device/zbt-we826-16M
   DTS := ZBT-WE826-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   SUPPORTED_DEVICES += zbt-we826
-  DEVICE_TITLE := Zbtlink ZBT-WE826 (16M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-16M
@@ -851,7 +953,9 @@ TARGET_DEVICES += zbt-we826-16M
 define Device/zbt-we826-32M
   DTS := ZBT-WE826-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Zbtlink ZBT-WE826 (32M)
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826
+  DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += zbt-we826-32M
@@ -859,7 +963,8 @@ TARGET_DEVICES += zbt-we826-32M
 define Device/zbtlink_zbt-we826-e
   DTS := ZBT-WE826-E
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Zbtlink ZBT-WE826-E
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WE826-E
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \
 		     kmod-usb-serial kmod-usb-serial-option
 endef
@@ -867,14 +972,16 @@ TARGET_DEVICES += zbtlink_zbt-we826-e
 
 define Device/zbt-wr8305rt
   DTS := ZBT-WR8305RT
-  DEVICE_TITLE := Zbtlink ZBT-WR8305RT
+  DEVICE_VENDOR := Zbtlink
+  DEVICE_MODEL := ZBT-WR8305RT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zbt-wr8305rt
 
 define Device/zte-q7
   DTS := ZTE-Q7
-  DEVICE_TITLE := ZTE Q7
+  DEVICE_VENDOR := ZTE
+  DEVICE_MODEL := Q7
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += zte-q7
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index dce24308b8..36fafffd71 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -87,7 +87,8 @@ endef
 define Device/11acnas
   DTS := 11ACNAS
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WeVO 11AC NAS Router
+  DEVICE_VENDOR := WeVO
+  DEVICE_MODEL := 11AC NAS Router
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += 11acnas
@@ -99,7 +100,9 @@ define Device/dir-860l-b1
   SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
   KERNEL := kernel-bin | patch-dtb | relocate-kernel | lzma | uImage lzma
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := D-Link DIR-860L B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-860L
+  DEVICE_VARIANT := B1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += dir-860l-b1
@@ -107,7 +110,8 @@ TARGET_DEVICES += dir-860l-b1
 define Device/mediatek_ap-mt7621a-v60
   DTS := AP-MT7621A-V60
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := Mediatek AP-MT7621A-V60 EVB
+  DEVICE_VENDOR := Mediatek
+  DEVICE_MODEL := AP-MT7621A-V60 EVB
   DEVICE_PACKAGES := kmod-usb3 kmod-sdhci-mt7620 kmod-sound-mt7620
 endef
 TARGET_DEVICES += mediatek_ap-mt7621a-v60
@@ -115,7 +119,8 @@ TARGET_DEVICES += mediatek_ap-mt7621a-v60
 define Device/xzwifi_creativebox-v1
   DTS := CreativeBox-v1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := CreativeBox v1
+  DEVICE_VENDOR := CreativeBox
+  DEVICE_MODEL := v1
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
 	kmod-usb3
@@ -125,7 +130,8 @@ TARGET_DEVICES += xzwifi_creativebox-v1
 define Device/elecom_wrc-1167ghbk2-s
   DTS := WRC-1167GHBK2-S
   IMAGE_SIZE := 15488k
-  DEVICE_TITLE := ELECOM WRC-1167GHBK2-S
+  DEVICE_VENDOR := ELECOM
+  DEVICE_MODEL := WRC-1167GHBK2-S
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\
     elecom-wrc-factory WRC-1167GHBK2-S 0.00
@@ -135,7 +141,8 @@ TARGET_DEVICES += elecom_wrc-1167ghbk2-s
 define Device/elecom_wrc-2533gst
   DTS := WRC-2533GST
   IMAGE_SIZE := 11264k
-  DEVICE_TITLE := ELECOM WRC-2533GST
+  DEVICE_VENDOR := ELECOM
+  DEVICE_MODEL := WRC-2533GST
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\
     elecom-gst-factory WRC-2533GST 0.00
@@ -145,7 +152,8 @@ TARGET_DEVICES += elecom_wrc-2533gst
 define Device/elecom_wrc-1900gst
   DTS := WRC-1900GST
   IMAGE_SIZE := 11264k
-  DEVICE_TITLE := ELECOM WRC-1900GST
+  DEVICE_VENDOR := ELECOM
+  DEVICE_MODEL := WRC-1900GST
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) |\
     elecom-gst-factory WRC-1900GST 0.00
@@ -155,7 +163,8 @@ TARGET_DEVICES += elecom_wrc-1900gst
 define Device/ew1200
   DTS := EW1200
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := AFOUNDRY EW1200
+  DEVICE_VENDOR := AFOUNDRY
+  DEVICE_MODEL := EW1200
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-mt7603 kmod-usb3 \
 	kmod-usb-ledtrig-usbport wpad-basic
@@ -165,7 +174,8 @@ TARGET_DEVICES += ew1200
 define Device/firewrt
   DTS := FIREWRT
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Firefly FireWRT
+  DEVICE_VENDOR := Firefly
+  DEVICE_MODEL := FireWRT
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += firewrt
@@ -173,7 +183,8 @@ TARGET_DEVICES += firewrt
 define Device/gehua_ghl-r-001
   DTS := GHL-R-001
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := GeHua GHL-R-001
+  DEVICE_VENDOR := GeHua
+  DEVICE_MODEL := GHL-R-001
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -181,7 +192,8 @@ TARGET_DEVICES += gehua_ghl-r-001
 
 define Device/gnubee_gb-pc1
   DTS := GB-PC1
-  DEVICE_TITLE := GnuBee Personal Cloud One
+  DEVICE_VENDOR := GnuBee
+  DEVICE_MODEL := Personal Cloud One
   DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
 endef
@@ -189,7 +201,8 @@ TARGET_DEVICES += gnubee_gb-pc1
 
 define Device/gnubee_gb-pc2
   DTS := GB-PC2
-  DEVICE_TITLE := GnuBee Personal Cloud Two
+  DEVICE_VENDOR := GnuBee
+  DEVICE_MODEL := Personal Cloud Two
   DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-usb3 kmod-sdhci-mt7620
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
 endef
@@ -205,7 +218,8 @@ define Device/hc5962
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := HiWiFi HC5962
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5962
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 wpad-basic
 endef
 TARGET_DEVICES += hc5962
@@ -215,7 +229,8 @@ define Device/iodata_wn-ax1167gr
   IMAGE_SIZE := 15552k
   KERNEL_INITRAMFS := $$(KERNEL) | \
     iodata-factory 7864320 4 0x1055 $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.bin
-  DEVICE_TITLE := I-O DATA WN-AX1167GR
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-AX1167GR
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += iodata_wn-ax1167gr
@@ -223,7 +238,8 @@ TARGET_DEVICES += iodata_wn-ax1167gr
 define Device/iodata_wn-gx300gr
   DTS := WN-GX300GR
   IMAGE_SIZE := 7798784
-  DEVICE_TITLE := I-O DATA WN-GX300GR
+  DEVICE_VENDOR := I-O DATA
+  DEVICE_MODEL := WN-GX300GR
   DEVICE_PACKAGES := kmod-mt7603 wpad-basic
 endef
 TARGET_DEVICES += iodata_wn-gx300gr
@@ -231,7 +247,8 @@ TARGET_DEVICES += iodata_wn-gx300gr
 define Device/k2p
   DTS := K2P
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Phicomm K2P
+  DEVICE_VENDOR := Phicomm
+  DEVICE_MODEL := K2P
 endef
 TARGET_DEVICES += k2p
 
@@ -239,7 +256,8 @@ define Device/totolink_a7000r
   DTS := TOTOLINK-A7000R
   IMAGE_SIZE := 16064k
   UIMAGE_NAME := C8340R1C-9999
-  DEVICE_TITLE := TOTOLINK A7000R
+  DEVICE_VENDOR := TOTOLINK
+  DEVICE_MODEL := A7000R
   DEVICE_PACKAGES := kmod-mt7615e wpad-basic
 endef
 TARGET_DEVICES += totolink_a7000r
@@ -251,7 +269,8 @@ define Device/xiaomi_mir3p
   KERNEL_SIZE:= 4096k
   UBINIZE_OPTS := -E 5
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Xiaomi Mi Router 3 Pro
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router 3 Pro
   IMAGES += factory.bin
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
@@ -271,7 +290,8 @@ define Device/xiaomi_mir3g
   IMAGE/kernel1.bin := append-kernel
   IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  DEVICE_TITLE := Xiaomi Mi Router 3G
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router 3G
   SUPPORTED_DEVICES += R3G
   SUPPORTED_DEVICES += mir3g
   DEVICE_PACKAGES := \
@@ -284,14 +304,16 @@ define Device/mt7621
   DTS := MT7621
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := MediaTek MT7621 EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7621 EVB
 endef
 TARGET_DEVICES += mt7621
 
 define Device/newifi-d1
   DTS := Newifi-D1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Newifi D1
+  DEVICE_VENDOR := Newifi
+  DEVICE_MODEL := D1
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -300,7 +322,8 @@ TARGET_DEVICES += newifi-d1
 define Device/d-team_newifi-d2
   DTS := Newifi-D2
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Newifi D2
+  DEVICE_VENDOR := Newifi
+  DEVICE_MODEL := D2
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -309,7 +332,8 @@ TARGET_DEVICES += d-team_newifi-d2
 define Device/pbr-m1
   DTS := PBR-M1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := PBR-M1
+  DEVICE_VENDOR := PandoraBox
+  DEVICE_MODEL := PBR-M1
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt7603 kmod-mt76x2 kmod-sdhci-mt7620 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
@@ -327,7 +351,8 @@ define Device/r6220
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/kernel.bin := append-kernel
   IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Netgear R6220
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := R6220
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -335,7 +360,8 @@ TARGET_DEVICES += r6220
 
 define Device/netgear_ex6150
   DTS := EX6150
-  DEVICE_TITLE := Netgear EX6150
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := EX6150
   DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
   NETGEAR_BOARD_ID := U12H318T00_NETGEAR
   IMAGE_SIZE := 14848k
@@ -355,13 +381,15 @@ define Device/netgear_r6350
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/kernel.bin := append-kernel
   IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Netgear R6350
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := R6350
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += netgear_r6350
 
 define Device/MikroTik
+  DEVICE_VENDOR := MikroTik
   BLOCKSIZE := 64k
   IMAGE_SIZE := 16128k
   DEVICE_PACKAGES := kmod-usb3
@@ -375,7 +403,8 @@ endef
 define Device/mikrotik_rb750gr3
   $(Device/MikroTik)
   DTS := RB750Gr3
-  DEVICE_TITLE := MikroTik RouterBOARD RB750Gr3
+  DEVICE_MODEL := RouterBOARD RB750G
+  DEVICE_VARIANT := r3
   DEVICE_PACKAGES += kmod-gpio-beeper
 endef
 TARGET_DEVICES += mikrotik_rb750gr3
@@ -383,30 +412,33 @@ TARGET_DEVICES += mikrotik_rb750gr3
 define Device/mikrotik_rbm33g
   $(Device/MikroTik)
   DTS := RBM33G
-  DEVICE_TITLE := MikroTik RouterBOARD M33G
+  DEVICE_MODEL := RouterBOARD M33G
 endef
 TARGET_DEVICES += mikrotik_rbm33g
 
 define Device/mikrotik_rbm11g
   $(Device/MikroTik)
   DTS := RBM11G
-  DEVICE_TITLE := MikroTik RouterBOARD M11G
+  DEVICE_MODEL := RouterBOARD M11G
 endef
 TARGET_DEVICES += mikrotik_rbm11g
 
 define Device/mtc_wr1201
-	DTS := WR1201
-	IMAGE_SIZE := 16000k
-	DEVICE_TITLE := MTC Wireless Router WR1201
-	KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header
-	DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
-		kmod-usb-ledtrig-usbport wpad-basic
+  DTS := WR1201
+  IMAGE_SIZE := 16000k
+  DEVICE_VENDOR := MTC
+  DEVICE_MODEL := Wireless Router WR1201
+  KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header
+  DEVICE_PACKAGES := \
+	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += mtc_wr1201
 
 define Device/re350-v1
   DTS := RE350
-  DEVICE_TITLE := TP-LINK RE350 v1
+  DEVICE_VENDOR := TP-Link
+  DEVICE_MODEL := RE350
+  DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
   TPLINK_BOARD_ID := RE350-V1
   TPLINK_HWID := 0x0
@@ -422,14 +454,16 @@ TARGET_DEVICES += re350-v1
 
 define Device/re6500
   DTS := RE6500
-  DEVICE_TITLE := Linksys RE6500
+  DEVICE_VENDOR := Linksys
+  DEVICE_MODEL := RE6500
   DEVICE_PACKAGES := kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += re6500
 
 define Device/sap-g3200u3
   DTS := SAP-G3200U3
-  DEVICE_TITLE := STORYLiNK SAP-G3200U3
+  DEVICE_VENDOR := STORYLiNK
+  DEVICE_MODEL := SAP-G3200U3
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += sap-g3200u3
@@ -437,7 +471,8 @@ TARGET_DEVICES += sap-g3200u3
 define Device/sk-wb8
   DTS := SK-WB8
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := SamKnows Whitebox 8
+  DEVICE_VENDOR := SamKnows
+  DEVICE_MODEL := Whitebox 8
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport \
 	uboot-envtools wpad-basic
@@ -447,14 +482,16 @@ TARGET_DEVICES += sk-wb8
 define Device/telco-electronics_x1
   DTS := Telco-Electronics-X1
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Telco Electronics X1
+  DEVICE_VENDOR := Telco Electronics
+  DEVICE_MODEL := X1
   DEVICE_PACKAGES := kmod-usb3 kmod-mt76 wpad-basic
 endef
 TARGET_DEVICES += telco-electronics_x1
 
 define Device/timecloud
   DTS := Timecloud
-  DEVICE_TITLE := Thunder Timecloud
+  DEVICE_VENDOR := Thunder
+  DEVICE_MODEL := Timecloud
   DEVICE_PACKAGES := kmod-usb3
 endef
 TARGET_DEVICES += timecloud
@@ -465,14 +502,16 @@ define Device/ubnt-erx
   KERNEL_SIZE := 3145728
   KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  DEVICE_TITLE := Ubiquiti EdgeRouter X
+  DEVICE_VENDOR := Ubiquiti
+  DEVICE_MODEL := EdgeRouter X
 endef
 TARGET_DEVICES += ubnt-erx
 
 define Device/ubnt-erx-sfp
   $(Device/ubnt-erx)
   DTS := UBNT-ERX-SFP
-  DEVICE_TITLE := Ubiquiti EdgeRouter X-SFP
+  DEVICE_VENDOR := Ubiquiti
+  DEVICE_MODEL := EdgeRouter X-SFP
   DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x kmod-i2c-gpio-custom
 endef
 TARGET_DEVICES += ubnt-erx-sfp
@@ -480,7 +519,9 @@ TARGET_DEVICES += ubnt-erx-sfp
 define Device/unielec_u7621-06-256m-16m
   DTS := U7621-06-256M-16M
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := UniElec U7621-06 (256M RAM/16M flash)
+  DEVICE_VENDOR := UniElec
+  DEVICE_MODEL := U7621-06
+  DEVICE_VARIANT := 256M RAM/16M flash
   DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3
   SUPPORTED_DEVICES += u7621-06-256M-16M
 endef
@@ -489,7 +530,9 @@ TARGET_DEVICES += unielec_u7621-06-256m-16m
 define Device/unielec_u7621-06-512m-64m
   DTS := U7621-06-512M-64M
   IMAGE_SIZE := 65216k
-  DEVICE_TITLE := UniElec U7621-06 (512M RAM/64M flash)
+  DEVICE_VENDOR := UniElec
+  DEVICE_MODEL := U7621-06
+  DEVICE_VARIANT := 512M RAM/64M flash
   DEVICE_PACKAGES := kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-usb3
 endef
 TARGET_DEVICES += unielec_u7621-06-512m-64m
@@ -497,7 +540,8 @@ TARGET_DEVICES += unielec_u7621-06-512m-64m
 define Device/vr500
   DTS := VR500
   IMAGE_SIZE := 66453504
-  DEVICE_TITLE := Planex VR500
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := VR500
   DEVICE_PACKAGES := kmod-usb3
 endef
 TARGET_DEVICES += vr500
@@ -505,7 +549,9 @@ TARGET_DEVICES += vr500
 define Device/w2914nsv2
   DTS := W2914NSV2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WeVO W2914NS v2
+  DEVICE_VENDOR := WeVO
+  DEVICE_MODEL := W2914NS
+  DEVICE_VARIANT := v2
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -520,7 +566,8 @@ define Device/wf-2881
   KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma
   UBINIZE_OPTS := -E 5
   IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := NETIS WF-2881
+  DEVICE_VENDOR := NETIS
+  DEVICE_MODEL := WF-2881
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
 TARGET_DEVICES += wf-2881
@@ -528,7 +575,9 @@ TARGET_DEVICES += wf-2881
 define Device/mqmaker_witi-256m
   DTS := WITI-256M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := MQmaker WiTi (256MB RAM)
+  DEVICE_VENDOR := MQmaker
+  DEVICE_MODEL := WiTi
+  DEVICE_VARIANT := 256MB RAM
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
 	kmod-usb-ledtrig-usbport wpad-basic
@@ -539,7 +588,9 @@ TARGET_DEVICES += mqmaker_witi-256m
 define Device/mqmaker_witi-512m
   DTS := WITI-512M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := MQmaker WiTi (512MB RAM)
+  DEVICE_VENDOR := MQmaker
+  DEVICE_MODEL := WiTi
+  DEVICE_VARIANT := 512MB RAM
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-mt76x2 kmod-sdhci-mt7620 kmod-usb3 \
 	kmod-usb-ledtrig-usbport wpad-basic
@@ -558,7 +609,9 @@ define Device/wndr3700v5
   IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | pad-to $$$$(BLOCKSIZE) | \
 	sercom-footer | pad-to 128 | zip WNDR3700v5.bin | sercom-seal
-  DEVICE_TITLE := Netgear WNDR3700v5
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WNDR3700
+  DEVICE_VARIANT := v5
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -567,7 +620,8 @@ TARGET_DEVICES += wndr3700v5
 define Device/youhua_wr1200js
   DTS := WR1200JS
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := YouHua WR1200JS
+  DEVICE_VENDOR := YouHua
+  DEVICE_MODEL := WR1200JS
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -576,7 +630,8 @@ TARGET_DEVICES += youhua_wr1200js
 define Device/youku_yk-l2
   DTS := YOUKU-YK2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Youku YK-L2
+  DEVICE_VENDOR := Youku
+  DEVICE_MODEL := YK-L2
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
 endef
@@ -586,7 +641,8 @@ define Device/wsr-1166
   DTS := WSR-1166
   IMAGE/sysupgrade.bin := trx | pad-rootfs | append-metadata
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Buffalo WSR-1166
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WSR-1166
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 wpad-basic
 endef
 TARGET_DEVICES += wsr-1166
@@ -594,7 +650,8 @@ TARGET_DEVICES += wsr-1166
 define Device/wsr-600
   DTS := WSR-600
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Buffalo WSR-600
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WSR-600
   DEVICE_PACKAGES := kmod-mt7603 kmod-rt2800-pci wpad-basic
 endef
 TARGET_DEVICES += wsr-600
@@ -602,7 +659,8 @@ TARGET_DEVICES += wsr-600
 define Device/zbt-we1326
   DTS := ZBT-WE1326
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := ZBT WE1326
+  DEVICE_VENDOR := ZBT
+  DEVICE_MODEL := ZBT-WE1326
   DEVICE_PACKAGES := \
 	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 wpad-basic
 endef
@@ -611,7 +669,8 @@ TARGET_DEVICES += zbt-we1326
 define Device/zbtlink_zbt-we3526
   DTS := ZBT-WE3526
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := ZBT WE3526
+  DEVICE_VENDOR := ZBT
+  DEVICE_MODEL := ZBT-WE3526
   DEVICE_PACKAGES := \
 	kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
@@ -621,7 +680,8 @@ TARGET_DEVICES += zbtlink_zbt-we3526
 define Device/zbt-wg2626
   DTS := ZBT-WG2626
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := ZBT WG2626
+  DEVICE_VENDOR := ZBT
+  DEVICE_MODEL := ZBT-WG2626
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \
 	kmod-usb-ledtrig-usbport wpad-basic
@@ -632,7 +692,9 @@ define Device/zbt-wg3526-16M
   DTS := ZBT-WG3526-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   SUPPORTED_DEVICES += zbt-wg3526
-  DEVICE_TITLE := ZBT WG3526 (16MB flash)
+  DEVICE_VENDOR := ZBT
+  DEVICE_MODEL := ZBT-WG3526
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
@@ -643,7 +705,9 @@ define Device/zbt-wg3526-32M
   DTS := ZBT-WG3526-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   SUPPORTED_DEVICES += ac1200pro
-  DEVICE_TITLE := ZBT WG3526 (32MB flash)
+  DEVICE_VENDOR := ZBT
+  DEVICE_MODEL := ZBT-WG3526
+  DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := \
 	kmod-ata-core kmod-ata-ahci kmod-sdhci-mt7620 kmod-mt7603 kmod-mt76x2 \
 	kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic
@@ -653,7 +717,8 @@ TARGET_DEVICES += zbt-wg3526-32M
 define Device/asiarf_ap7621-001
   DTS := AP7621-001
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := AsiaRF AP7621-001
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AP7621-001
   DEVICE_PACKAGES := \
 	kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3
 endef
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 266df857a3..9ad77e83db 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -3,6 +3,7 @@
 #
 
 define Device/tplink
+  DEVICE_VENDOR := TP-Link
   TPLINK_FLASHLAYOUT :=
   TPLINK_HWID :=
   TPLINK_HWREV :=
@@ -22,7 +23,8 @@ DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLIN
 define Device/alfa-network_awusfree1
   DTS := AWUSFREE1
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := ALFA Network AWUSFREE1
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := AWUSFREE1
   DEVICE_PACKAGES := uboot-envtools
 endef
 TARGET_DEVICES += alfa-network_awusfree1
@@ -34,7 +36,8 @@ define Device/cudy_wr1000
   IMAGE/factory.bin := \
         $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 92.122
   JCG_MAXSIZE := 8060928
-  DEVICE_TITLE := Cudy WR1000
+  DEVICE_VENDOR := Cudy
+  DEVICE_MODEL := WR1000
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += wr1000
 endef
@@ -43,14 +46,16 @@ TARGET_DEVICES += cudy_wr1000
 define Device/tama_w06
   DTS := W06
   IMAGE_SIZE := 15040k
-  DEVICE_TITLE := Tama W06
+  DEVICE_VENDOR := Tama
+  DEVICE_MODEL := W06
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += tama_w06
 
 define Device/duzun-dm06
   DTS := DUZUN-DM06
-  DEVICE_TITLE := DuZun DM06
+  DEVICE_VENDOR := DuZun
+  DEVICE_MODEL := DM06
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += duzun-dm06
@@ -58,7 +63,9 @@ TARGET_DEVICES += duzun-dm06
 define Device/gl-mt300n-v2
   DTS := GL-MT300N-V2
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := GL-iNet GL-MT300N-V2
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := GL-MT300N
+  DEVICE_VARIANT := V2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += gl-mt300n-v2
@@ -66,7 +73,8 @@ TARGET_DEVICES += gl-mt300n-v2
 define Device/glinet_vixmini
   DTS := VIXMINI
   IMAGE_SIZE := 7872k
-  DEVICE_TITLE := GL.iNet VIXMINI
+  DEVICE_VENDOR := GL.iNet
+  DEVICE_MODEL := VIXMINI
   SUPPORTED_DEVICES += vixmini
 endef
 TARGET_DEVICES += glinet_vixmini
@@ -74,21 +82,24 @@ TARGET_DEVICES += glinet_vixmini
 define Device/hc5661a
   DTS := HC5661A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := HiWiFi HC5661A
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5661A
 endef
 TARGET_DEVICES += hc5661a
 
 define Device/hilink_hlk-7628n
   DTS := HLK-7628N
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := HILINK HLK7628N
+  DEVICE_VENDOR := HILINK
+  DEVICE_MODEL := HLK7628N
 endef
 TARGET_DEVICES += hilink_hlk-7628n
 
 define Device/hiwifi_hc5861b
   DTS := HC5861B
   IMAGE_SIZE := 15808k
-  DEVICE_TITLE := HiWiFi HC5861B
+  DEVICE_VENDOR := HiWiFi
+  DEVICE_MODEL := HC5861B
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += hiwifi_hc5861b
@@ -97,14 +108,17 @@ define Device/LinkIt7688
   DTS := LINKIT7688
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   SUPPORTED_DEVICES := linkits7688 linkits7688d
-  DEVICE_TITLE := MediaTek LinkIt Smart 7688
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := LinkIt Smart 7688
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += LinkIt7688
 
 define Device/mac1200r-v2
   DTS := MAC1200RV2
-  DEVICE_TITLE := Mercury MAC1200R v2.0
+  DEVICE_VENDOR := Mercury
+  DEVICE_MODEL := MAC1200R
+  DEVICE_VARIANT := v2.0
   SUPPORTED_DEVICES := mac1200rv2
   DEVICE_PACKAGES := kmod-mt76x2
 endef
@@ -113,7 +127,8 @@ TARGET_DEVICES += mac1200r-v2
 define Device/miwifi-nano
   DTS := MIWIFI-NANO
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Xiaomi MiWiFi Nano
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := MiWiFi Nano
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += miwifi-nano
@@ -122,7 +137,8 @@ define Device/mt7628
   DTS := MT7628
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := MediaTek MT7628 EVB
+  DEVICE_VENDOR := MediaTek
+  DEVICE_MODEL := MT7628 EVB
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += mt7628
@@ -131,7 +147,8 @@ define Device/netgear_r6120
   DTS := R6120
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Netgear R6120
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := R6120
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
   SERCOMM_HWID := CGQ
   SERCOMM_HWVER := A001
@@ -147,7 +164,8 @@ TARGET_DEVICES += netgear_r6120
 define Device/omega2
   DTS := OMEGA2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Onion Omega2
+  DEVICE_VENDOR := Onion
+  DEVICE_MODEL := Omega2
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools
 endef
 TARGET_DEVICES += omega2
@@ -155,7 +173,8 @@ TARGET_DEVICES += omega2
 define Device/omega2p
   DTS := OMEGA2P
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Onion Omega2+
+  DEVICE_VENDOR := Onion
+  DEVICE_MODEL := Omega2+
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci uboot-envtools kmod-sdhci-mt7620
 endef
 TARGET_DEVICES += omega2p
@@ -163,14 +182,16 @@ TARGET_DEVICES += omega2p
 define Device/pbr-d1
   DTS := PBR-D1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := PBR-D1
+  DEVICE_VENDOR := PandoraBox
+  DEVICE_MODEL := PBR-D1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += pbr-d1
 
 define Device/rakwireless_rak633
   DTS := RAK633
-  DEVICE_TITLE := Rakwireless RAK633
+  DEVICE_VENDOR := Rakwireless
+  DEVICE_MODEL := RAK633
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += rakwireless_rak633
@@ -178,7 +199,8 @@ TARGET_DEVICES += rakwireless_rak633
 define Device/skylab_skw92a
   DTS := SKW92A
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Skylab SKW92A
+  DEVICE_VENDOR := Skylab
+  DEVICE_MODEL := SKW92A
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += skylab_skw92a
@@ -186,7 +208,8 @@ TARGET_DEVICES += skylab_skw92a
 define Device/totolink_lr1200
   DTS := TOTOLINK-LR1200
   IMAGE_SIZE := 7872k
-  DEVICE_TITLE := TOTOLINK LR1200
+  DEVICE_VENDOR := TOTOLINK
+  DEVICE_MODEL := LR1200
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 uqmi
 endef
 TARGET_DEVICES += totolink_lr1200
@@ -195,7 +218,8 @@ define Device/tplink_tl-wa801nd-v5
   $(Device/tplink)
   DTS := TL-WA801NDV5
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WA801ND v5
+  DEVICE_MODEL := TL-WA801ND
+  DEVICE_VARIANT := v5
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08010005
   TPLINK_HWREV := 0x1
@@ -208,7 +232,8 @@ define Device/tplink_tl-wr802n-v4
   $(Device/tplink)
   DTS := TL-WR802NV4
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WR802N v4
+  DEVICE_MODEL := TL-WR802N
+  DEVICE_VARIANT := v4
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08020004
   TPLINK_HWREV := 0x1
@@ -221,7 +246,8 @@ define Device/tl-wr840n-v4
   $(Device/tplink)
   DTS := TL-WR840NV4
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WR840N v4
+  DEVICE_MODEL := TL-WR840N
+  DEVICE_VARIANT := v4
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08400004
   TPLINK_HWREV := 0x1
@@ -233,7 +259,8 @@ TARGET_DEVICES += tl-wr840n-v4
 define Device/tl-wr840n-v5
   DTS := TL-WR840NV5
   IMAGE_SIZE := 3904k
-  DEVICE_TITLE := TP-Link TL-WR840N v5
+  DEVICE_MODEL := TL-WR840N
+  DEVICE_VARIANT := v5
   TPLINK_FLASHLAYOUT := 4Mmtk
   TPLINK_HWID := 0x08400005
   TPLINK_HWREV := 0x1
@@ -250,7 +277,8 @@ define Device/tl-wr841n-v13
   $(Device/tplink)
   DTS := TL-WR841NV13
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WR841N v13
+  DEVICE_MODEL := TL-WR841N
+  DEVICE_VARIANT := v13
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08410013
   TPLINK_HWREV := 0x268
@@ -263,7 +291,8 @@ define Device/tplink_tl-wr841n-v14
   $(Device/tplink)
   DTS := TL-WR841NV14
   IMAGE_SIZE := 3968k
-  DEVICE_TITLE := TP-Link TL-WR841N v14
+  DEVICE_MODEL := TL-WR841N
+  DEVICE_VARIANT := v14
   TPLINK_FLASHLAYOUT := 4Mmtk
   TPLINK_HWID := 0x08410014
   TPLINK_HWREV := 0x1
@@ -277,7 +306,8 @@ define Device/tplink_c20-v4
   $(Device/tplink)
   DTS := ArcherC20v4
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link ArcherC20 v4
+  DEVICE_MODEL := Archer C20
+  DEVICE_VARIANT := v4
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc200004
   TPLINK_HWREV := 0x1
@@ -291,7 +321,8 @@ define Device/tplink_c50-v3
   $(Device/tplink)
   DTS := ArcherC50V3
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link ArcherC50 v3
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v3
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x001D9BA4
   TPLINK_HWREV := 0x79
@@ -305,7 +336,8 @@ define Device/tplink_c50-v4
   $(Device/tplink)
   DTS := ArcherC50V4
   IMAGE_SIZE := 7616k
-  DEVICE_TITLE := TP-Link ArcherC50 v4
+  DEVICE_MODEL := Archer C50
+  DEVICE_VARIANT := v4
   TPLINK_FLASHLAYOUT := 8MSUmtk
   TPLINK_HWID := 0x001D589B
   TPLINK_HWREV := 0x93
@@ -320,7 +352,8 @@ define Device/tplink_tl-mr3020-v3
   $(Device/tplink)
   DTS := TL-MR3020V3
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-MR3020 v3
+  DEVICE_MODEL := TL-MR3020
+  DEVICE_VARIANT := v3
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x30200003
   TPLINK_HWREV := 0x3
@@ -334,7 +367,8 @@ define Device/tplink_tl-mr3420-v5
   $(Device/tplink)
   DTS := TL-MR3420V5
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-MR3420 v5
+  DEVICE_MODEL := TL-MR3420
+  DEVICE_VARIANT := v5
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x34200005
   TPLINK_HWREV := 0x5
@@ -348,7 +382,8 @@ define Device/tplink_tl-wr842n-v5
   $(Device/tplink)
   DTS := TL-WR842NV5
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WR842N v5
+  DEVICE_MODEL := TL-WR842N
+  DEVICE_VARIANT := v5
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x08420005
   TPLINK_HWREV := 0x5
@@ -362,7 +397,8 @@ define Device/tplink_tl-wr902ac-v3
   $(Device/tplink)
   DTS := TL-WR902ACV3
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := TP-Link TL-WR902AC v3
+  DEVICE_MODEL := TL-WR902AC
+  DEVICE_VARIANT := v3
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0x000dc88f
   TPLINK_HWREV := 0x89
@@ -375,7 +411,9 @@ TARGET_DEVICES += tplink_tl-wr902ac-v3
 define Device/u7628-01-128M-16M
   DTS := U7628-01-128M-16M
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := UniElec U7628-01 (128M RAM/16M flash)
+  DEVICE_VENDOR := UniElec
+  DEVICE_MODEL := U7628-01
+  DEVICE_VARIANT := 128M RAM/16M flash
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += u7628-01-128M-16M
@@ -383,7 +421,8 @@ TARGET_DEVICES += u7628-01-128M-16M
 define Device/vocore2
   DTS := VOCORE2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := VoCore VoCore2
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore2
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
     kmod-sdhci-mt7620
 endef
@@ -392,7 +431,8 @@ TARGET_DEVICES += vocore2
 define Device/vocore2lite
   DTS := VOCORE2LITE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := VoCore VoCore2-Lite
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore2-Lite
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
     kmod-sdhci-mt7620
 endef
@@ -401,7 +441,8 @@ TARGET_DEVICES += vocore2lite
 define Device/wavlink_wl-wn570ha1
   DTS := WL-WN570HA1
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := Wavlink WL-WN570HA1
+  DEVICE_VENDOR := Wavlink
+  DEVICE_MODEL := WL-WN570HA1
   DEVICE_PACKAGES := kmod-mt76x0e
 endef
 TARGET_DEVICES += wavlink_wl-wn570ha1
@@ -409,7 +450,8 @@ TARGET_DEVICES += wavlink_wl-wn570ha1
 define Device/wavlink_wl-wn575a3
   DTS := WL-WN575A3
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := Wavlink WL-WN575A3
+  DEVICE_VENDOR := Wavlink
+  DEVICE_MODEL := WL-WN575A3
   DEVICE_PACKAGES := kmod-mt76x2
   SUPPORTED_DEVICES += wl-wn575a3
 endef
@@ -427,7 +469,8 @@ define Device/wcr-1166ds
 	buffalo-enc WCR-1166DS $$(BUFFALO_TAG_VERSION) -l | \
 	buffalo-tag-dhp WCR-1166DS JP JP | buffalo-enc-tag -l | \
 	buffalo-dhp-image
-  DEVICE_TITLE := Buffalo WCR-1166DS
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WCR-1166DS
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += wcr-1166ds
@@ -435,7 +478,9 @@ TARGET_DEVICES += wcr-1166ds
 define Device/widora_neo-16m
   DTS := WIDORA-NEO-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := Widora-NEO (16M)
+  DEVICE_VENDOR := Widora
+  DEVICE_MODEL := Widora-NEO
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
   SUPPORTED_DEVICES += widora-neo
 endef
@@ -444,7 +489,9 @@ TARGET_DEVICES += widora_neo-16m
 define Device/widora_neo-32m
   DTS := WIDORA-NEO-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := Widora-NEO (32M)
+  DEVICE_VENDOR := Widora
+  DEVICE_MODEL := Widora-NEO
+  DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += widora_neo-32m
@@ -452,14 +499,16 @@ TARGET_DEVICES += widora_neo-32m
 define Device/wiznet_wizfi630s
   DTS := WIZFI630S
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
-  DEVICE_TITLE := WIZnet WizFi630S
+  DEVICE_VENDOR := WIZnet
+  DEVICE_MODEL := WizFi630S
 endef
 TARGET_DEVICES += wiznet_wizfi630s
 
 define Device/wrtnode2p
   DTS := WRTNODE2P
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WRTnode 2P
+  DEVICE_VENDOR := WRTnode
+  DEVICE_MODEL := WRTnode 2P
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += wrtnode2p
@@ -467,7 +516,8 @@ TARGET_DEVICES += wrtnode2p
 define Device/wrtnode2r
   DTS := WRTNODE2R
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WRTnode 2R
+  DEVICE_VENDOR := WRTnode
+  DEVICE_MODEL := WRTnode 2R
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
 endef
 TARGET_DEVICES += wrtnode2r
@@ -475,7 +525,9 @@ TARGET_DEVICES += wrtnode2r
 define Device/xiaomi_mir4a-100m
   DTS := XIAOMI-MIR4A-100M
   IMAGE_SIZE := 14976k
-  DEVICE_TITLE := Xiaomi Mi Router 4A (100M Edition)
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router 4A
+  DEVICE_VARIANT := 100M Edition
   DEVICE_PACKAGES := kmod-mt76x2
 endef
 TARGET_DEVICES += xiaomi_mir4a-100m
@@ -483,7 +535,8 @@ TARGET_DEVICES += xiaomi_mir4a-100m
 define Device/zbtlink_zbt-we1226
   DTS := ZBT-WE1226
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := ZBTlink ZBT-WE1226
+  DEVICE_VENDOR := ZBTlink
+  DEVICE_MODEL := ZBT-WE1226
 endef
 TARGET_DEVICES += zbtlink_zbt-we1226
 
@@ -491,7 +544,8 @@ define Device/zyxel_keenetic-extra-ii
   DTS := ki_rb
   IMAGE_SIZE := 14912k
   BLOCKSIZE := 64k
-  DEVICE_TITLE := ZyXEL Keenetic Extra II
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Extra II
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \
diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk
index c7f7d064ff..22fe4a857a 100644
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@@ -12,7 +12,8 @@ endef
 define Device/ar670w
   DTS := AR670W
   BLOCKSIZE := 64k
-  DEVICE_TITLE := Airlink AR670W
+  DEVICE_VENDOR := Airlink
+  DEVICE_MODEL := AR670W
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   KERNEL := $(KERNEL_DTB) | pad-to $$(BLOCKSIZE)
   IMAGES += factory.bin
@@ -23,7 +24,8 @@ TARGET_DEVICES += ar670w
 
 define Device/ar725w
   DTS := AR725W
-  DEVICE_TITLE := Airlink AR725W
+  DEVICE_VENDOR := Airlink
+  DEVICE_MODEL := AR725W
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size 3328k | \
 	gemtek-header ar725w
@@ -34,7 +36,9 @@ define Device/dlink_dap-1522-a1
   DTS := DAP-1522-A1
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
-  DEVICE_TITLE := D-Link DAP-1522 A1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DAP-1522
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-switch-rtl8366s
   KERNEL := $(KERNEL_DTB)
   IMAGES += factory.bin
@@ -49,7 +53,9 @@ TARGET_DEVICES += dlink_dap-1522-a1
 define Device/f5d8235-v1
   DTS := F5D8235_V1
   IMAGE_SIZE := 7744k
-  DEVICE_TITLE := Belkin F5D8235 V1
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F5D8235
+  DEVICE_VARIANT := V1
   DEVICE_PACKAGES := kmod-switch-rtl8366s kmod-usb-core kmod-usb-ohci \
     kmod-usb-ohci-pci kmod-usb2 kmod-usb2-pci kmod-usb-ledtrig-usbport
 endef
@@ -59,7 +65,8 @@ define Device/rt-n15
   DTS := RT-N15
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus RT-N15
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N15
   DEVICE_PACKAGES := kmod-switch-rtl8366s
 endef
 TARGET_DEVICES += rt-n15
@@ -68,7 +75,8 @@ define Device/v11st-fe
   DTS := V11STFE
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Ralink V11ST-FE
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := V11ST-FE
 endef
 TARGET_DEVICES += v11st-fe
 
@@ -76,7 +84,8 @@ define Device/wli-tx4-ag300n
   DTS := WLI-TX4-AG300N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Buffalo WLI-TX4-AG300N
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WLI-TX4-AG300N
   DEVICE_PACKAGES := kmod-switch-ip17xx
 endef
 TARGET_DEVICES += wli-tx4-ag300n
@@ -85,7 +94,8 @@ define Device/wzr-agl300nh
   DTS := WZR-AGL300NH
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Buffalo WZR-AGL300NH
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WZR-AGL300NH
   DEVICE_PACKAGES := kmod-switch-rtl8366s
 endef
 TARGET_DEVICES += wzr-agl300nh
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index adda8ec67e..c1184b0182 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -27,7 +27,8 @@ define Device/3g150b
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := Tenda 3G150B
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := 3G150B
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += 3g150b
@@ -36,7 +37,8 @@ define Device/3g300m
   DTS := 3G300M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME := 3G150M_SPI Kernel Image
-  DEVICE_TITLE := Tenda 3G300M
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := 3G300M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += 3g300m
@@ -47,7 +49,8 @@ define Device/3g-6200n
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Edimax 3g-6200n
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200n
 endef
 TARGET_DEVICES += 3g-6200n
 
@@ -57,7 +60,8 @@ define Device/3g-6200nl
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m 3G62 -f 0x50000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Edimax 3g-6200nl
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := 3g-6200nl
 endef
 TARGET_DEVICES += 3g-6200nl
 
@@ -67,7 +71,8 @@ define Device/a5-v11
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B A5-V11 -F 4M
-  DEVICE_TITLE := A5-V11
+  DEVICE_VENDOR := 
+  DEVICE_MODEL := A5-V11
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
 endef
 TARGET_DEVICES += a5-v11
@@ -76,21 +81,26 @@ define Device/air3gii
   DTS := AIR3GII
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AirLive Air3GII
+  DEVICE_VENDOR := AirLive
+  DEVICE_MODEL := Air3GII
 endef
 TARGET_DEVICES += air3gii
 
 define Device/all0256n-4M
   DTS := ALL0256N-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Allnet ALL0256N (4MB)
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL0256N
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := rssileds
 endef
 TARGET_DEVICES += all0256n-4M
 
 define Device/all0256n-8M
   DTS := ALL0256N-8M
-  DEVICE_TITLE := Allnet ALL0256N (8MB)
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL0256N
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := rssileds
 endef
 TARGET_DEVICES += all0256n-8M
@@ -98,7 +108,8 @@ TARGET_DEVICES += all0256n-8M
 define Device/all5002
   DTS := ALL5002
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Allnet ALL5002
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL5002
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
 endef
@@ -107,7 +118,8 @@ TARGET_DEVICES += all5002
 define Device/all5003
   DTS := ALL5003
   IMAGE_SIZE := 32448k
-  DEVICE_TITLE := Allnet ALL5003
+  DEVICE_VENDOR := Allnet
+  DEVICE_MODEL := ALL5003
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
           kmod-i2c-core kmod-i2c-gpio kmod-hwmon-lm92 kmod-gpio-pcf857x
 endef
@@ -117,7 +129,8 @@ define Device/asl26555-8M
   DTS := ASL26555-8M
   IMAGE_SIZE := 7744k
   SUPPORTED_DEVICES += asl26555
-  DEVICE_TITLE := Alpha ASL26555 
+  DEVICE_VENDOR := Alpha
+  DEVICE_MODEL := ASL26555
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += asl26555-8M
@@ -126,7 +139,9 @@ define Device/asl26555-16M
   DTS := ASL26555-16M
   IMAGE_SIZE := 15872k
   SUPPORTED_DEVICES += asl26555
-  DEVICE_TITLE := Alpha ASL26555 16M
+  DEVICE_VENDOR := Alpha
+  DEVICE_MODEL := ASL26555
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += asl26555-16M
@@ -134,14 +149,17 @@ TARGET_DEVICES += asl26555-16M
 define Device/atp-52b
   DTS := ATP-52B
   IMAGE_SIZE := 7808k
-  DEVICE_TITLE := Argus ATP-52B
+  DEVICE_VENDOR := Argus
+  DEVICE_MODEL := ATP-52B
 endef
 TARGET_DEVICES += atp-52b
 
 define Device/awm002-evb-4M
   DTS := AWM002-EVB-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AsiaRF AWM002-EVB (4M)
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWM002-EVB
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-gpio
 endef
@@ -149,7 +167,9 @@ TARGET_DEVICES += awm002-evb-4M
 
 define Device/awm002-evb-8M
   DTS := AWM002-EVB-8M
-  DEVICE_TITLE := AsiaRF AWM002-EVB (8M)/AsiaRF AWM003 EVB
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWM002-EVB/AWM003-EVB
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-gpio
 endef
@@ -159,13 +179,15 @@ define Device/awapn2403
   DTS := AWAPN2403
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := AsiaRF AWAPN2403
+  DEVICE_VENDOR := AsiaRF
+  DEVICE_MODEL := AWAPN2403
 endef
 TARGET_DEVICES += awapn2403
 
 define Device/bc2
   DTS := BC2
-  DEVICE_TITLE := NexAira BC2
+  DEVICE_VENDOR := NexAira
+  DEVICE_MODEL := BC2
 endef
 TARGET_DEVICES += bc2
 
@@ -173,14 +195,16 @@ define Device/broadway
   DTS := BROADWAY
   IMAGE_SIZE := 7744k
   UIMAGE_NAME:= Broadway Kernel Image
-  DEVICE_TITLE := Hauppauge Broadway
+  DEVICE_VENDOR := Hauppauge
+  DEVICE_MODEL := Broadway
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += broadway
 
 define Device/carambola
   DTS := CARAMBOLA
-  DEVICE_TITLE := 8devices Carambola
+  DEVICE_VENDOR := 8devices 
+  DEVICE_MODEL := Carambola
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += carambola
@@ -189,7 +213,8 @@ define Device/d105
   DTS := D105
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Huawei D105
+  DEVICE_VENDOR := Huawei
+  DEVICE_MODEL := D105
 endef
 TARGET_DEVICES += d105
 
@@ -201,14 +226,16 @@ define Device/dap-1350
 	dap-header -s RT3052-AP-DAP1350WW-3
   IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	dap-header -s RT3052-AP-DAP1350-3
-  DEVICE_TITLE := D-Link DAP-1350
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DAP-1350
 endef
 TARGET_DEVICES += dap-1350
 
 define Device/dcs-930
   DTS := DCS-930
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCS-930
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-dwc2
 endef
 TARGET_DEVICES += dcs-930
@@ -216,7 +243,9 @@ TARGET_DEVICES += dcs-930
 define Device/dcs-930l-b1
   DTS := DCS-930L-B1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DCS-930L B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DCS-930L
+  DEVICE_VARIANT := B1
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc kmod-sound-core kmod-usb-audio kmod-usb-core kmod-usb-ohci kmod-usb2
 endef
 TARGET_DEVICES += dcs-930l-b1
@@ -227,7 +256,9 @@ define Device/dir-300-b1
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir300b
-  DEVICE_TITLE := D-Link DIR-300 B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-300
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += dir-300-b1
 
@@ -235,13 +266,17 @@ define Device/dir-300-b7
   DTS := DIR-300-B7
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DIR-300 B7
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-300
+  DEVICE_VARIANT := B7
 endef
 TARGET_DEVICES += dir-300-b7
 
 define Device/dir-320-b1
   DTS := DIR-320-B1
-  DEVICE_TITLE := D-Link DIR-320 B1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-320
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += dir-320-b1
 
@@ -252,7 +287,9 @@ define Device/dir-600-b1
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir600b
-  DEVICE_TITLE := D-Link DIR-600 B1/B2
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-600
+  DEVICE_VARIANT := B1/B2
 endef
 TARGET_DEVICES += dir-600-b1
 
@@ -263,7 +300,9 @@ define Device/dir-610-a1
   SEAMA_SIGNATURE := wrgn59_dlob.hans_dir610
   KERNEL := $(KERNEL_DTB)
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := D-Link DIR-610 A1 
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-610
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += dir-610-a1
@@ -274,7 +313,9 @@ define Device/dir-615-d
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | wrg-header wrgn23_dlwbr_dir615d
-  DEVICE_TITLE := D-Link DIR-615 D
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-615
+  DEVICE_VARIANT := D
 endef
 TARGET_DEVICES += dir-615-d
 
@@ -286,26 +327,33 @@ define Device/dir-615-h1
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | senao-header -r 0x218 -p 0x30 -t 3
-  DEVICE_TITLE := D-Link DIR-615 H1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-615
+  DEVICE_VARIANT := H1
 endef
 TARGET_DEVICES += dir-615-h1
 
 define Device/dir-620-a1
   DTS := DIR-620-A1
-  DEVICE_TITLE := D-Link DIR-620 A1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-620 A1
 endef
 TARGET_DEVICES += dir-620-a1
 
 define Device/dir-620-d1
   DTS := DIR-620-D1
-  DEVICE_TITLE := D-Link DIR-620 D1
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-620
+  DEVICE_VARIANT := D1
 endef
 TARGET_DEVICES += dir-620-d1
 
 define Device/dwr-512-b
   DTS := DWR-512-B
   IMAGE_SIZE := 7800k
-  DEVICE_TITLE := D-Link DWR-512 B
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DWR-512
+  DEVICE_VARIANT := B
   DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \
 			kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether \
 			comgt-ncm
@@ -323,14 +371,17 @@ define Device/esr-9753
   DTS := ESR-9753
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := EnGenius ESR-9753
+  DEVICE_VENDOR := EnGenius
+  DEVICE_MODEL := ESR-9753
 endef
 TARGET_DEVICES += esr-9753
 
 define Device/f5d8235-v2
   DTS := F5D8235_V2
   IMAGE_SIZE := 7744k
-  DEVICE_TITLE := Belkin F5D8235 v2
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F5D8235
+  DEVICE_VARIANT := v2
   DEVICE_PACKAGES := kmod-switch-rtl8366rb
 endef
 TARGET_DEVICES += f5d8235-v2
@@ -338,7 +389,8 @@ TARGET_DEVICES += f5d8235-v2
 define Device/f7c027
   DTS := F7C027
   IMAGE_SIZE := 7616k
-  DEVICE_TITLE := Belkin F7C027
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F7C027
   DEVICE_PACKAGES := -kmod-usb-core -kmod-usb-dwc2 -kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += f7c027
@@ -348,14 +400,16 @@ define Device/fonera20n
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s RSDK -m NL1T -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Fonera 2.0N
+  DEVICE_VENDOR := Fon
+  DEVICE_MODEL := Fonera 2.0N
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += fonera20n
 
 define Device/freestation5
   DTS := FREESTATION5
-  DEVICE_TITLE := ARC Wireless FreeStation
+  DEVICE_VENDOR := ARC Wireless
+  DEVICE_MODEL := FreeStation
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-rt2500-usb kmod-rt2800-usb kmod-rt2x00-usb
 endef
 TARGET_DEVICES += freestation5
@@ -363,7 +417,8 @@ TARGET_DEVICES += freestation5
 define Device/hg255d
   DTS := HG255D
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := HuaWei HG255D
+  DEVICE_VENDOR := HuaWei
+  DEVICE_MODEL := HG255D
 endef
 TARGET_DEVICES += hg255d
 
@@ -372,27 +427,31 @@ define Device/hlk-rm04
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | hilink-header
-  DEVICE_TITLE := Hi-Link HLK-RM04
+  DEVICE_VENDOR := Hi-Link
+  DEVICE_MODEL := HLK-RM04
 endef
 TARGET_DEVICES += hlk-rm04
 
 define Device/ht-tm02
   DTS := HT-TM02
-  DEVICE_TITLE := HooToo HT-TM02
+  DEVICE_VENDOR := HooToo
+  DEVICE_MODEL := HT-TM02
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ht-tm02
 
 define Device/hw550-3g
   DTS := HW550-3G
-  DEVICE_TITLE := Aztech HW550-3G
+  DEVICE_VENDOR := Aztech
+  DEVICE_MODEL := HW550-3G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += hw550-3g
 
 define Device/ip2202
   DTS := IP2202
-  DEVICE_TITLE := Poray IP2202
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := IP2202
 endef
 TARGET_DEVICES += ip2202
 
@@ -402,7 +461,8 @@ define Device/jhr-n805r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 29.24
-  DEVICE_TITLE := JCG JHR-N805R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N805R
 endef
 TARGET_DEVICES += jhr-n805r
 
@@ -412,7 +472,8 @@ define Device/jhr-n825r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 23.24
-  DEVICE_TITLE := JCG JHR-N825R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N825R
 endef
 TARGET_DEVICES += jhr-n825r
 
@@ -422,14 +483,16 @@ define Device/jhr-n926r
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | jcg-header 25.24
-  DEVICE_TITLE := JCG JHR-N926R
+  DEVICE_VENDOR := JCG
+  DEVICE_MODEL := JHR-N926R
 endef
 TARGET_DEVICES += jhr-n926r
 
 define Device/m2m
   DTS := M2M
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := Intenso Memory 2 Move
+  DEVICE_VENDOR := Intenso
+  DEVICE_MODEL := Memory 2 Move
   DEVICE_PACKAGES := kmod-ledtrig-netdev kmod-ledtrig-timer \
 		kmod-usb-core kmod-usb2 kmod-usb-storage kmod-scsi-core \
 		kmod-fs-ext4 kmod-fs-vfat block-mount
@@ -442,7 +505,8 @@ define Device/m3
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M3 -F 4M
-  DEVICE_TITLE := Poray M3
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M3
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
 	kmod-ledtrig-timer
 endef
@@ -454,7 +518,9 @@ define Device/m4-4M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 4M
-  DEVICE_TITLE := Poray M4 (4MB)
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev \
 	kmod-ledtrig-timer
 endef
@@ -465,26 +531,31 @@ define Device/m4-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B M4 -F 8M
-  DEVICE_TITLE := Poray M4 (8MB)
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := M4
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += m4-8M
 
 define Device/miniembplug
   DTS := MINIEMBPLUG
-  DEVICE_TITLE := Omnima MiniEMBPlug
+  DEVICE_VENDOR := Omnima
+  DEVICE_MODEL := MiniEMBPlug
 endef
 TARGET_DEVICES += miniembplug
 
 define Device/miniembwifi
   DTS := MINIEMBWIFI
-  DEVICE_TITLE := Omnima MiniEMBWiFi
+  DEVICE_VENDOR := Omnima
+  DEVICE_MODEL := MiniEMBWiFi
 endef
 TARGET_DEVICES += miniembwifi
 
 define Device/mofi3500-3gn
   DTS := MOFI3500-3GN
-  DEVICE_TITLE := MoFi Network MOFI3500-3GN
+  DEVICE_VENDOR := MoFi Network
+  DEVICE_MODEL := MOFI3500-3GN
 endef
 TARGET_DEVICES += mofi3500-3gn
 
@@ -493,7 +564,9 @@ define Device/mpr-a1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := HAME MPR-A1
+  DEVICE_VENDOR := HAME
+  DEVICE_MODEL := MPR
+  DEVICE_VARIANT := A1
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += mpr-a1
@@ -501,14 +574,17 @@ TARGET_DEVICES += mpr-a1
 define Device/mpr-a2
   DTS := MPRA2
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := HAME MPR-A2
+  DEVICE_VENDOR := HAME
+  DEVICE_MODEL := MPR
+  DEVICE_VARIANT := A2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += mpr-a2
 
 define Device/mr-102n
   DTS := MR-102N
-  DEVICE_TITLE := AXIMCom MR-102N
+  DEVICE_VENDOR := AXIMCom
+  DEVICE_MODEL := MR-102N
 endef
 TARGET_DEVICES += mr-102n
 
@@ -516,7 +592,8 @@ define Device/mzk-dp150n
   DTS := MZK-DP150N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Planex MZK-DP150N
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-DP150N
   DEVICE_PACKAGES := kmod-spi-dev
 endef
 TARGET_DEVICES += mzk-dp150n
@@ -527,13 +604,15 @@ define Device/mzk-w300nh2
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | \
 	edimax-header -s CSYS -m RN52 -f 0x50000 -S 0xc0000
-  DEVICE_TITLE := Planex MZK-W300NH2
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-W300NH2
 endef
 TARGET_DEVICES += mzk-w300nh2
 
 define Device/mzk-wdpr
   DTS := MZK-WDPR
-  DEVICE_TITLE := Planex MZK-WDPR
+  DEVICE_VENDOR := Planex
+  DEVICE_MODEL := MZK-WDPR
 endef
 TARGET_DEVICES += mzk-wdpr
 
@@ -541,20 +620,23 @@ define Device/nbg-419n
   DTS := NBG-419N
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL NBG-419N
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N
 endef
 TARGET_DEVICES += nbg-419n
 
 define Device/nbg-419n2
   DTS := NBG-419N2
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
-  DEVICE_TITLE := ZyXEL NBG-419N2
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := NBG-419N2
 endef
 TARGET_DEVICES += nbg-419n2
 
 define Device/ncs601w
   DTS := NCS601W
-  DEVICE_TITLE := Wansview NCS601W
+  DEVICE_VENDOR := Wansview
+  DEVICE_MODEL := NCS601W
   DEVICE_PACKAGES := kmod-video-core kmod-video-uvc \
 		kmod-usb-core kmod-usb-ohci
 endef
@@ -564,7 +646,9 @@ define Device/nixcore-x1-8M
   DTS := NIXCORE-8M
   IMAGE_SIZE := 7872k
   SUPPORTED_DEVICES += nixcore-x1
-  DEVICE_TITLE := NixcoreX1 (8M)
+  DEVICE_VENDOR := Nixcore
+  DEVICE_MODEL := X1
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
 endef
 TARGET_DEVICES += nixcore-x1-8M
@@ -573,7 +657,9 @@ define Device/nixcore-x1-16M
   DTS := NIXCORE-16M
   IMAGE_SIZE := 16064k
   SUPPORTED_DEVICES += nixcore-x1
-  DEVICE_TITLE := NixcoreX1 (16M)
+  DEVICE_VENDOR := Nixcore
+  DEVICE_MODEL := X1
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
 endef
 TARGET_DEVICES += nixcore-x1-16M
@@ -582,7 +668,8 @@ define Device/nw718
   DTS := NW718
   IMAGE_SIZE := 3712k
   UIMAGE_NAME:= ARA1B4NCRNW718;1
-  DEVICE_TITLE := Netcore NW718
+  DEVICE_VENDOR := Netcore
+  DEVICE_MODEL := NW718
 endef
 TARGET_DEVICES += nw718
 
@@ -590,13 +677,15 @@ define Device/psr-680w
   DTS := PSR-680W
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Petatel PSR-680W Wireless 3G Router
+  DEVICE_VENDOR := Petatel
+  DEVICE_MODEL := PSR-680W Wireless 3G Router
 endef
 TARGET_DEVICES += psr-680w
 
 define Device/pwh2004
   DTS := PWH2004
-  DEVICE_TITLE := Prolink PWH2004
+  DEVICE_VENDOR := Prolink
+  DEVICE_MODEL := PWH2004
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += pwh2004
@@ -604,7 +693,9 @@ TARGET_DEVICES += pwh2004
 define Device/px-4885-4M
   DTS := PX-4885-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := 7Links PX-4885 (4M)
+  DEVICE_VENDOR := 7Links
+  DEVICE_MODEL := PX-4885
+  DEVICE_VARIANT := 4M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
 	kmod-usb-ledtrig-usbport kmod-leds-gpio
 endef
@@ -612,7 +703,9 @@ TARGET_DEVICES += px-4885-4M
 
 define Device/px-4885-8M
   DTS := PX-4885-8M
-  DEVICE_TITLE := 7Links PX-4885 (8M)
+  DEVICE_VENDOR := 7Links
+  DEVICE_MODEL := PX-4885
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
 	kmod-usb-ledtrig-usbport kmod-leds-gpio
 endef
@@ -620,7 +713,8 @@ TARGET_DEVICES += px-4885-8M
 
 define Device/rt5350f-olinuxino
   DTS := RT5350F-OLINUXINO
-  DEVICE_TITLE := RT5350F-OLinuXino
+  DEVICE_VENDOR := OLIMEX
+  DEVICE_MODEL := RT5350F-OLinuXino
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -629,7 +723,8 @@ TARGET_DEVICES += rt5350f-olinuxino
 
 define Device/rt5350f-olinuxino-evb
   DTS := RT5350F-OLINUXINO-EVB
-  DEVICE_TITLE := RT5350F-OLinuXino-EVB
+  DEVICE_VENDOR := OLIMEX
+  DEVICE_MODEL := RT5350F-OLinuXino-EVB
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -640,7 +735,9 @@ define Device/rt-g32-b1
   DTS := RT-G32-B1
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus RT-G32 B1
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-G32
+  DEVICE_VARIANT := B1
 endef
 TARGET_DEVICES += rt-g32-b1
 
@@ -648,20 +745,23 @@ define Device/rt-n10-plus
   DTS := RT-N10-PLUS
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus RT-N10+
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N10+
 endef
 TARGET_DEVICES += rt-n10-plus
 
 define Device/rt-n13u
   DTS := RT-N13U
-  DEVICE_TITLE := Asus RT-N13U
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N13U
   DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
 endef
 TARGET_DEVICES += rt-n13u
 
 define Device/rut5xx
   DTS := RUT5XX
-  DEVICE_TITLE := Teltonika RUT5XX
+  DEVICE_VENDOR := Teltonika
+  DEVICE_MODEL := RUT5XX
   DEVICE_PACKAGES := om-watchdog
 endef
 TARGET_DEVICES += rut5xx
@@ -670,7 +770,8 @@ define Device/sl-r7205
   DTS := SL-R7205
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Skyline SL-R7205 Wireless 3G Router
+  DEVICE_VENDOR := Skyline
+  DEVICE_MODEL := SL-R7205 Wireless 3G Router
 endef
 TARGET_DEVICES += sl-r7205
 
@@ -680,13 +781,16 @@ define Device/tew-638apb-v2
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGE/sysupgrade.bin := $$(sysupgrade_bin) | umedia-header 0x026382 | \
         append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := TRENDnet TEW-638APB v2
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-638APB
+  DEVICE_VARIANT := v2
 endef
 TARGET_DEVICES += tew-638apb-v2
 
 define Device/tew-714tru
   DTS := TEW-714TRU
-  DEVICE_TITLE := TRENDnet TEW-714TRU
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-714TRU
 endef
 TARGET_DEVICES += tew-714tru
 
@@ -694,14 +798,16 @@ define Device/ur-326n4g
   DTS := UR-326N4G
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := UPVEL UR-326N4G
+  DEVICE_VENDOR := UPVEL
+  DEVICE_MODEL := UR-326N4G
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ur-326n4g
 
 define Device/ur-336un
   DTS := UR-336UN
-  DEVICE_TITLE := UPVEL UR-336UN
+  DEVICE_VENDOR := UPVEL
+  DEVICE_MODEL := UR-336UN
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += ur-336un
@@ -710,7 +816,8 @@ define Device/v22rw-2x2
   DTS := V22RW-2X2
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Ralink AP-RT3052-V22RW-2X2
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := AP-RT3052-V22RW-2X2
 endef
 TARGET_DEVICES += v22rw-2x2
 
@@ -718,7 +825,9 @@ define Device/vocore-8M
   DTS := VOCORE-8M
   IMAGE_SIZE := 7872k
   SUPPORTED_DEVICES += vocore
-  DEVICE_TITLE := VoCore (8M)
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore
+  DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -729,7 +838,9 @@ define Device/vocore-16M
   DTS := VOCORE-16M
   IMAGE_SIZE := 16064k
   SUPPORTED_DEVICES += vocore
-  DEVICE_TITLE := VoCore (16M)
+  DEVICE_VENDOR := VoCore
+  DEVICE_MODEL := VoCore
+  DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
 		kmod-i2c-core kmod-i2c-ralink \
 		kmod-spi-dev
@@ -740,7 +851,8 @@ define Device/w150m
   DTS := W150M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= W150M Kernel Image
-  DEVICE_TITLE := Tenda W150M
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := W150M
 endef
 TARGET_DEVICES += w150m
 
@@ -748,13 +860,16 @@ define Device/w306r-v20
   DTS := W306R_V20
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   UIMAGE_NAME:= linkn Kernel Image
-  DEVICE_TITLE := Tenda W306R V2.0
+  DEVICE_VENDOR := Tenda
+  DEVICE_MODEL := W306R
+  DEVICE_VARIANT := V2.0
 endef
 TARGET_DEVICES += w306r-v20
 
 define Device/w502u
   DTS := W502U
-  DEVICE_TITLE := ALFA Networks W502U
+  DEVICE_VENDOR := ALFA
+  DEVICE_MODEL := Networks W502U
 endef
 TARGET_DEVICES += w502u
 
@@ -762,7 +877,8 @@ define Device/wcr-150gn
   DTS := WCR150GN
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Sparklan WCR-150GN
+  DEVICE_VENDOR := Sparklan
+  DEVICE_MODEL := WCR-150GN
 endef
 TARGET_DEVICES += wcr-150gn
 
@@ -770,7 +886,8 @@ define Device/whr-g300n
   DTS := WHR-G300N
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
-  DEVICE_TITLE := Buffalo WHR-G300N
+  DEVICE_VENDOR := Buffalo
+  DEVICE_MODEL := WHR-G300N
   IMAGES += tftp.bin
   IMAGE/tftp.bin := $$(sysupgrade_bin) | \
     check-size $$$$(IMAGE_SIZE) | buffalo-tftp-header
@@ -780,14 +897,16 @@ TARGET_DEVICES += whr-g300n
 define Device/wizard8800
   DTS := WIZARD8800
   UIMAGE_NAME:= Linux Kernel Image
-  DEVICE_TITLE := EasyAcc WIZARD 8800
+  DEVICE_VENDOR := EasyAcc
+  DEVICE_MODEL := WIZARD 8800
 endef
 TARGET_DEVICES += wizard8800
 
 define Device/wizfi630a
   DTS := WIZFI630A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  DEVICE_TITLE := WIZnet WizFi630A
+  DEVICE_VENDOR := WIZnet
+  DEVICE_MODEL := WizFi630A
 endef
 TARGET_DEVICES += wizfi630a
 
@@ -795,7 +914,8 @@ define Device/wl-330n
   DTS := WL-330N
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus WL-330N
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := WL-330N
 endef
 TARGET_DEVICES += wl-330n
 
@@ -803,7 +923,8 @@ define Device/wl-330n3g
   DTS := WL-330N3G
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Asus WL-330N3G
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := WL-330N3G
   DEVICE_PACKAGES :=
 endef
 TARGET_DEVICES += wl-330n3g
@@ -812,7 +933,8 @@ define Device/wl-351
   DTS := WL-351
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := Sitecom WL-351 v1
+  DEVICE_VENDOR := Sitecom
+  DEVICE_MODEL := WL-351 v1
   DEVICE_PACKAGES := kmod-switch-rtl8366rb kmod-swconfig swconfig
 endef
 TARGET_DEVICES += wl-351
@@ -825,26 +947,30 @@ define Device/wnce2001
 	dap-header -s RT3052-AP-WNCE2001-3 -r WW -v 1.0.0.99
   IMAGE/factory-NA.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	dap-header -s RT3052-AP-WNCE2001-3 -r NA -v 1.0.0.99
-  DEVICE_TITLE := Netgear WNCE2001
+  DEVICE_VENDOR := NETGEAR
+  DEVICE_MODEL := WNCE2001
 endef
 TARGET_DEVICES += wnce2001
 
 define Device/wr512-3gn-4M
   DTS := WR512-3GN-4M
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := WR512-3GN (4M)
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := WR512-3GN (4M)
 endef
 TARGET_DEVICES += wr512-3gn-4M
 
 define Device/wr512-3gn-8M
   DTS := WR512-3GN-8M
-  DEVICE_TITLE := WR512-3GN (8M)
+  DEVICE_VENDOR := Ralink
+  DEVICE_MODEL := WR512-3GN (8M)
 endef
 TARGET_DEVICES += wr512-3gn-8M
 
 define Device/wr6202
   DTS := WR6202
-  DEVICE_TITLE := AWB WR6202
+  DEVICE_VENDOR := AWB
+  DEVICE_MODEL := WR6202
 endef
 TARGET_DEVICES += wr6202
 
@@ -854,7 +980,8 @@ define Device/wt1520-4M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 4M
-  DEVICE_TITLE := Nexx WT1520 (4MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520 (4MB)
 endef
 TARGET_DEVICES += wt1520-4M
 
@@ -863,7 +990,8 @@ define Device/wt1520-8M
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B WT1520 -F 8M
-  DEVICE_TITLE := Nexx WT1520 (8MB)
+  DEVICE_VENDOR := Nexx
+  DEVICE_MODEL := WT1520 (8MB)
 endef
 TARGET_DEVICES += wt1520-8M
 
@@ -872,7 +1000,8 @@ define Device/x5
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X5 -F 8M
-  DEVICE_TITLE := Poray X5/X6
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := X5/X6
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += x5
@@ -883,7 +1012,8 @@ define Device/x8
   IMAGES += factory.bin
   IMAGE/factory.bin := \
 	$$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | poray-header -B X8 -F 8M
-  DEVICE_TITLE := Poray X8
+  DEVICE_VENDOR := Poray
+  DEVICE_MODEL := X8
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-netdev kmod-ledtrig-timer
 endef
 TARGET_DEVICES += x8
@@ -892,7 +1022,8 @@ define Device/xdxrn502j
   DTS := XDXRN502J
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := XDX RN502J
+  DEVICE_VENDOR := XDX
+  DEVICE_MODEL := RN502J
 endef
 TARGET_DEVICES += xdxrn502j
 
@@ -900,7 +1031,8 @@ define Device/kn
   DTS := kn
   BLOCKSIZE := 64k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL Keenetic
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ehci kmod-usb-ledtrig-usbport
 endef
 TARGET_DEVICES += kn
@@ -908,13 +1040,15 @@ TARGET_DEVICES += kn
 define Device/zyxel_keenetic-start
   DTS := kn_st
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
-  DEVICE_TITLE := ZyXEL Keenetic Start
+  DEVICE_VENDOR := ZyXEL
+  DEVICE_MODEL := Keenetic Start
 endef
 TARGET_DEVICES += zyxel_keenetic-start
 
 define Device/zorlik_zl5900v2
   DTS := ZL5900V2
-  DEVICE_TITLE := Zorlik ZL5900V2
+  DEVICE_VENDOR := Zorlik
+  DEVICE_MODEL := ZL5900V2
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-netdev
 endef
 TARGET_DEVICES += zorlik_zl5900v2
diff --git a/target/linux/ramips/image/rt3883.mk b/target/linux/ramips/image/rt3883.mk
index 41b2c3dd5f..b360a2d664 100644
--- a/target/linux/ramips/image/rt3883.mk
+++ b/target/linux/ramips/image/rt3883.mk
@@ -12,7 +12,8 @@ define Device/br-6475nd
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
 	edimax-header -s CSYS -m RN54 -f 0x70000 -S 0x01100000 | pad-rootfs | \
 	append-metadata | check-size $$$$(IMAGE_SIZE)
-  DEVICE_TITLE := Edimax BR-6475nD
+  DEVICE_VENDOR := Edimax
+  DEVICE_MODEL := BR-6475nD
   DEVICE_PACKAGES := swconfig
 endef
 TARGET_DEVICES += br-6475nd
@@ -23,7 +24,8 @@ define Device/cy-swr1100
   BLOCKSIZE := 64k
   KERNEL := $(KERNEL_DTB)
   SEAMA_SIGNATURE := wrgnd10_samsung_ss815
-  DEVICE_TITLE := Samsung CY-SWR1100
+  DEVICE_VENDOR := Samsung
+  DEVICE_MODEL := CY-SWR1100
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
 endef
 TARGET_DEVICES += cy-swr1100
@@ -35,7 +37,8 @@ define Device/dir-645
   BLOCKSIZE := 4k
   KERNEL := $(KERNEL_DTB)
   SEAMA_SIGNATURE := wrgn39_dlob.hans_dir645
-  DEVICE_TITLE := D-Link DIR-645
+  DEVICE_VENDOR := D-Link
+  DEVICE_MODEL := DIR-645
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
 endef
 TARGET_DEVICES += dir-645
@@ -44,7 +47,9 @@ TARGET_DEVICES += dir-645
 define Device/belkin_f9k1109v1
   DTS := F9K1109V1
   BLOCKSIZE := 64k
-  DEVICE_TITLE := Belkin F9K1109 Version 1.0
+  DEVICE_VENDOR := Belkin
+  DEVICE_MODEL := F9K1109
+  DEVICE_VARIANT := Version 1.0
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
   IMAGE_SIZE := 7224k
   KERNEL := kernel-bin | patch-dtb | lzma -d16 | uImage lzma
@@ -57,7 +62,8 @@ define Device/hpm
   DTS := HPM
   BLOCKSIZE := 64k
   IMAGE_SIZE := 16064k
-  DEVICE_TITLE := Omnima HPM
+  DEVICE_VENDOR := Omnima
+  DEVICE_MODEL := HPM
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2
 endef
 TARGET_DEVICES += hpm
@@ -67,7 +73,8 @@ define Device/rt-n56u
   DTS := RT-N56U
   BLOCKSIZE := 64k
   IMAGE/sysupgrade.bin += | mkrtn56uimg -s
-  DEVICE_TITLE := Asus RT-N56U
+  DEVICE_VENDOR := Asus
+  DEVICE_MODEL := RT-N56U
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
 endef
 TARGET_DEVICES += rt-n56u
@@ -79,7 +86,8 @@ define Device/tew-691gr
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x026910
-  DEVICE_TITLE := TRENDnet TEW-691GR
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-691GR
   DEVICE_PACKAGES := swconfig
 endef
 TARGET_DEVICES += tew-691gr
@@ -91,7 +99,8 @@ define Device/tew-692gr
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x026920
-  DEVICE_TITLE := TRENDnet TEW-692GR
+  DEVICE_VENDOR := TRENDnet
+  DEVICE_MODEL := TEW-692GR
   DEVICE_PACKAGES := swconfig
 endef
 TARGET_DEVICES += tew-692gr
@@ -104,7 +113,8 @@ define Device/wlr-6000
   IMAGES += factory.dlf
   IMAGE/factory.dlf := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	senao-header -r 0x0202 -p 0x41 -t 2
-  DEVICE_TITLE := Sitecom WLR-6000
+  DEVICE_VENDOR := Sitecom
+  DEVICE_MODEL := WLR-6000
   DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
 endef
 TARGET_DEVICES += wlr-6000
@@ -113,6 +123,7 @@ TARGET_DEVICES += wlr-6000
 define Device/wmdr-143n
   DTS := WMDR-143N
   BLOCKSIZE := 64k
-  DEVICE_TITLE := Loewe WMDR-143N
+  DEVICE_VENDOR := Loewe
+  DEVICE_MODEL := WMDR-143N
 endef
 TARGET_DEVICES += wmdr-143n