From 9f990001653a0c45a17f15c1ed67ab91fa6aa91b Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 3 Jul 2019 23:22:02 +0200
Subject: [PATCH] ramips/mt7620: Synchronize Makefiles with DTS compatible

This will "rename" devices in Makefiles to the pattern used in
DTS compatible. This will systematize naming of devices
enormously.

As device names are used to for default SUPPORTED_DEVICES entries,
we need to adjust the source for /tmp/sysinfo/board_name, too.
So remove relevant entries from base-files/lib/ramips.sh and
use device compatible for that.

Despite that, base-files are updated, too.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../ramips/base-files/etc/board.d/01_leds     |  84 ++---
 .../ramips/base-files/etc/board.d/02_network  | 156 ++++----
 .../etc/hotplug.d/firmware/10-rt2x00-eeprom   |   2 +-
 .../etc/uci-defaults/09_fix-checksum          |   2 +-
 target/linux/ramips/base-files/lib/ramips.sh  | 195 ----------
 target/linux/ramips/dts/MT7620a.dts           |   2 +-
 target/linux/ramips/dts/MT7620a_MT7530.dts    |   2 +-
 target/linux/ramips/dts/MT7620a_MT7610e.dts   |   2 +-
 target/linux/ramips/dts/MT7620a_V22SG.dts     |   2 +-
 target/linux/ramips/image/mt7620.mk           | 350 ++++++++++--------
 10 files changed, 327 insertions(+), 470 deletions(-)

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 62ea8b9ec6..b34fa8c978 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -28,10 +28,10 @@ hilink,hlk-7628n|\
 mr-102n|\
 skylab,skw92a|\
 wnce2001|\
-zbt-we2026)
+zbtlink,zbt-we2026)
 	set_wifi_led "$boardname:green:wlan"
 	;;
-ai-br100)
+aigale,ai-br100)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2"
 	set_wifi_led "$boardname:blue:wlan"
 	;;
@@ -80,22 +80,22 @@ belkin,f9k1109v1)
 broadway)
 	set_wifi_led "$boardname:red:wps_active"
 	;;
-c108)
+hnet,c108)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0"
 	ucidef_set_led_netdev "modem" "modem" "$boardname:green:modem" "wwan0"
 	;;
-c20i)
+tplink,archer-c20i)
 	ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
 	ucidef_set_led_wlan "wlan" "wlan" "$boardname:blue:wlan" "phy0radio"
 	;;
-c50)
+tplink,archer-c50-v1)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
 	ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" wlan1
 	set_wifi_led "$boardname:green:wlan5g"
 	;;
-cf-wr800n)
+comfast,cf-wr800n)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1
 	set_wifi_led "$boardname:white:wifi"
 	;;
@@ -104,11 +104,11 @@ cudy,wr1000)
 	ucidef_set_led_switch "lan1" "lan1" "$boardname:blue:lan1" "switch0" "0x08"
 	ucidef_set_led_switch "lan2" "lan2" "$boardname:blue:lan2" "switch0" "0x04"
 	;;
-d240|\
-mlw221|\
-mlwg2|\
+sanlinking,d240|\
+kingston,mlw221|\
+kingston,mlwg2|\
 rakwireless,rak633|\
-rt-ac51u)
+asus,rt-ac51u)
 	set_wifi_led "$boardname:blue:wifi"
 	;;
 dcs-930l-b1)
@@ -138,13 +138,13 @@ zyxel,keenetic-start)
 dir-620-d1|\
 dlink,dwr-116-a1|\
 head-weblink,hdrm200|\
-kn_rc|\
-kn_rf|\
-kng_rc|\
-mzk-ex300np|\
-oy-0001|\
+zyxel,keenetic-omni|\
+zyxel,keenetic-omni-ii|\
+zyxel,keenetic-viva|\
+planex,mzk-ex300np|\
+ohyeah,oy-0001|\
 tew-714tru|\
-zbt-wr8305rt)
+zbtlink,zbt-wr8305rt)
 	set_wifi_led "$boardname:green:wifi"
 	;;
 dlink,dwr-118-a1)
@@ -167,11 +167,11 @@ dlink,dwr-922-e2)
 dir-860l-b1)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2"
 	;;
-ex2700|\
-wn3000rpv3)
+netgear,ex2700|\
+netgear,wn3000rp-v3)
 	set_wifi_led "$boardname:green:router"
 	;;
-ex3700)
+netgear,ex3700)
 	ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0"
 	ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
 	;;
@@ -179,7 +179,7 @@ f5d8235-v1)
 	set_wifi_led "$boardname:blue:wireless"
 	;;
 fonera20n|\
-tiny-ac)
+dovado,tiny-ac)
 	set_wifi_led "$boardname:orange:wifi"
 	;;
 gnubee,gb-pc1|\
@@ -187,22 +187,22 @@ gnubee,gb-pc2)
 	ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x01"
 	ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x10"
 	;;
-gl-mt300a|\
-gl-mt300n|\
-gl-mt750)
+glinet,gl-mt300a|\
+glinet,gl-mt300n|\
+glinet,gl-mt750)
 	set_wifi_led "$boardname:wlan"
 	;;
 gl-mt300n-v2)
 	set_wifi_led "$boardname:red:wlan"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x1"
 	;;
-hc5661|\
+hiwifi,hc5661|\
 hc5661a)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	set_wifi_led "$boardname:blue:wlan2g"
 	;;
-hc5761|\
-hc5861)
+hiwifi,hc5761|\
+hiwifi,hc5861)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	ucidef_set_led_netdev "wifi5g" "wifi5g" "$boardname:blue:wlan5g" "wlan0"
 	ucidef_set_led_netdev "wifi2g" "wifi2g" "$boardname:blue:wlan2g" "wlan1"
@@ -250,7 +250,7 @@ mikrotik,rbm11g)
 miniembplug)
 	set_wifi_led "$boardname:red:wlan"
 	;;
-mr200)
+tplink,archer-mr200)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:white:lan" "eth0.1"
 	ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0"
 	set_wifi_led "$boardname:white:wlan"
@@ -258,7 +258,7 @@ mr200)
 mtc,wr1201)
 	ucidef_set_led_switch "eth_link" "LAN link" "$boardname:green:eth_link" "switch0" "0x0f"
 	;;
-mzk-ex750np|\
+planex,mzk-ex750np|\
 zbtlink,zbt-we826-e)
 	set_wifi_led "$boardname:red:wifi"
 	;;
@@ -276,7 +276,7 @@ d-team,newifi-d2)
 	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:blue:wlan2g" "wlan0"
 	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:blue:wlan5g" "wlan1"
 	;;
-psg1208)
+phicomm,psg1208)
 	set_wifi_led "$boardname:white:wlan2g"
 	;;
 px-4885-4M|\
@@ -295,16 +295,16 @@ re350-v1)
 	ucidef_set_led_netdev "eth_act" "LAN act" "$boardname:green:eth_act" "eth0" "tx rx"
 	ucidef_set_led_switch "eth_link" "LAN link" "$boardname:green:eth_link" "switch0" "0x01"
 	;;
-rp-n53)
+asus,rp-n53)
 	ucidef_set_led_netdev "eth" "Network" "$boardname:white:back" "eth0"
 	set_wifi_led "$boardname:blue:wifi"
 	;;
-rt-n12p)
+asus,rt-n12p)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0.1
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
 	set_wifi_led "$boardname:green:air"
 	;;
-rt-n14u)
+asus,rt-n14u)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" eth0.1
 	ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2
 	set_wifi_led "$boardname:blue:air"
@@ -370,7 +370,7 @@ tplink,tl-wr902ac-v3)
 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt"
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10"
 	;;
-u25awf-h1)
+kimax,u25awf-h1)
 	set_wifi_led "u25awf:red:wifi"
 	ucidef_set_led_netdev "eth" "eth" "u25awf:green:lan" "eth0"
 	;;
@@ -400,11 +400,11 @@ wavlink,wl-wn575a3)
 	ucidef_set_led_rssi "wifi-med" "wifi-med" "$boardname:green:wifi-med" "wlan1" "50" "84"
 	ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan1" "85" "100"
 	;;
-we1026-5g-16m)
+zbtlink,we1026-5g-16m)
 	ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
 	set_wifi_led "we1026-5g:green:wifi"
 	;;
-wrh-300cr)
+elecom,wrh-300cr)
 	set_wifi_led "$boardname:green:wlan"
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
 	;;
@@ -422,12 +422,12 @@ xiaomi,mir3p)
 xzwifi,creativebox-v1)
 	ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10"
 	;;
-y1)
+lenovo,newifi-y1)
 	ucidef_set_led_netdev "wifi" "WIFI" "$boardname:blue:wifi" "wlan1"
 	ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi5g" "wlan0"
 	ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x03"
 	;;
-y1s)
+lenovo,newifi-y1s)
 	ucidef_set_led_netdev "wifi" "WIFI" "$boardname:yellow:wifi" "wlan1"
 	ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi" "wlan0"
 	ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:internet" "eth0.2" "tx rx"
@@ -435,16 +435,16 @@ y1s)
 youhua,wr1200js)
 	ucidef_set_led_switch "internet" "INTERNET" "$boardname:green:wan" "switch0" "0x01"
 	;;
-zbt-ape522ii)
+zbtlink,zbt-ape522ii)
 	ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1"
 	ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx"
 	ucidef_set_led_netdev "sys2" "wlan0" "$boardname:green:sys2" "wlan0" "tx rx"
 	;;
-zbt-wa05)
+zbtlink,zbt-wa05)
 	set_wifi_led "$boardname:blue:air"
 	;;
-zbt-we826-16M|\
-zbt-we826-32M)
+zbtlink,zbt-we826-16m|\
+zbtlink,zbt-we826-32m)
 	set_wifi_led "zbt-we826:green:wifi"
 	;;
 zbtlink,zbt-we1226)
@@ -460,7 +460,7 @@ zyxel,keenetic-extra-ii)
 	set_wifi_led "$boardname:green:wifi"
 	ucidef_set_led_switch "internet" "internet" "$boardname:green:internet" "switch0" "0x01"
 	;;
-youku-yk1)
+youku,yk1)
 	set_wifi_led "$boardname:blue:air"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10"
 	;;
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index ec2be9715c..e5bfa88f65 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -35,7 +35,7 @@ ramips_setup_interfaces()
 	d-team,newifi-d2|\
 	dir-615-h1|\
 	w2914nsv2|\
-	zbt-we2026)
+	zbtlink,zbt-we2026)
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
 		;;
@@ -49,7 +49,7 @@ ramips_setup_interfaces()
 	all0256n-8M|\
 	all5002|\
 	all5003|\
-	bocco|\
+	yukai,bocco|\
 	broadway|\
 	dcs-930|\
 	dcs-930l-b1|\
@@ -59,7 +59,7 @@ ramips_setup_interfaces()
 	kimax,u35wf|\
 	linkits7688 | \
 	m2m|\
-	microwrt|\
+	microduino,microwrt|\
 	mikrotik,rbm11g|\
 	mpr-a2|\
 	ncs601w|\
@@ -71,29 +71,29 @@ ramips_setup_interfaces()
 	widora,neo-16m|\
 	widora,neo-32m|\
 	wnce2001|\
-	zbt-cpe102|\
+	zbtlink,zbt-cpe102|\
 	zorlik,zl5900v2|\
-	zte-q7)
+	zte,q7)
 		ucidef_add_switch "switch0"
 		ucidef_add_switch_attr "switch0" "enable" "false"
 		ucidef_set_interface_lan "eth0"
 		;;
-	mlw221|\
+	kingston,mlw221|\
 	mr-102n)
 		ucidef_set_interface_lan "eth0.2"
 		;;
 	3g-6200n|\
-	ai-br100|\
+	aigale,ai-br100|\
 	alfa-network,ac1200rm|\
 	mediatek,ap-mt7621a-v60|\
 	xzwifi,creativebox-v1|\
-	d240|\
-	db-wrt01|\
+	sanlinking,d240|\
+	planex,db-wrt01|\
 	dir-300-b7|\
 	dir-320-b1|\
 	dir-610-a1|\
 	dir-615-h1|\
-	dir-810l|\
+	dlink,dir-810l|\
 	dlink,dwr-116-a1|\
 	dlink,dwr-921-c1|\
 	dlink,dwr-922-e2|\
@@ -104,24 +104,24 @@ ramips_setup_interfaces()
 	hlk-rm04|\
 	k2p|\
 	kn|\
-	kn_rc|\
+	zyxel,keenetic-omni|\
 	mac1200rv2|\
-	miwifi-mini|\
+	xiaomi,miwifi-mini|\
 	miwifi-nano|\
 	mt7621|\
 	mt7628|\
 	mtc,wr1201|\
-	mzk-750dhp|\
+	planex,mzk-750dhp|\
 	mzk-w300nh2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
-	oy-0001|\
+	ohyeah,oy-0001|\
 	pbr-m1|\
-	psg1208|\
-	psg1218a|\
+	phicomm,psg1208|\
+	phicomm,psg1218a|\
 	r6220|\
 	netgear,r6350|\
-	rt-n12p|\
+	asus,rt-n12p|\
 	sap-g3200u3|\
 	sk-wb8|\
 	telco-electronics,x1|\
@@ -137,18 +137,18 @@ ramips_setup_interfaces()
 	mqmaker,witi-256m|\
 	mqmaker,witi-512m|\
 	wndr3700v5|\
-	youku-yk1|\
+	youku,yk1|\
 	youku,yk-l2|\
-	zbt-ape522ii|\
+	zbtlink,zbt-ape522ii|\
 	zbt-we1326|\
 	zbtlink,zbt-we826-e|\
 	zbtlink,zbt-we3526|\
-	zbt-we826-16M|\
-	zbt-we826-32M|\
+	zbtlink,zbt-we826-16m|\
+	zbtlink,zbt-we826-32m|\
 	zbt-wg2626|\
 	zbt-wg3526-16M|\
 	zbt-wg3526-32M|\
-	zbt-wr8305rt)
+	zbtlink,zbt-wr8305rt)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
 		;;
@@ -158,27 +158,27 @@ ramips_setup_interfaces()
 		;;
 	alfa-network,awusfree1|\
 	alfa-network,tube-e4g|\
-	cs-qr10|\
+	planex,cs-qr10|\
 	d105|\
 	dlink,dap-1522-a1|\
-	dch-m225|\
-	ex2700|\
-	ex3700|\
+	dlink,dch-m225|\
+	netgear,ex2700|\
+	netgear,ex3700|\
 	hpm|\
-	mzk-ex300np|\
-	mzk-ex750np|\
-	na930|\
+	planex,mzk-ex300np|\
+	planex,mzk-ex750np|\
+	sercomm,na930|\
 	pbr-d1|\
 	ravpower,wd03|\
 	tama,w06|\
 	tplink,tl-mr3020-v3|\
 	tplink,tl-wr802n-v4|\
-	u25awf-h1|\
+	kimax,u25awf-h1|\
 	wli-tx4-ag300n|\
 	wmdr-143n|\
-	wmr-300|\
-	wn3000rpv3|\
-	wrh-300cr)
+	buffalo,wmr-300|\
+	netgear,wn3000rp-v3|\
+	elecom,wrh-300cr)
 		ucidef_set_interface_lan "eth0"
 		;;
 	dlink,dwr-118-a1)
@@ -189,12 +189,12 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan:2" "2:lan:1" "3:lan:3" "4:lan" "0:wan" "6@eth0"
 		;;
-	psg1218b)
+	phicomm,psg1218b)
 		ucidef_add_switch "switch0" \
 			"0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0"
 		;;
-	whr-300hp2|\
-	whr-600d|\
+	buffalo,whr-300hp2|\
+	buffalo,whr-600d|\
 	wsr-1166|\
 	wsr-600)
 		ucidef_add_switch "switch0" \
@@ -203,7 +203,7 @@ ramips_setup_interfaces()
 	ar670w|\
 	ar725w|\
 	rakwireless,rak633|\
-	rt-ac51u)
+	asus,rt-ac51u)
 		ucidef_add_switch "switch0" \
 			"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
 		;;
@@ -215,7 +215,7 @@ ramips_setup_interfaces()
 		;;
 	asl26555-8M|\
 	asl26555-16M|\
-	rp-n53)
+	asus,rp-n53)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "6t@eth0"
 		;;
@@ -223,11 +223,11 @@ ramips_setup_interfaces()
 	awm002-evb-4M|\
 	awm002-evb-8M|\
 	bdcom,wap2100-sk|\
-	c20i|\
+	tplink,archer-c20i|\
 	dir-645|\
-	gl-mt300a|\
-	gl-mt300n|\
-	gl-mt750|\
+	glinet,gl-mt300a|\
+	glinet,gl-mt300n|\
+	glinet,gl-mt750|\
 	hilink,hlk-7628n|\
 	hiwifi,hc5861b|\
 	jhr-n805r|\
@@ -236,7 +236,7 @@ ramips_setup_interfaces()
 	mikrotik,rb750gr3|\
 	mikrotik,rbm33g|\
 	mzk-wdpr|\
-	rt-n14u|\
+	asus,rt-n14u|\
 	skylab,skw92a|\
 	tplink,archer-c20-v4|\
 	tplink,archer-c50-v3|\
@@ -251,16 +251,16 @@ ramips_setup_interfaces()
 	ubnt-erx|\
 	ubnt-erx-sfp|\
 	ur-326n4g|\
-	wrtnode|\
+	wrtnode,wrtnode|\
 	wrtnode2p | \
 	wrtnode2r | \
 	youhua,wr1200js|\
-	zbt-wa05|\
+	zbtlink,zbt-wa05|\
 	zyxel,keenetic-extra-ii)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
-	c50|\
+	tplink,archer-c50-v1|\
 	tplink,archer-c20-v1)
 		ucidef_add_switch "switch0" \
 			"1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0"
@@ -301,8 +301,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
 		;;
-	c108|\
-	cf-wr800n)
+	hnet,c108|\
+	comfast,cf-wr800n)
 		ucidef_add_switch "switch0" \
 			"4:lan" "6t@eth0"
 		;;
@@ -318,8 +318,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "0:wan" "6@eth0"
 		;;
-	e1700|\
-	mt7620a_mt7530)
+	linksys,e1700|\
+	ralink,mt7620a-mt7530-evb)
 		ucidef_add_switch "switch1" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
 		;;
@@ -328,13 +328,13 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
-	hc5661|\
+	hiwifi,hc5661|\
 	head-weblink,hdrm200|\
-	y1s)
+	lenovo,newifi-y1s)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
 		;;
-	hc5861)
+	hiwifi,hc5861)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "5:wan" "6@eth0"
 		;;
@@ -343,20 +343,20 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
 		;;
-	kn_rf)
+	zyxel,keenetic-omni-ii)
 		ucidef_add_switch "switch0" \
 			"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "6@eth0"
 		;;
-	kng_rc)
+	zyxel,keenetic-viva)
 		ucidef_add_switch "switch1" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "7t@eth0"
 		;;
-	mlwg2|\
+	kingston,mlwg2|\
 	wizard8800|\
 	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
-	mr200)
+	tplink,archer-mr200)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
 		ucidef_set_interface_wan "usb0"
@@ -365,7 +365,7 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
 		;;
-	hc5761)
+	hiwifi,hc5761)
 		ucidef_add_switch "switch0" \
 			"1:lan" "4:lan" "0:wan" "6@eth0"
 		;;
@@ -437,11 +437,11 @@ ramips_setup_interfaces()
 			"3:lan" "4:wan" "6@eth0"
 		;;
 	wcr-150gn|\
-	we1026-5g-16m)
+	zbtlink,we1026-5g-16m)
 		ucidef_add_switch "switch0" \
 			"0:lan" "6t@eth0"
 		;;
-	whr-1166d)
+	buffalo,whr-1166d)
 		ucidef_add_switch "switch0" \
 			"0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
 		;;
@@ -453,8 +453,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:wan" "3:lan" "4:lan" "6@eth0"
 		;;
-	wt3020-4M|\
-	wt3020-8M)
+	nexx,wt3020-4m|\
+	nexx,wt3020-8m)
 		ucidef_add_switch "switch0" \
 			"4:lan" "0:wan" "6@eth0"
 		;;
@@ -471,7 +471,7 @@ ramips_setup_interfaces()
 			"4:lan:1" "2:lan:2" "0:wan" "6@eth0"
 		;;
 	zbtlink,zbt-we1226|\
-	y1)
+	lenovo,newifi-y1)
 		ucidef_add_switch "switch0" \
 			"0:lan:2" "1:lan:1" "4:wan" "6@eth0"
 		;;
@@ -521,8 +521,8 @@ ramips_setup_macs()
 	mpr-a1|\
 	psr-680w|\
 	sl-r7205|\
-	y1|\
-	y1s)
+	lenovo,newifi-y1|\
+	lenovo,newifi-y1s)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
@@ -536,7 +536,7 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary devdata 7)
 		;;
 	cy-swr1100|\
-	dch-m225)
+	dlink,dch-m225)
 		lan_mac=$(mtd_get_mac_ascii factory lanmac)
 		;;
 	dir-645)
@@ -557,7 +557,7 @@ ramips_setup_macs()
 		wan_mac=$(jboot_config_read -m -i $(find_mtd_part "config") -o 0xE000)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
-	e1700)
+	linksys,e1700)
 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
 		;;
 	edimax,br-6478ac-v2)
@@ -574,7 +574,9 @@ ramips_setup_macs()
 	whr-g300n)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		;;
-	hc5*61|\
+	hiwifi,hc5661|\
+	hiwifi,hc5761|\
+	hiwifi,hc5861|\
 	hc5661a|\
 	hc5962|\
 	hiwifi,hc5861b)
@@ -590,9 +592,9 @@ ramips_setup_macs()
 	iodata,wn-gx300gr)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary Factory 4)" 1)
 		;;
-	kn_rc|\
-	kn_rf|\
-	kng_rc)
+	zyxel,keenetic-omni|\
+	zyxel,keenetic-omni-ii|\
+	zyxel,keenetic-viva)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 	linkits7688)
@@ -603,7 +605,7 @@ ramips_setup_macs()
 		lan_mac=$(mtd_get_mac_binary factory_info 13)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
-	miwifi-mini)
+	xiaomi,miwifi-mini)
 		wan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$wan_mac")
 		;;
@@ -624,7 +626,7 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-	oy-0001|\
+	ohyeah,oy-0001|\
 	phicomm,k2g)
 		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
@@ -650,7 +652,7 @@ ramips_setup_macs()
 	tew-692gr)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
 		;;
-	tiny-ac)
+	dovado,tiny-ac)
 		lan_mac=$(mtd_get_mac_ascii u-boot-env LAN_MAC_ADDR)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env WAN_MAC_ADDR)
 		;;
@@ -671,9 +673,9 @@ ramips_setup_macs()
 	wcr-150gn)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
-	whr-1166d|\
-	whr-300hp2|\
-	whr-600d|\
+	buffalo,whr-1166d|\
+	buffalo,whr-300hp2|\
+	buffalo,whr-600d|\
 	wsr-600)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$wan_mac
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index fc044c123e..6e68f7603d 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -66,7 +66,7 @@ case "$FIRMWARE" in
 		jboot_eeprom_extract "config" 0xE000
 		rt2x00_eeprom_set_macaddr $wifi_mac
 		;;
-	tiny-ac)
+	dovado,tiny-ac)
 		wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
 		rt2x00_eeprom_extract "factory" 0 512
 		rt2x00_eeprom_set_macaddr $wifi_mac
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
index 54deb5b2e0..8fa668c2e2 100644
--- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
+++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
@@ -15,7 +15,7 @@ board=$(board_name)
 
 case "$board" in
 cy-swr1100 | \
-dch-m225 | \
+dlink,dch-m225|\
 dir-645 | \
 dir-860l-b1)
 	fix_checksum seama
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 093303892c..fdfb454d79 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -28,9 +28,6 @@ ramips_board_detect() {
 	*"A5-V11")
 		name="a5-v11"
 		;;
-	*"Ai-BR100")
-		name="ai-br100"
-		;;
 	*"Air3GII")
 		name="air3gii"
 		;;
@@ -73,51 +70,24 @@ ramips_board_detect() {
 	*"BC2")
 		name="bc2"
 		;;
-	*"BOCCO")
-		name="bocco"
-		;;
 	*"BR-6475nD")
 		name="br-6475nd"
 		;;
 	*"Broadway")
 		name="broadway"
 		;;
-	*"C108")
-		name="c108"
-		;;
-	*"C20i")
-		name="c20i"
-		;;
-	*"C50")
-		name="c50"
-		;;
 	*"Carambola")
 		name="carambola"
 		;;
-	*"CF-WR800N")
-		name="cf-wr800n"
-		;;
-	*"CS-QR10")
-		name="cs-qr10"
-		;;
 	*"CY-SWR1100")
 		name="cy-swr1100"
 		;;
 	*"D105")
 		name="d105"
 		;;
-	*"D240")
-		name="d240"
-		;;
 	*"DAP-1350")
 		name="dap-1350"
 		;;
-	*"DB-WRT01")
-		name="db-wrt01"
-		;;
-	*"DCH-M225")
-		name="dch-m225"
-		;;
 	*"DCS-930")
 		name="dcs-930"
 		;;
@@ -154,36 +124,21 @@ ramips_board_detect() {
 	*"DIR-645")
 		name="dir-645"
 		;;
-	*"DIR-810L")
-		name="dir-810l"
-		;;
 	*"DIR-860L B1")
 		name="dir-860l-b1"
 		;;
-	*"Dovado Tiny AC")
-		name="tiny-ac"
-		;;
 	*"DuZun DM06")
 		name="duzun-dm06"
 		;;
 	*"DWR-512 B")
 		name="dwr-512-b"
 		;;
-	*"E1700")
-		name="e1700"
-		;;
 	*"ESR-9753")
 		name="esr-9753"
 		;;
 	*"EW1200")
 		name="ew1200"
 		;;
-	*"EX2700")
-		name="ex2700";
-		;;
-	*"EX3700/EX3800")
-		name="ex3700"
-		;;
 	*"F5D8235 v1")
 		name="f5d8235-v1"
 		;;
@@ -202,30 +157,12 @@ ramips_board_detect() {
 	*"FreeStation5")
 		name="freestation5"
 		;;
-	*"GL-MT300A")
-		name="gl-mt300a"
-		;;
-	*"GL-MT300N")
-		name="gl-mt300n"
-		;;
-	*"GL-MT750")
-		name="gl-mt750"
-		;;
 	*"GL-MT300N-V2")
 		name="gl-mt300n-v2"
 		;;
-	*"HC5661")
-		name="hc5661"
-		;;
 	*"HC5661A")
 		name="hc5661a"
 		;;
-	*"HC5761")
-		name="hc5761"
-		;;
-	*"HC5861")
-		name="hc5861"
-		;;
 	*"HC5962")
 		name="hc5962"
 		;;
@@ -277,27 +214,15 @@ ramips_board_detect() {
 	*"Mercury MAC1200R v2")
 		name="mac1200rv2"
 		;;
-	*"MicroWRT")
-		name="microwrt"
-		;;
 	*"MiniEMBPlug")
 		name="miniembplug"
 		;;
 	*"MiniEMBWiFi")
 		name="miniembwifi"
 		;;
-	*"MiWiFi Mini")
-		name="miwifi-mini"
-		;;
 	*"MiWiFi Nano")
 		name="miwifi-nano"
 		;;
-	*"MLW221")
-		name="mlw221"
-		;;
-	*"MLWG2")
-		name="mlwg2"
-		;;
 	*"MOFI3500-3GN")
 		name="mofi3500-3gn"
 		;;
@@ -310,15 +235,6 @@ ramips_board_detect() {
 	*"MR-102N")
 		name="mr-102n"
 		;;
-	*"MR200")
-		name="mr200"
-		;;
-	*"MT7620a + MT7530 evaluation"*)
-		name="mt7620a_mt7530"
-		;;
-	*"MT7620a V22SG"*)
-		name="mt7620a_v22sg"
-		;;
 	*"MT7621 evaluation"*)
 		name="mt7621"
 		;;
@@ -328,27 +244,15 @@ ramips_board_detect() {
 	*"MT7688 evaluation"*)
 		name="mt7688"
 		;;
-	*"MZK-750DHP")
-		name="mzk-750dhp"
-		;;
 	*"MZK-DP150N")
 		name="mzk-dp150n"
 		;;
-	*"MZK-EX300NP")
-		name="mzk-ex300np"
-		;;
-	*"MZK-EX750NP")
-		name="mzk-ex750np"
-		;;
 	*"MZK-W300NH2"*)
 		name="mzk-w300nh2"
 		;;
 	*"MZK-WDPR"*)
 		name="mzk-wdpr"
 		;;
-	*"NA930")
-		name="na930"
-		;;
 	*"NBG-419N")
 		name="nbg-419n"
 		;;
@@ -376,24 +280,12 @@ ramips_board_detect() {
 	*"Onion Omega2+")
 		name="omega2p"
 		;;
-	*"OY-0001")
-		name="oy-0001"
-		;;
 	*"PBR-D1")
 		name="pbr-d1"
 		;;
 	*"PBR-M1")
 		name="pbr-m1"
 		;;
-	*"PSG1208")
-		name="psg1208"
-		;;
-	*"PSG1218 rev.A")
-		name="psg1218a"
-		;;
-	*"PSG1218 rev.B")
-		name="psg1218b"
-		;;
 	*"PSR-680W"*)
 		name="psr-680w"
 		;;
@@ -406,9 +298,6 @@ ramips_board_detect() {
 	*"PX-4885 (8M)")
 		name="px-4885-8M"
 		;;
-	*"Q7")
-		name="zte-q7"
-		;;
 	*"R6220")
 		name="r6220"
 		;;
@@ -421,33 +310,21 @@ ramips_board_detect() {
 	*"RN502J")
 		name="xdxrn502j"
 		;;
-	*"RP-N53")
-		name="rp-n53"
-		;;
 	*"RT5350F-OLinuXino")
 		name="rt5350f-olinuxino"
 		;;
 	*"RT5350F-OLinuXino-EVB")
 		name="rt5350f-olinuxino-evb"
 		;;
-	*"RT-AC51U")
-		name="rt-ac51u"
-		;;
 	*"RT-G32 B1")
 		name="rt-g32-b1"
 		;;
 	*"RT-N10+")
 		name="rt-n10-plus"
 		;;
-	*"RT-N12+")
-		name="rt-n12p"
-		;;
 	*"RT-N13U")
 		name="rt-n13u"
 		;;
-	*"RT-N14U")
-		name="rt-n14u"
-		;;
 	*"RT-N15")
 		name="rt-n15"
 		;;
@@ -490,9 +367,6 @@ ramips_board_detect() {
 	*"TL-WR841N v13")
 		name="tl-wr841n-v13"
 		;;
-	*"U25AWF-H1")
-		name="u25awf-h1"
-		;;
 	*"U7628-01 (128M RAM/16M flash)")
 		name="u7628-01-128M-16M"
 		;;
@@ -547,21 +421,9 @@ ramips_board_detect() {
 	*"WCR-150GN")
 		name="wcr-150gn"
 		;;
-	*"WE1026-5G (16M)")
-		name="we1026-5g-16m"
-		;;
 	*"WF-2881")
 		name="wf-2881"
 		;;
-	*"WHR-1166D")
-		name="whr-1166d"
-		;;
-	*"WHR-300HP2")
-		name="whr-300hp2"
-		;;
-	*"WHR-600D")
-		name="whr-600d"
-		;;
 	*"WHR-G300N")
 		name="whr-g300n"
 		;;
@@ -589,12 +451,6 @@ ramips_board_detect() {
 	*"WMDR-143N")
 		name="wmdr-143n"
 		;;
-	*"WMR-300")
-		name="wmr-300"
-		;;
-	*"WN3000RPv3")
-		name="wn3000rpv3"
-		;;
 	*"WNCE2001")
 		name="wnce2001"
 		;;
@@ -610,12 +466,6 @@ ramips_board_detect() {
 	*"WR6202")
 		name="wr6202"
 		;;
-	*"WRH-300CR")
-		name="wrh-300cr"
-		;;
-	*"WRTNODE")
-		name="wrtnode"
-		;;
 	*"WRTnode2R")
 		name="wrtnode2r"
 		;;
@@ -634,12 +484,6 @@ ramips_board_detect() {
 	*"WT1520 (8M)")
 		name="wt1520-8M"
 		;;
-	*"WT3020 (4M)")
-		name="wt3020-4M"
-		;;
-	*"WT3020 (8M)")
-		name="wt3020-8M"
-		;;
 	*"WZR-AGL300NH")
 		name="wzr-agl300nh"
 		;;
@@ -649,33 +493,9 @@ ramips_board_detect() {
 	*"X8")
 		name="x8"
 		;;
-	*"Y1")
-		name="y1"
-		;;
-	*"Y1S")
-		name="y1s"
-		;;
-	*"ZBT-APE522II")
-		name="zbt-ape522ii"
-		;;
-	*"ZBT-CPE102")
-		name="zbt-cpe102"
-		;;
-	*"ZBT-WA05")
-		name="zbt-wa05"
-		;;
 	*"ZBT-WE1326")
 		name="zbt-we1326"
 		;;
-	*"ZBT-WE2026")
-		name="zbt-we2026"
-		;;
-	*"ZBT-WE826 (16M)")
-		name="zbt-we826-16M"
-		;;
-	*"ZBT-WE826 (32M)")
-		name="zbt-we826-32M"
-		;;
 	*"ZBT-WG2626")
 		name="zbt-wg2626"
 		;;
@@ -685,24 +505,9 @@ ramips_board_detect() {
 	*"ZBT-WG3526 (32M)")
 		name="zbt-wg3526-32M"
 		;;
-	*"ZBT-WR8305RT")
-		name="zbt-wr8305rt"
-		;;
 	*"ZyXEL Keenetic")
 		name="kn"
 		;;
-	*"ZyXEL Keenetic Omni")
-		name="kn_rc"
-		;;
-	*"ZyXEL Keenetic Omni II")
-		name="kn_rf"
-		;;
-	*"ZyXEL Keenetic Viva")
-		name="kng_rc"
-		;;
-	*"YK1")
-		name="youku-yk1"
-		;;
 	esac
 
 	# use generic board detect if no name is set
diff --git a/target/linux/ramips/dts/MT7620a.dts b/target/linux/ramips/dts/MT7620a.dts
index 9166fdc576..c9d3d76729 100644
--- a/target/linux/ramips/dts/MT7620a.dts
+++ b/target/linux/ramips/dts/MT7620a.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
+	compatible = "ralink,mt7620a-evb", "ralink,mt7620a-soc";
 	model = "Ralink MT7620a + MT7610e evaluation board";
 
 	keys {
diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts
index 3fc19d9071..976e2acca3 100644
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7530.dts
@@ -3,7 +3,7 @@
 #include "mt7620a.dtsi"
 
 / {
-	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
+	compatible = "ralink,mt7620a-mt7530-evb", "ralink,mt7620a-soc";
 	model = "Ralink MT7620a + MT7530 evaluation board";
 };
 
diff --git a/target/linux/ramips/dts/MT7620a_MT7610e.dts b/target/linux/ramips/dts/MT7620a_MT7610e.dts
index e0ae57a0d9..a2864de94f 100644
--- a/target/linux/ramips/dts/MT7620a_MT7610e.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7610e.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
+	compatible = "ralink,mt7620a-mt7610e-evb", "ralink,mt7620a-soc";
 	model = "Ralink MT7620A evaluation board";
 
 	keys {
diff --git a/target/linux/ramips/dts/MT7620a_V22SG.dts b/target/linux/ramips/dts/MT7620a_V22SG.dts
index d2863ee75c..33d23f2201 100644
--- a/target/linux/ramips/dts/MT7620a_V22SG.dts
+++ b/target/linux/ramips/dts/MT7620a_V22SG.dts
@@ -6,7 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
+	compatible = "ralink,mt7620a-v22sg-evb", "ralink,mt7620a-soc";
 	model = "Ralink MT7620a V22SG High Power evaluation board";
 
 	keys {
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index abf2b1eed6..f53f7dfe67 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -35,14 +35,15 @@ define Build/elx-header
   mv $@.new $@
 endef
 
-define Device/ai-br100
+define Device/aigale_ai-br100
   DTS := AI-BR100
   IMAGE_SIZE := 7936k
   DEVICE_VENDOR := Aigale
   DEVICE_MODEL := Ai-BR100
   DEVICE_PACKAGES:= kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += ai-br100
 endef
-TARGET_DEVICES += ai-br100
+TARGET_DEVICES += aigale_ai-br100
 
 define Device/alfa-network_ac1200rm
   DTS := AC1200RM
@@ -82,10 +83,9 @@ define Device/Archer
   IMAGE/sysupgrade.bin := tplink-v2-image -s -e | append-metadata
 endef
 
-define Device/ArcherC20i
+define Device/tplink_archer-c20i
   $(Device/Archer)
   DTS := ArcherC20i
-  SUPPORTED_DEVICES := c20i
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc2000001
   TPLINK_HWREV := 58
@@ -93,13 +93,13 @@ define Device/ArcherC20i
   DEVICE_PACKAGES := kmod-mt76x0e
   DEVICE_MODEL := Archer C20i
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += c20i
 endef
-TARGET_DEVICES += ArcherC20i
+TARGET_DEVICES += tplink_archer-c20i
 
-define Device/ArcherC50v1
+define Device/tplink_archer-c50-v1
   $(Device/Archer)
   DTS := ArcherC50
-  SUPPORTED_DEVICES := c50
   TPLINK_FLASHLAYOUT := 8Mmtk
   TPLINK_HWID := 0xc7500001
   TPLINK_HWREV := 69
@@ -109,20 +109,21 @@ define Device/ArcherC50v1
   DEVICE_MODEL := Archer C50
   DEVICE_VARIANT := v1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += c50
 endef
-TARGET_DEVICES += ArcherC50v1
+TARGET_DEVICES += tplink_archer-c50-v1
 
-define Device/ArcherMR200
+define Device/tplink_archer-mr200
   $(Device/Archer)
   DTS := ArcherMR200
-  SUPPORTED_DEVICES := mr200
   TPLINK_FLASHLAYOUT := 8MLmtk
   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_MODEL := Archer MR200
+  SUPPORTED_DEVICES += mr200
 endef
-TARGET_DEVICES += ArcherMR200
+TARGET_DEVICES += tplink_archer-mr200
 
 define Device/bdcom_wap2100-sk
   DTS := BDCOM-WAP2100-SK
@@ -133,57 +134,63 @@ define Device/bdcom_wap2100-sk
 endef
 TARGET_DEVICES += bdcom_wap2100-sk
 
-define Device/bocco
+define Device/yukai_bocco
   DTS := BOCCO
   DEVICE_VENDOR := YUKAI Engineering
   DEVICE_MODEL := BOCCO
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
+  SUPPORTED_DEVICES += bocco
 endef
-TARGET_DEVICES += bocco
+TARGET_DEVICES += yukai_bocco
 
-define Device/c108
+define Device/hnet_c108
   DTS := C108
   IMAGE_SIZE := 16777216
   DEVICE_VENDOR := HNET
   DEVICE_MODEL := C108
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += c108
 endef
-TARGET_DEVICES += c108
+TARGET_DEVICES += hnet_c108
 
-define Device/cf-wr800n
+define Device/comfast_cf-wr800n
   DTS := CF-WR800N
   DEVICE_VENDOR := Comfast
   DEVICE_MODEL := CF-WR800N
+  SUPPORTED_DEVICES += cf-wr800n
 endef
-TARGET_DEVICES += cf-wr800n
+TARGET_DEVICES += comfast_cf-wr800n
 
-define Device/cs-qr10
+define Device/planex_cs-qr10
   DTS := 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
+  SUPPORTED_DEVICES += cs-qr10
 endef
-TARGET_DEVICES += cs-qr10
+TARGET_DEVICES += planex_cs-qr10
 
-define Device/d240
+define Device/sanlinking_d240
   DTS := D240
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Sanlinking Technologies
   DEVICE_MODEL := D240
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += d240
 endef
-TARGET_DEVICES += d240
+TARGET_DEVICES += sanlinking_d240
 
-define Device/db-wrt01
+define Device/planex_db-wrt01
   DTS := DB-WRT01
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := DB-WRT01
+  SUPPORTED_DEVICES += db-wrt01
 endef
-TARGET_DEVICES += db-wrt01
+TARGET_DEVICES += planex_db-wrt01
 
-define Device/dch-m225
+define Device/dlink_dch-m225
   $(Device/seama)
   DTS := DCH-M225
   BLOCKSIZE := 4k
@@ -192,17 +199,19 @@ define Device/dch-m225
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DCH-M225
   DEVICE_PACKAGES := kmod-sound-core kmod-sound-mt7620 kmod-i2c-ralink
+  SUPPORTED_DEVICES += dch-m225
 endef
-TARGET_DEVICES += dch-m225
+TARGET_DEVICES += dlink_dch-m225
 
-define Device/dir-810l
+define Device/dlink_dir-810l
   DTS := DIR-810L
   DEVICE_PACKAGES := kmod-mt76x0e
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DIR-810L
   IMAGE_SIZE := 6720k
+  SUPPORTED_DEVICES += dir-810l
 endef
-TARGET_DEVICES += dir-810l
+TARGET_DEVICES += dlink_dir-810l
 
 define Device/dlink_dir-510l
   $(Device/amit_jboot)
@@ -293,17 +302,18 @@ define Device/dlink_dwr-922-e2
 endef
 TARGET_DEVICES += dlink_dwr-922-e2
 
-define Device/e1700
+define Device/linksys_e1700
   DTS := E1700
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	umedia-header 0x013326
   DEVICE_VENDOR := Linksys
   DEVICE_MODEL := E1700
+  SUPPORTED_DEVICES += e1700
 endef
-TARGET_DEVICES += e1700
+TARGET_DEVICES += linksys_e1700
 
-define Device/ex2700
+define Device/netgear_ex2700
   NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
   NETGEAR_BOARD_ID := EX2700
   DTS := EX2700
@@ -315,10 +325,11 @@ define Device/ex2700
 	netgear-dni
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := EX2700
+  SUPPORTED_DEVICES += ex2700
 endef
-TARGET_DEVICES += ex2700
+TARGET_DEVICES += netgear_ex2700
 
-define Device/ex3700-ex3800
+define Device/netgear_ex3700
   NETGEAR_BOARD_ID := U12H319T00_NETGEAR
   DTS := EX3700
   BLOCKSIZE := 4k
@@ -328,73 +339,80 @@ define Device/ex3700-ex3800
   DEVICE_PACKAGES := kmod-mt76x2
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := EX3700/EX3800
-  SUPPORTED_DEVICES := ex3700
+  SUPPORTED_DEVICES += ex3700
 endef
-TARGET_DEVICES += ex3700-ex3800
+TARGET_DEVICES += netgear_ex3700
 
-define Device/gl-mt300a
+define Device/glinet_gl-mt300a
   DTS := GL-MT300A
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT300A
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += gl-mt300a
 endef
-TARGET_DEVICES += gl-mt300a
+TARGET_DEVICES += glinet_gl-mt300a
 
-define Device/u25awf-h1
+define Device/kimax_u25awf-h1
   DTS := U25AWF-H1
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Kimax
   DEVICE_MODEL := U25AWF
   DEVICE_VARIANT := H1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += u25awf-h1
 endef
-TARGET_DEVICES += u25awf-h1
+TARGET_DEVICES += kimax_u25awf-h1
 
-define Device/gl-mt300n
+define Device/glinet_gl-mt300n
   DTS := GL-MT300N
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT300N
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += gl-mt300n
 endef
-TARGET_DEVICES += gl-mt300n
+TARGET_DEVICES += glinet_gl-mt300n
 
-define Device/gl-mt750
+define Device/glinet_gl-mt750
   DTS := GL-MT750
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := GL.iNet
   DEVICE_MODEL := GL-MT750
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += gl-mt750
 endef
-TARGET_DEVICES += gl-mt750
+TARGET_DEVICES += glinet_gl-mt750
 
-define Device/hc5661
+define Device/hiwifi_hc5661
   DTS := HC5661
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5661
   DEVICE_PACKAGES := kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += hc5661
 endef
-TARGET_DEVICES += hc5661
+TARGET_DEVICES += hiwifi_hc5661
 
-define Device/hc5761
+define Device/hiwifi_hc5761
   DTS := HC5761
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5761
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += hc5761
 endef
-TARGET_DEVICES += hc5761
+TARGET_DEVICES += hiwifi_hc5761
 
-define Device/hc5861
+define Device/hiwifi_hc5861
   DTS := HC5861
   IMAGE_SIZE := 15872k
   DEVICE_VENDOR := HiWiFi
   DEVICE_MODEL := HC5861
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += hc5861
 endef
-TARGET_DEVICES += hc5861
+TARGET_DEVICES += hiwifi_hc5861
 
 define Device/head-weblink_hdrm200
   DTS := HDRM200
@@ -441,7 +459,7 @@ define Device/kimax_u35wf
 endef
 TARGET_DEVICES += kimax_u35wf
 
-define Device/kng_rc
+define Device/zyxel_keenetic-viva
   DTS := kng_rc
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := ZyXEL
@@ -450,11 +468,11 @@ define Device/kng_rc
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 8997 -v "ZyXEL Keenetic Viva"
-  SUPPORTED_DEVICES := kng_rc
+  SUPPORTED_DEVICES += kng_rc
 endef
-TARGET_DEVICES += kng_rc
+TARGET_DEVICES += zyxel_keenetic-viva
 
-define Device/kn_rc
+define Device/zyxel_keenetic-omni
   DTS := kn_rc
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni
@@ -462,11 +480,11 @@ define Device/kn_rc
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 4882 -v "ZyXEL Keenetic Omni"
-  SUPPORTED_DEVICES := kn_rc
+  SUPPORTED_DEVICES += kn_rc
 endef
-TARGET_DEVICES += kn_rc
+TARGET_DEVICES += zyxel_keenetic-omni
 
-define Device/kn_rf
+define Device/zyxel_keenetic-omni-ii
   DTS := kn_rf
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := Keenetic Omni II
@@ -474,18 +492,19 @@ define Device/kn_rf
   IMAGES += factory.bin
   IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to 64k | check-size $$$$(IMAGE_SIZE) | \
 	zyimage -d 2102034 -v "ZyXEL Keenetic Omni II"
-  SUPPORTED_DEVICES := kn_rf
+  SUPPORTED_DEVICES += kn_rf
 endef
-TARGET_DEVICES += kn_rf
+TARGET_DEVICES += zyxel_keenetic-omni-ii
 
-define Device/microwrt
+define Device/microduino_microwrt
   DTS := MicroWRT
   IMAGE_SIZE := 16128k
   DEVICE_VENDOR := Microduino
   DEVICE_MODEL := MicroWRT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += microwrt
 endef
-TARGET_DEVICES += microwrt
+TARGET_DEVICES += microduino_microwrt
 
 define Device/lava_lr-25g001
   $(Device/amit_jboot)
@@ -499,133 +518,142 @@ define Device/lava_lr-25g001
 endef
 TARGET_DEVICES += lava_lr-25g001
 
-define Device/miwifi-mini
+define Device/xiaomi_miwifi-mini
   DTS := MIWIFI-MINI
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := MiWiFi Mini
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += miwifi-mini
 endef
-TARGET_DEVICES += miwifi-mini
+TARGET_DEVICES += xiaomi_miwifi-mini
 
-define Device/mlw221
+define Device/kingston_mlw221
   DTS := MLW221
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Kingston
   DEVICE_MODEL := MLW221
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += mlw221
 endef
-TARGET_DEVICES += mlw221
+TARGET_DEVICES += kingston_mlw221
 
-define Device/mlwg2
+define Device/kingston_mlwg2
   DTS := MLWG2
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Kingston
   DEVICE_MODEL := MLWG2
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += mlwg2
 endef
-TARGET_DEVICES += mlwg2
+TARGET_DEVICES += kingston_mlwg2
 
-define Device/mt7620a
+define Device/ralink_mt7620a-evb
   DTS := MT7620a
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a EVB
 endef
-TARGET_DEVICES += mt7620a
+TARGET_DEVICES += ralink_mt7620a-evb
 
-define Device/mt7620a_mt7530
+define Device/ralink_mt7620a-mt7530-evb
   DTS := MT7620a_MT7530
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7530 EVB
-  SUPPORTED_DEVICES := mt7620a_mt7530
+  SUPPORTED_DEVICES += mt7620a_mt7530
 endef
-TARGET_DEVICES += mt7620a_mt7530
+TARGET_DEVICES += ralink_mt7620a-mt7530-evb
 
-define Device/mt7620a_mt7610e
+define Device/ralink_mt7620a-mt7610e-evb
   DTS := MT7620a_MT7610e
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a + MT7610e EVB
   DEVICE_PACKAGES := kmod-mt76x0e
-  SUPPORTED_DEVICES := mt7620a_mt7610e
+  SUPPORTED_DEVICES += mt7620a_mt7610e
 endef
-TARGET_DEVICES += mt7620a_mt7610e
+TARGET_DEVICES += ralink_mt7620a-mt7610e-evb
 
-define Device/mt7620a_v22sg
+define Device/ralink_mt7620a-v22sg-evb
   DTS := MT7620a_V22SG
   DEVICE_VENDOR := MediaTek
   DEVICE_MODEL := MT7620a V22SG
-  SUPPORTED_DEVICES := mt7620a_v22sg
+  SUPPORTED_DEVICES += mt7620a_v22sg
 endef
-TARGET_DEVICES += mt7620a_v22sg
+TARGET_DEVICES += ralink_mt7620a-v22sg-evb
 
-define Device/mzk-750dhp
+define Device/planex_mzk-750dhp
   DTS := MZK-750DHP
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-750DHP
   DEVICE_PACKAGES := kmod-mt76x0e
+  SUPPORTED_DEVICES += mzk-750dhp
 endef
-TARGET_DEVICES += mzk-750dhp
+TARGET_DEVICES += planex_mzk-750dhp
 
-define Device/mzk-ex300np
+define Device/planex_mzk-ex300np
   DTS := MZK-EX300NP
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-EX300NP
+  SUPPORTED_DEVICES += mzk-ex300np
 endef
-TARGET_DEVICES += mzk-ex300np
+TARGET_DEVICES += planex_mzk-ex300np
 
-define Device/mzk-ex750np
+define Device/planex_mzk-ex750np
   DTS := MZK-EX750NP
   DEVICE_VENDOR := Planex
   DEVICE_MODEL := MZK-EX750NP
   DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += mzk-ex750np
 endef
-TARGET_DEVICES += mzk-ex750np
+TARGET_DEVICES += planex_mzk-ex750np
 
-define Device/na930
+define Device/sercomm_na930
   DTS := NA930
   IMAGE_SIZE := 20m
   DEVICE_VENDOR := Sercomm
   DEVICE_MODEL := NA930
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += na930
 endef
-TARGET_DEVICES += na930
+TARGET_DEVICES += sercomm_na930
 
-define Device/oy-0001
+define Device/ohyeah_oy-0001
   DTS := OY-0001
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Oh Yeah
   DEVICE_MODEL := OY-0001
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += oy-0001
 endef
-TARGET_DEVICES += oy-0001
+TARGET_DEVICES += ohyeah_oy-0001
 
-define Device/psg1208
+define Device/phicomm_psg1208
   DTS := PSG1208
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1208
   DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += psg1208
 endef
-TARGET_DEVICES += psg1208
+TARGET_DEVICES += phicomm_psg1208
 
-define Device/psg1218a
+define Device/phicomm_psg1218a
   DTS := PSG1218A
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT:= Ax
   DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += psg1218
+  SUPPORTED_DEVICES += psg1218 psg1218a
 endef
-TARGET_DEVICES += psg1218a
+TARGET_DEVICES += phicomm_psg1218a
 
-define Device/psg1218b
+define Device/phicomm_psg1218b
   DTS := PSG1218B
   DEVICE_VENDOR := Phicomm
   DEVICE_MODEL := PSG1218
   DEVICE_VARIANT := Bx
   DEVICE_PACKAGES := kmod-mt76x2
-  SUPPORTED_DEVICES += psg1218
+  SUPPORTED_DEVICES += psg1218 psg1218b
 endef
-TARGET_DEVICES += psg1218b
+TARGET_DEVICES += phicomm_psg1218b
 
 define Device/phicomm_k2g
   DTS := K2G
@@ -636,45 +664,50 @@ define Device/phicomm_k2g
 endef
 TARGET_DEVICES += phicomm_k2g
 
-define Device/rp-n53
+define Device/asus_rp-n53
   DTS := RP-N53
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RP-N53
   DEVICE_PACKAGES := kmod-rt2800-pci
+  SUPPORTED_DEVICES += rp-n53
 endef
-TARGET_DEVICES += rp-n53
+TARGET_DEVICES += asus_rp-n53
 
-define Device/rt-n12p
+define Device/asus_rt-n12p
   DTS := RT-N12-PLUS
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
+  SUPPORTED_DEVICES += rt-n12p
 endef
-TARGET_DEVICES += rt-n12p
+TARGET_DEVICES += asus_rt-n12p
 
-define Device/rt-n14u
+define Device/asus_rt-n14u
   DTS := RT-N14U
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-N14u
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += rt-n14u
 endef
-TARGET_DEVICES += rt-n14u
+TARGET_DEVICES += asus_rt-n14u
 
-define Device/rt-ac51u
+define Device/asus_rt-ac51u
   DTS := RT-AC51U
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Asus
   DEVICE_MODEL := RT-AC51U
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += rt-ac51u
 endef
-TARGET_DEVICES += rt-ac51u
+TARGET_DEVICES += asus_rt-ac51u
 
-define Device/tiny-ac
+define Device/dovado_tiny-ac
   DTS := TINY-AC
   DEVICE_VENDOR := Dovado
   DEVICE_MODEL := Tiny AC
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += tiny-ac
 endef
-TARGET_DEVICES += tiny-ac
+TARGET_DEVICES += dovado_tiny-ac
 
 define Device/edimax_br-6478ac-v2
   DTS := BR-6478AC-V2
@@ -776,40 +809,44 @@ define Device/ravpower_wd03
 endef
 TARGET_DEVICES += ravpower_wd03
 
-define Device/whr-1166d
+define Device/buffalo_whr-1166d
   DTS := WHR-1166D
   IMAGE_SIZE := 15040k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-1166D
   DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += whr-1166d
 endef
-TARGET_DEVICES += whr-1166d
+TARGET_DEVICES += buffalo_whr-1166d
 
-define Device/whr-300hp2
+define Device/buffalo_whr-300hp2
   DTS := WHR-300HP2
   IMAGE_SIZE := 6848k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-300HP2
+  SUPPORTED_DEVICES += whr-300hp2
 endef
-TARGET_DEVICES += whr-300hp2
+TARGET_DEVICES += buffalo_whr-300hp2
 
-define Device/whr-600d
+define Device/buffalo_whr-600d
   DTS := WHR-600D
   IMAGE_SIZE := 6848k
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WHR-600D
   DEVICE_PACKAGES := kmod-rt2800-pci
+  SUPPORTED_DEVICES += whr-600d
 endef
-TARGET_DEVICES += whr-600d
+TARGET_DEVICES += buffalo_whr-600d
 
-define Device/wmr-300
+define Device/buffalo_wmr-300
   DTS := WMR-300
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WMR-300
+  SUPPORTED_DEVICES += wmr-300
 endef
-TARGET_DEVICES += wmr-300
+TARGET_DEVICES += buffalo_wmr-300
 
-define Device/wn3000rpv3
+define Device/netgear_wn3000rp-v3
   NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
   NETGEAR_BOARD_ID := WN3000RPv3
   DTS := WN3000RPV3
@@ -821,10 +858,11 @@ define Device/wn3000rpv3
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := WN3000RP
   DEVICE_VARIANT := v3
+  SUPPORTED_DEVICES += wn3000rpv3
 endef
-TARGET_DEVICES += wn3000rpv3
+TARGET_DEVICES += netgear_wn3000rp-v3
 
-define Device/wrh-300cr
+define Device/elecom_wrh-300cr
   DTS := WRH-300CR
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   IMAGES += factory.bin
@@ -833,134 +871,144 @@ define Device/wrh-300cr
   DEVICE_VENDOR := Elecom
   DEVICE_MODEL := WRH-300CR
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += wrh-300cr
 endef
-TARGET_DEVICES += wrh-300cr
+TARGET_DEVICES += elecom_wrh-300cr
 
-define Device/wrtnode
+define Device/wrtnode_wrtnode
   DTS := WRTNODE
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := WRTNode
   DEVICE_MODEL := WRTNode
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += wrtnode
 endef
-TARGET_DEVICES += wrtnode
+TARGET_DEVICES += wrtnode_wrtnode
 
-define Device/wt3020-4M
+define Device/nexx_wt3020-4m
   DTS := WT3020-4M
   BLOCKSIZE := 4k
   IMAGE_SIZE := $(ralink_default_fw_size_4M)
   IMAGES += factory.bin
-  SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 4M
   DEVICE_VENDOR := Nexx
   DEVICE_MODEL := WT3020
   DEVICE_VARIANT := 4M
+  SUPPORTED_DEVICES += wt3020 wt3020-4M
 endef
-TARGET_DEVICES += wt3020-4M
+TARGET_DEVICES += nexx_wt3020-4m
 
-define Device/wt3020-8M
+define Device/nexx_wt3020-8m
   DTS := WT3020-8M
   IMAGES += factory.bin
-  SUPPORTED_DEVICES += wt3020
   IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
 	poray-header -B WT3020 -F 8M
   DEVICE_VENDOR := Nexx
   DEVICE_MODEL := WT3020
   DEVICE_VARIANT := 8M
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += wt3020 wt3020-8M
 endef
-TARGET_DEVICES += wt3020-8M
+TARGET_DEVICES += nexx_wt3020-8m
 
-define Device/y1
+define Device/lenovo_newifi-y1
   DTS := Y1
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += y1
 endef
-TARGET_DEVICES += y1
+TARGET_DEVICES += lenovo_newifi-y1
 
-define Device/y1s
+define Device/lenovo_newifi-y1s
   DTS := Y1S
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
   DEVICE_VENDOR := Lenovo
   DEVICE_MODEL := Y1S
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += y1s
 endef
-TARGET_DEVICES += y1s
+TARGET_DEVICES += lenovo_newifi-y1s
 
-define Device/youku-yk1
+define Device/youku_yk1
   DTS := YOUKU-YK1
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := YOUKU
   DEVICE_MODEL := YK1
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 kmod-usb-ledtrig-usbport
+  SUPPORTED_DEVICES += youku-yk1
 endef
-TARGET_DEVICES += youku-yk1
+TARGET_DEVICES += youku_yk1
 
-define Device/we1026-5g-16m
+define Device/zbtlink_we1026-5g-16m
   DTS := WE1026-5G-16M
   IMAGE_SIZE := 16777216
-  SUPPORTED_DEVICES += 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
+  SUPPORTED_DEVICES += we1026-5g-16m
 endef
-TARGET_DEVICES += we1026-5g-16m
+TARGET_DEVICES += zbtlink_we1026-5g-16m
 
-define Device/zbt-ape522ii
+define Device/zbtlink_zbt-ape522ii
   DTS := ZBT-APE522II
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-APE522II
   DEVICE_PACKAGES := kmod-mt76x2
+  SUPPORTED_DEVICES += zbt-ape522ii
 endef
-TARGET_DEVICES += zbt-ape522ii
+TARGET_DEVICES += zbtlink_zbt-ape522ii
 
-define Device/zbt-cpe102
+define Device/zbtlink_zbt-cpe102
   DTS := ZBT-CPE102
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-CPE102
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += zbt-cpe102
 endef
-TARGET_DEVICES += zbt-cpe102
+TARGET_DEVICES += zbtlink_zbt-cpe102
 
-define Device/zbt-wa05
+define Device/zbtlink_zbt-wa05
   DTS := ZBT-WA05
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WA05
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += zbt-wa05
 endef
-TARGET_DEVICES += zbt-wa05
+TARGET_DEVICES += zbtlink_zbt-wa05
 
-define Device/zbt-we2026
+define Device/zbtlink_zbt-we2026
   DTS := ZBT-WE2026
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE2026
+  SUPPORTED_DEVICES += zbt-we2026
 endef
-TARGET_DEVICES += zbt-we2026
+TARGET_DEVICES += zbtlink_zbt-we2026
 
-define Device/zbt-we826-16M
+define Device/zbtlink_zbt-we826-16m
   DTS := ZBT-WE826-16M
   IMAGE_SIZE := $(ralink_default_fw_size_16M)
-  SUPPORTED_DEVICES += zbt-we826
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
   DEVICE_VARIANT := 16M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += zbt-we826 zbt-we826-16M
 endef
-TARGET_DEVICES += zbt-we826-16M
+TARGET_DEVICES += zbtlink_zbt-we826-16m
 
-define Device/zbt-we826-32M
+define Device/zbtlink_zbt-we826-32m
   DTS := ZBT-WE826-32M
   IMAGE_SIZE := $(ralink_default_fw_size_32M)
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826
   DEVICE_VARIANT := 32M
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620
+  SUPPORTED_DEVICES += zbt-we826-32M
 endef
-TARGET_DEVICES += zbt-we826-32M
+TARGET_DEVICES += zbtlink_zbt-we826-32m
 
 define Device/zbtlink_zbt-we826-e
   DTS := ZBT-WE826-E
@@ -972,18 +1020,20 @@ define Device/zbtlink_zbt-we826-e
 endef
 TARGET_DEVICES += zbtlink_zbt-we826-e
 
-define Device/zbt-wr8305rt
+define Device/zbtlink_zbt-wr8305rt
   DTS := ZBT-WR8305RT
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WR8305RT
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += zbt-wr8305rt
 endef
-TARGET_DEVICES += zbt-wr8305rt
+TARGET_DEVICES += zbtlink_zbt-wr8305rt
 
-define Device/zte-q7
+define Device/zte_q7
   DTS := ZTE-Q7
   DEVICE_VENDOR := ZTE
   DEVICE_MODEL := Q7
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
+  SUPPORTED_DEVICES += zte-q7
 endef
-TARGET_DEVICES += zte-q7
+TARGET_DEVICES += zte_q7
-- 
2.25.1