ramips: use consistent naming scheme for LEDs

The upstream LED naming convention is "device:color:led-name", but it seems that many of supported boards in OpenWrt don't follow this approach.
The following patch fixes this inconsistency in dts{,i} files and updates base-files scripts for ramips target:
 * fixes wrong indentation
 * keeps case statements structure in same convention as in other scripts (no empty line after ";;", no indentation for case...esac body)
 * fixes wrong LED names for some of boards (makes them the same as in dts{,i} files)
 * combines boards with same configuration (ex. set_wifi_led "rt2800pci-phy0::radio" in 01_leds)

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

SVN-Revision: 46664

80 files changed, 694 insertions, 612 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 e872b39ffe..c8256dbdb6 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -17,257 +17,275 @@ board=$(ramips_board_name)
 board_config_update
 
 case $board in
-	3g-6200n)
-		set_wifi_led "edimax:amber:wlan"
-		set_usb_led "edimax:blue:3g"
-		;;
-	3g-6200nl)
-		set_wifi_led "edimax:green:wlan"
-		;;
-	3g150b |\
-	3g300m)
-		set_usb_led "tenda:blue:3g"
-		;;
-	ai-br100)
-		ucidef_set_led_netdev "wan" "wan" "aigale:blue:wan" "eth0.2"
-		set_wifi_led "aigale:blue:wlan"
-		;;
-	a5-v11)
-		ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
-		;;
-	air3gii)
-		set_wifi_led "airlive:green:wlan"
-		set_usb_led "airlive:green:mobile"
-		;;
-	all0256n)
-		ucidef_set_rssimon "wlan0" "40000" "1"
-		ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
-		ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
-		ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ar670w|\
-	ar725w|\
-	awapn2403)
-		set_wifi_led "rt2800soc-phy0::radio"
-		;;
-	asl26555)
-		ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
-		set_wifi_led "asl26555:green:wlan"
-		set_usb_led "asl26555:green:3g"
-		;;
-	bc2)
-		set_usb_led "bc2:blue:usb"
-		;;
-	br-6425)
-		set_wifi_led "edimax:orange:wlan"
-		;;
-	br-6475nd)
-		set_wifi_led "edimax:amber:wlan"
-		;;
-	broadway)
-		set_usb_led "red:diskmounted"
-		set_wifi_led "red:wps_active"
-		;;
-	cf-wr800n)
-		ucidef_set_led_netdev "lan" "lan" "comfast:white:ethernet" eth0.1
-		set_wifi_led "comfast:white:wifi"
-		;;
-	cy-swr1100)
-		ucidef_set_led_default "wps" "WPS" "samsung:blue:wps" "0"
-		set_usb_led "samsung:blue:usb"
-		;;
-	d105)
-		ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
-		set_usb_led "d105:green:usb"
-		;;
-	dcs-930l-b1)
-		ucidef_set_led_default "power" "POWER" "d-link:red:power" "1"
-		ucidef_set_led_netdev "wifi" "WiFi" "d-link:blue:wps"
-		;;
-	dir-300-b1|\
-	dir-600-b1|\
-	dir-600-b2|\
-	dir-620-a1)
-		# ANDed with vlan switch port 4 led state
-		ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-615-d|\
-	dir-615-h1)
-		ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-620-d1)
-		set_wifi_led "d-link:green:wifi"
-		;;
-	dir-810l)
-		ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
-		;;
-	dir-610-a1 |\
-	dir-300-b7 |\
-	dir-320-b1 |\
-	esr-9753)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	f5d8235-v1)
-		set_usb_led "f5d8235-v1:blue:storage"
-		;;
-	f5d8235-v2)
-		set_usb_led "f5d8235v2:blue:storage"
-		;;
-	fonera20n)
-		set_usb_led "fonera20n:orange:usb"
-		set_wifi_led "fonera20n:orange:wifi"
-		;;
-	hlk-rm04)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ht-tm02)
-		ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
-		set_wifi_led "ht-tm02:blue:wlan"
-		;;
-	all0239-3g|\
-	hw550-3g)
-		set_usb_led "hw550-3g:green:usb"
-		;;
-	mlw221|\
-	mlwg2)
-		set_wifi_led "kingston:blue:wifi"
-		ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
-		;;
-	mofi3500-3gn)
-		set_usb_led "mofi3500-3gn:green:usb"
-		;;
-	mpr-a1)
-		set_wifi_led "hame:blue:system"
-		;;
-	mpr-a2)
-		set_wifi_led "hame:blue:system"
-		;;
-	mr-102n)
-		set_wifi_led "mr-102n:green:wlan"
-		set_usb_led "mr-102n:green:usb"
-		;;
-	mzk-w300nh2)
-		set_wifi_led "mzkw300nh2:amber:wlan"
-		;;
-	na930)
-		set_usb_led "na930:blue:status"
-		;;
-	nw718)
-		set_usb_led "nw718:amber:usb"
-		;;
-	m2m)
-		set_wifi_led "m2m:blue:wifi"
-		ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
-		;;
-	hpm)
-		ucidef_set_led_default "power" "POWER" "hpm:orange:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "hpm:green:eth" "eth0"
-		set_wifi_led "hpm:green:wifi"
-		;;
-	miniembplug)
-		set_wifi_led "miniembplug:green:wlan"
-		set_usb_led "miniembplug:green:mobile"
-		;;
-	px-4885)
-		set_wifi_led "px-4885:orange:wifi"
-		set_usb_led "px-4885:blue:storage"
-		;;
-    pbr-m1)
-        ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
-        ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
-        ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
-        ;;
-	sap-g3200u3)
-		set_usb_led "storylink:green:usb"
-		;;
-	sl-r7205)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	v11st-fe)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	vocore)
-		ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
-		set_wifi_led "vocore:green:status"
-		;;
-	w306r-v20)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	w502u)
-		set_usb_led "alfa:blue:usb"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wcr-150gn)
-		set_usb_led "wcr150gn:amber:user"
-		;;
-	hg255d)
-		set_wifi_led "hg255d:wlan"
-		set_usb_led "hg255d:usb"
-		ucidef_set_led_interface "lan" "hg255d:internet"
-		;;
-	wnce2001)
-		set_wifi_led "netgear:green:wlan"
-		;;
-	re6500)
-		ucidef_set_led_default "power" "power" "linksys:white:power" "1"
-		ucidef_set_led_default "wifi" "wifi" "linksys:orange:wifi" "1"
-		;;
-	rt-n14u)
-		ucidef_set_led_default "power" "power" "asus:blue:power" "1"
-		ucidef_set_led_netdev "lan" "lan" "asus:blue:lan" eth0.1
-		ucidef_set_led_netdev "wan" "wan" "asus:blue:wan" eth0.2
-		set_wifi_led "asus:blue:air"
-		set_usb_led "asus:blue:usb"
-		;;
-	rp-n53)
-		ucidef_set_led_netdev "eth" "Network" "asus:white:back" "eth0"
-		set_wifi_led "asus:blue:wifi"
-		;;
-	whr-300hp2 |\
-	whr-600d |\
-	whr-1166d)
-		ucidef_set_led_default "power" "power" "buffalo:green:power" "1"
-		ucidef_set_led_default "router" "router" "buffalo:green:router" "1"
-		;;
-	zbt-wa05)
-		ucidef_set_led_default "power" "power" "zbtlink:blue:power" "1"
-		set_wifi_led "zbtlink:blue:air"
-		set_usb_led "zbtlink:blue:usb"
-		;;
-	oy-0001)
-		ucidef_set_led_default "power" "power" "oy:green:power" "1"
-		set_wifi_led "oy:green:wifi"
-		;;
-	zbt-wr8305rt)
-		ucidef_set_led_default "power" "power" "zbt-wr8305rt:sys" "1"
-		set_usb_led "zbt-wr8305rt:usb"
-		set_wifi_led "zbt-wr8305rt:wifi"
-		;;
-	wt1520)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wt3020)
-		ucidef_set_led_default "power" "power" "nexx:blue:power" "0"
-		;;
-	miwifi-mini)
-		ucidef_set_led_default "power" "power" "miwifi-mini:red:status" "1"
-		;;
-	y1 |\
-	y1s)
-		ucidef_set_led_default "power" "power" "lenovo:blue:power" "1"
-		set_usb_led "lenovo:blue:usb"
-		set_wifi_led "lenovo:blue:wifi"
-		;;
-	zte-q7)
-		set_wifi_led "zte:blue:status"
-		;;
-	mzk-dp150n)
-		ucidef_set_led_default "power" "power" "mzkdp150n:green:power" "1"
-		;;
+3g150b)
+	set_usb_led "3g150b:blue:3g"
+	;;
+3g300m)
+	set_usb_led "3g300m:blue:3g"
+	;;
+3g-6200n)
+	set_wifi_led "3g-6200n:amber:wlan"
+	set_usb_led "3g-6200n:blue:3g"
+	;;
+3g-6200nl)
+	set_wifi_led "3g-6200nl:amber:wlan"
+	;;
+a5-v11)
+	ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
+	;;
+ai-br100)
+	ucidef_set_led_netdev "wan" "wan" "ai-br100:blue:wan" "eth0.2"
+	set_wifi_led "ai-br100:blue:wlan"
+	;;
+air3gii)
+	set_wifi_led "air3gii:green:wlan"
+	set_usb_led "air3gii:green:mobile"
+	;;
+all0239-3g)
+	set_usb_led "all0239-3g:green:usb"
+	;;
+all0256n)
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+ar670w|\
+ar725w|\
+awapn2403)
+	set_wifi_led "rt2800soc-phy0::radio"
+	;;
+asl26555)
+	ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
+	set_wifi_led "asl26555:green:wlan"
+	set_usb_led "asl26555:green:3g"
+	;;
+bc2)
+	set_usb_led "bc2:blue:usb"
+	;;
+br-6425)
+	set_wifi_led "br-6425:orange:wlan"
+	;;
+br-6475nd)
+	set_wifi_led "br-6475nd:amber:wlan"
+	;;
+broadway)
+	set_usb_led "broadway:red:diskmounted"
+	set_wifi_led "broadway:red:wps_active"
+	;;
+cf-wr800n)
+	ucidef_set_led_netdev "lan" "lan" "cf-wr800n:white:ethernet" eth0.1
+	set_wifi_led "cf-wr800n:white:wifi"
+	;;
+cy-swr1100)
+	ucidef_set_led_default "wps" "WPS" "cy-swr1100:blue:wps" "0"
+	set_usb_led "cy-swr1100:blue:usb"
+	;;
+d105)
+	ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
+	set_usb_led "d105:green:usb"
+	;;
+dcs-930l-b1)
+	ucidef_set_led_default "power" "POWER" "dcs-930l-b1:red:power" "1"
+	ucidef_set_led_netdev "wifi" "WiFi" "dcs-930l-b1:blue:wps"
+	;;
+dir-300-b1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-300-b1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-300-b7|\
+dir-320-b1|\
+dir-610-a1|\
+esr-9753|\
+hlk-rm04|\
+sl-r7205|\
+v11st-fe|\
+w306r-v20|\
+wt1520)
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-600-b1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-600-b1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-600-b2)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-600-b2:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-615-d)
+	ucidef_set_led_default "status" "Status LED (amber)" "dir-615-d:amber:status" "0"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-615-h1)
+	ucidef_set_led_default "status" "Status LED (amber)" "dir-615-h1:amber:status" "0"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-620-a1)
+	ucidef_set_led_default "wan" "WAN LED (amber)" "dir-620-a1:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-620-d1)
+	set_wifi_led "dir-620-d1:green:wifi"
+	;;
+dir-810l)
+	ucidef_set_led_default "power" "POWER" "dir-810l:green:power" "1"
+	;;
+f5d8235-v1)
+	set_usb_led "f5d8235-v1:blue:storage"
+	;;
+f5d8235-v2)
+	set_usb_led "f5d8235-v2:blue:storage"
+	;;
+fonera20n)
+	set_usb_led "fonera20n:orange:usb"
+	set_wifi_led "fonera20n:orange:wifi"
+	;;
+hg255d)
+	set_wifi_led "hg255d:green:wlan"
+	set_usb_led "hg255d:green:usb"
+	ucidef_set_led_interface "lan" "hg255d:green:internet"
+	;;
+hpm)
+	ucidef_set_led_default "power" "POWER" "hpm:orange:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "hpm:green:eth" "eth0"
+	set_wifi_led "hpm:green:wifi"
+	;;
+ht-tm02)
+	ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
+	set_wifi_led "ht-tm02:blue:wlan"
+	;;
+hw550-3g)
+	set_usb_led "hw550-3g:green:usb"
+	;;
+m2m)
+	set_wifi_led "m2m:blue:wifi"
+	ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
+	;;
+miniembplug)
+	set_wifi_led "miniembplug:red:wlan"
+	set_usb_led "miniembplug:green:mobile"
+	;;
+miwifi-mini)
+	ucidef_set_led_default "power" "power" "miwifi-mini:red:status" "1"
+	;;
+mlw221)
+	set_wifi_led "mlw221:blue:wifi"
+	ucidef_set_led_default "system" "system" "mlw221:blue:system" "1"
+	;;
+mlwg2)
+	set_wifi_led "mlwg2:blue:wifi"
+	ucidef_set_led_default "system" "system" "mlwg2:blue:system" "1"
+	;;
+mofi3500-3gn)
+	set_usb_led "mofi3500-3gn:green:usb"
+	;;
+mpr-a1)
+	set_wifi_led "mpr-a1:blue:system"
+	;;
+mpr-a2)
+	set_wifi_led "mpr-a2:blue:system"
+	;;
+mr-102n)
+	set_wifi_led "mr-102n:green:wlan"
+	set_usb_led "mr-102n:green:usb"
+	;;
+mzk-dp150n)
+	ucidef_set_led_default "power" "power" "mzk-dp150n:green:power" "1"
+	;;
+mzk-w300nh2)
+	set_wifi_led "mzk-w300nh2:amber:wlan"
+	;;
+na930)
+	set_usb_led "na930:blue:status"
+	;;
+nw718)
+	set_usb_led "nw718:amber:usb"
+	;;
+oy-0001)
+	ucidef_set_led_default "power" "power" "oy-0001:green:power" "1"
+	set_wifi_led "oy-0001:green:wifi"
+	;;
+pbr-m1)
+	ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
+	ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
+	ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
+	;;
+px-4885)
+	set_wifi_led "px-4885:orange:wifi"
+	set_usb_led "px-4885:blue:storage"
+	;;
+re6500)
+	ucidef_set_led_default "power" "power" "re6500:white:power" "1"
+	ucidef_set_led_default "wifi" "wifi" "re6500:orange:wifi" "1"
+	;;
+rp-n53)
+	ucidef_set_led_netdev "eth" "Network" "rp-n53:white:back" "eth0"
+	set_wifi_led "rp-n53:blue:wifi"
+	;;
+rt-n14u)
+	ucidef_set_led_default "power" "power" "rt-n14u:blue:power" "1"
+	ucidef_set_led_netdev "lan" "lan" "rt-n14u:blue:lan" eth0.1
+	ucidef_set_led_netdev "wan" "wan" "rt-n14u:blue:wan" eth0.2
+	set_wifi_led "rt-n14u:blue:air"
+	set_usb_led "rt-n14u:blue:usb"
+	;;
+sap-g3200u3)
+	set_usb_led "sap-g3200u3:green:usb"
+	;;
+vocore)
+	ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
+	set_wifi_led "vocore:green:status"
+	;;
+w502u)
+	set_usb_led "w502u:blue:usb"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+wcr-150gn)
+	set_usb_led "wcr-150gn:amber:user"
+	;;
+whr-1166d)
+	ucidef_set_led_default "power" "power" "whr-1166d:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-1166d:green:router" "1"
+	;;
+whr-300hp2)
+	ucidef_set_led_default "power" "power" "whr-300hp2:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-300hp2:green:router" "1"
+	;;
+whr-600d)
+	ucidef_set_led_default "power" "power" "whr-600d:green:power" "1"
+	ucidef_set_led_default "router" "router" "whr-600d:green:router" "1"
+	;;
+wnce2001)
+	set_wifi_led "wnce2001:green:wlan"
+	;;
+wt3020)
+	ucidef_set_led_default "power" "power" "wt3020:blue:power" "0"
+	;;
+y1)
+	ucidef_set_led_default "power" "power" "y1:blue:power" "1"
+	set_usb_led "y1:blue:usb"
+	set_wifi_led "y1:blue:wifi"
+	;;
+y1s)
+	ucidef_set_led_default "power" "power" "y1s:blue:power" "1"
+	set_usb_led "y1s:blue:usb"
+	set_wifi_led "y1s:blue:wifi"
+	;;
+zbt-wa05)
+	ucidef_set_led_default "power" "power" "zbt-wa05:blue:power" "1"
+	set_wifi_led "zbt-wa05:blue:air"
+	set_usb_led "zbt-wa05:blue:usb"
+	;;
+zbt-wr8305rt)
+	ucidef_set_led_default "power" "power" "zbt-wr8305rt:green:sys" "1"
+	set_usb_led "zbt-wr8305rt:green:usb"
+	set_wifi_led "zbt-wr8305rt:green:wifi"
+	;;
+zte-q7)
+	set_wifi_led "zte-q7:blue:status"
+	;;
 esac
 
 board_config_flush
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index b776070e06..e9b8744090 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -6,17 +6,23 @@
 
 get_status_led() {
 	case $(ramips_board_name) in
-	3g-6200n)
-		status_led="edimax:green:power"
+	3g150b)
+		status_led="3g150b:blue:ap"
+		;;
+	3g300m)
+		status_led="3g300m:blue:ap"
 		;;
-	3g150b | 3g300m | w150m)
-		status_led="tenda:blue:ap"
+	3g-6200n)
+		status_led="3g-6200n:green:power"
 		;;
 	a5-v11)
 		status_led="a5-v11:red:power"
 		;;
 	ai-br100)
-		status_led="aigale:blue:wlan"
+		status_led="ai-br100:blue:wlan"
+		;;
+	all0239-3g)
+		status_led="all0239-3g:green:status"
 		;;
 	ar670w)
 		status_led="ar670w:green:power"
@@ -24,67 +30,102 @@ get_status_led() {
 	ar725w)
 		status_led="ar725w:green:power"
 		;;
-	awapn2403)
-		status_led="asiarf:green:wps"
+	asl26555)
+		status_led="asl26555:green:power"
 		;;
 	atp-52b)
 		status_led="atp-52b:green:run"
 		;;
-	asl26555)
-		status_led="asl26555:green:power"
+	awapn2403)
+		status_led="awapn2403:green:wps"
+		;;
+	br-6425)
+		status_led="br-6425:green:power"
 		;;
-	br-6425 | br-6475nd)
-		status_led="edimax:green:power"
+	br-6475nd)
+		status_led="br-6475nd:green:power"
 		;;
 	cf-wr800n)
-		status_led="comfast:white:wps"
+		status_led="cf-wr800n:white:wps"
 		;;
 	cy-swr1100)
-		status_led="samsung:blue:wps"
+		status_led="cy-swr1100:blue:wps"
 		;;
 	d105)
 		status_led="d105:red:power"
 		;;
-	dcs-930 | dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-610-a1 | dir-615-h1 | dir-615-d | dir-620-a1| dir-620-d1| dir-300-b7| dir-320-b1)
-		status_led="d-link:green:status"
+	dap-1350)
+		status_led="dap-1350:blue:power"
+		;;
+	dcs-930)
+		status_led="dcs-930:green:status"
 		;;
 	dcs-930l-b1)
-		status_led="d-link:red:power"
+		status_led="dcs-930l-b1:red:power"
 		;;
-	dir-645)
-		status_led="d-link:green:wps"
+	dir-300-b1)
+		status_led="dir-300-b1:green:status"
 		;;
-	dap-1350)
-		status_led="d-link:blue:power"
+	dir-300-b7)
+		status_led="dir-300-b7:green:status"
+		;;
+	dir-320-b1)
+		status_led="dir-320-b1:green:status"
+		;;
+	dir-600-b1)
+		status_led="dir-600-b1:green:status"
+		;;
+	dir-600-b2)
+		status_led="dir-600-b2:green:status"
+		;;
+	dir-610-a1)
+		status_led="dir-610-a1:green:status"
+		;;
+	dir-615-d)
+		status_led="dir-615-d:green:status"
+		;;
+	dir-615-h1)
+		status_led="dir-615-h1:green:status"
+		;;
+	dir-620-a1)
+		status_led="dir-620-a1:green:status"
+		;;
+	dir-620-d1)
+		status_led="dir-620-d1:green:status"
+		;;
+	dir-645)
+		status_led="dir-645:green:wps"
 		;;
 	e1700)
-		status_led="linksys:green:power"
+		status_led="e1700:green:power"
 		;;
 	esr-9753)
 		status_led="esr-9753:orange:power"
 		;;
 	f5d8235-v2)
-		status_led="f5d8235v2:blue:router"
+		status_led="f5d8235-v2:blue:router"
+		;;
+	f7c027)
+		status_led="f7c027:orange:status"
 		;;
 	fonera20n)
 		status_led="fonera20n:green:power"
 		;;
-	ip2202)
-		status_led="ip2202:green:run"
-		;;
-	rt-n13u)
-		status_led="rt-n13u:power"
-		;;
 	hlk-rm04)
 		status_led="hlk-rm04:red:power"
 		;;
+	hpm)
+		status_led="hpm:green:status"
+		;;
 	ht-tm02)
 		status_led="ht-tm02:blue:wlan"
 		;;
-	all0239-3g|\
 	hw550-3g)
 		status_led="hw550-3g:green:status"
 		;;
+	ip2202)
+		status_led="ip2202:green:run"
+		;;
 	m2m)
 		status_led="m2m:blue:wifi"
 		;;
@@ -94,33 +135,47 @@ get_status_led() {
 	m4)
 		status_led="m4:blue:status"
 		;;
-	mlw221|\
+	miniembwifi)
+		status_led="miniembwifi:green:status"
+		;;
+	miwifi-mini)
+		status_led="miwifi-mini:red:status"
+		;;
+	mlw221)
+		status_led="mlw221:blue:system"
+		;;
 	mlwg2)
-		status_led="kingston:blue:system"
+		status_led="mlwg2:blue:system"
 		;;
 	mofi3500-3gn)
 		status_led="mofi3500-3gn:green:status"
 		;;
 	mpr-a1)
-		status_led="hame:red:power"
+		status_led="mpr-a1:red:power"
 		;;
 	mpr-a2)
-		status_led="hame:red:power"
+		status_led="mpr-a2:red:power"
 		;;
 	mr-102n)
 		status_led="mr-102n:amber:status"
 		;;
+	mzk-dp150n)
+		status_led="mzk-dp150n:green:power"
+		;;
+	mzk-w300nh2)
+		status_led="mzk-w300nh2:green:power"
+		;;
+	na930)
+		status_led="na930:blue:power"
+		;;
 	nbg-419n)
 		status_led="nbg-419n:green:power"
 		;;
 	nw718)
 		status_led="nw718:amber:cpu"
 		;;
-	miniembwifi)
-		status_led="miniembwifi:green:status"
-		;;
-	hpm)
-		status_led="hpm:green:status"
+	oy-0001)
+		status_led="oy-0001:green:wifi"
 		;;
 	pbr-m1)
 		status_led="pbr-m1:green:sys"
@@ -135,29 +190,43 @@ get_status_led() {
 		status_led="px-4885:orange:wifi"
 		;;
 	re6500)
-		status_led="linksys:orange:wifi"
+		status_led="re6500:orange:wifi"
+		;;
+	rt-n10-plus)
+		status_led="rt-n10-plus:green:wps"
+		;;
+	rt-n13u)
+		status_led="rt-n13u:blue:power"
+		;;
+	rt-n14u)
+		status_led="rt-n14u:blue:power"
 		;;
 	rt-n15)
 		status_led="rt-n15:blue:power"
 		;;
-	rt-n10-plus)
-		status_led="asus:green:wps"
-		;;
-	rt-n14u | rt-n56u | wl-330n | wl-330n3g)
-		status_led="asus:blue:power"
+	rt-n56u)
+		status_led="rt-n56u:blue:power"
 		;;
 	rut5xx)
 		status_led="rut5xx:green:status"
 		;;
 	sap-g3200u3)
-		status_led="storylink:green:usb"
+		status_led="sap-g3200u3:green:usb"
 		;;
 	sl-r7205)
-		status_led="sl-r7205:green:status"
+		status_led="sl-r7205:green:wifi"
+		;;
+	tew-691gr)
+		status_led="tew-691gr:green:wps"
 		;;
-	tew-691gr|\
 	tew-692gr)
-		status_led="trendnet:green:wps"
+		status_led="tew-692gr:green:wps"
+		;;
+	ur-326n4g)
+		status_led="ur-326n4g:green:wps"
+		;;
+	ur-336un)
+		status_led="ur-336un:green:wps"
 		;;
 	v11st-fe)
 		status_led="v11st-fe:green:status"
@@ -168,57 +237,62 @@ get_status_led() {
 	vocore)
 		status_led="vocore:green:status"
 		;;
+	w150m)
+		status_led="w150m:blue:ap"
+		;;
 	w306r-v20)
 		status_led="w306r-v20:green:sys"
 		;;
 	w502u)
-		status_led="alfa:blue:wps"
+		status_led="w502u:blue:wps"
 		;;
 	wcr-150gn)
-		status_led="wcr150gn:amber:power"
+		status_led="wcr-150gn:amber:power"
+		;;
+	whr-1166d)
+		status_led="whr-1166d:orange:wifi"
+		;;
+	whr-300hp2)
+		status_led="whr-300hp2:orange:wifi"
+		;;
+	whr-600d)
+		status_led="whr-600d:orange:wifi"
 		;;
 	whr-g300n)
 		status_led="whr-g300n:green:router"
 		;;
-	wmr-300)
-		status_led="wmr-300:green:status"
-		;;
-	wli-tx4-ag300n)
-		status_led="buffalo:blue:power"
+	wl-330n)
+		status_led="wl-330n:blue:power"
 		;;
-	wzr-agl300nh)
-		status_led="buffalo:green:router"
+	wl-330n3g)
+		status_led="wl-330n3g:blue:power"
 		;;
 	wl-351)
 		status_led="wl-351:amber:power"
 		;;
-	wr512-3gn)
-		status_led="wr512:green:wps"
-		;;
-	zbt-wr8305rt)
-		status_led="zbt-wr8305rt:sys"
+	wli-tx4-ag300n)
+		status_led="wli-tx4-ag300n:blue:power"
 		;;
-	whr-300hp2 | \
-	whr-600d | \
-	whr-1166d | \
-	wsr-600 | \
-	wsr-1166)
-		status_led="buffalo:orange:diag"
+	wmr-300)
+		status_led="wmr-300:green:status"
 		;;
 	wnce2001)
-		status_led="netgear:green:power"
+		status_led="wnce2001:green:power"
 		;;
-	wt3020)
-		status_led="nexx:blue:power"
+	wr512-3gn)
+		status_led="wr512-3gn:green:wps"
 		;;
-	mzk-w300nh2)
-		status_led="mzkw300nh2:green:power"
+	wsr-1166)
+		status_led="wsr-1166:orange:diag"
 		;;
-	ur-326n4g)
-		status_led="ur326:green:wps"
+	wsr-600)
+		status_led="wsr-600:orange:diag"
 		;;
-	ur-336un)
-		status_led="ur336:green:wps"
+	wt3020)
+		status_led="wt3020:blue:power"
+		;;
+	wzr-agl300nh)
+		status_led="wzr-agl300nh:green:router"
 		;;
 	x5)
 		status_led="x5:green:power"
@@ -229,27 +303,17 @@ get_status_led() {
 	xdxrn502j)
 		status_led="xdxrn502j:green:power"
 		;;
-	miwifi-mini)
-		status_led="miwifi-mini:red:status"
-		;;
-	f7c027)
-		status_led="belkin:orange:status"
+	y1)
+		status_led="y1:blue:power"
 		;;
-	oy-0001)
-		status_led="oy:green:wifi"
-		;;
-	na930)
-		status_led="na930:blue:power"
-		;;
-	y1 | \
 	y1s)
-		status_led="lenovo:blue:power"
+		status_led="y1s:blue:power"
 		;;
-	zte-q7)
-		status_led="zte:red:status"
+	zbt-wr8305rt)
+		status_led="zbt-wr8305rt:green:sys"
 		;;
-	mzk-dp150n)
-		status_led="mzkdp150n:green:power"
+	zte-q7)
+		status_led="zte-q7:red:status"
 		;;
 	esac
 }
diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/3G-6200N.dts
index 3a79d46dd5..5c1e588d01 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/3G-6200N.dts
@@ -69,17 +69,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "edimax:green:power";
+			label = "3g-6200n:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan {
-			label = "edimax:amber:wlan";
+			label = "3g-6200n:amber:wlan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		3g {
-			label = "edimax:blue:3g";
+			label = "3g-6200n:blue:3g";
 			gpios = <&gpio0 7 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index eb6e7d43fe..8f7d383ed1 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -69,7 +69,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "edimax:amber:wlan";
+			label = "3g-6200nl:amber:wlan";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts
index 26f4ce6bcb..a8387a45f6 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/3G150B.dts
@@ -82,12 +82,12 @@
 		compatible = "gpio-leds";
 
 		ap {
-			label = "tenda:blue:ap";
+			label = "3g150b:blue:ap";
 			gpios = <&gpio0 7 1>;
 		};
 
 		3g {
-			label = "tenda:blue:3g";
+			label = "3g150b:blue:3g";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 1f9d6f93ab..997c0817ab 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -57,32 +57,32 @@
 		compatible = "gpio-leds";
 
 		3grouter {
-			label = "tenda:blue:3grouter";
+			label = "3g300m:blue:3grouter";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "tenda:blue:ap";
+			label = "3g300m:blue:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wisprouter {
-			label = "tenda:blue:wisprouter";
+			label = "3g300m:blue:wisprouter";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wirelessrouter {
-			label = "tenda:blue:wirelessrouter";
+			label = "3g300m:blue:wirelessrouter";
 			gpios = <&gpio0 13 1>;
 		};
 
 		3g {
-			label = "tenda:blue:3g";
+			label = "3g300m:blue:3g";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wpsreset {
-			label = "tenda:blue:wpsreset";
+			label = "3g300m:blue:wpsreset";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts
index 90195b6af8..f3932aec5d 100644
--- a/target/linux/ramips/dts/AI-BR100.dts
+++ b/target/linux/ramips/dts/AI-BR100.dts
@@ -84,12 +84,12 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "aigale:blue:wan";
+			label = "ai-br100:blue:wan";
 			gpios = <&gpio2 4 1>;
 		};
 
 		wlan {
-			label = "aigale:blue:wlan";
+			label = "ai-br100:blue:wlan";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index 434b10b2ce..40d3228615 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -73,12 +73,12 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "airlive:green:wlan";
+			label = "air3gii:green:wlan";
 			gpios = <&gpio0 8 0>;
 		};
 
 		mobile {
-			label = "airlive:green:mobile";
+			label = "air3gii:green:mobile";
 			gpios = <&gpio0 9 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ALL0239-3G.dts b/target/linux/ramips/dts/ALL0239-3G.dts
index ac8a4e9ec6..d75bb2ce40 100644
--- a/target/linux/ramips/dts/ALL0239-3G.dts
+++ b/target/linux/ramips/dts/ALL0239-3G.dts
@@ -64,22 +64,22 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "hw550-3g:green:usb";
+			label = "all0239-3g:green:usb";
 			gpios = <&gpio0 8 1>;
 		};
 
 		3g {
-			label = "hw550-3g:green:3g";
+			label = "all0239-3g:green:3g";
 			gpios = <&gpio0 11 1>;
 		};
 
 		status {
-			label = "hw550-3g:green:status";
+			label = "all0239-3g:green:status";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "hw550-3g:green:wps";
+			label = "all0239-3g:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts
index 06f892be33..7717f02f6f 100644
--- a/target/linux/ramips/dts/ALL5002.dts
+++ b/target/linux/ramips/dts/ALL5002.dts
@@ -99,12 +99,12 @@
 		compatible = "gpio-leds";
 
 		ld1 {
-			label = "allnet:green:ld1";
+			label = "all5002:green:ld1";
 			gpios = <&pcf0 0 1>;
 		};
 
 		ld2 {
-			label = "allnet:green:ld2";
+			label = "all5002:green:ld2";
 			gpios = <&pcf0 1 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts
index d14b1f972d..c2561452e8 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/ALL5003.dts
@@ -99,12 +99,12 @@
 		compatible = "gpio-leds";
 
 		ld1 {
-			label = "allnet:green:ld1";
+			label = "all5003:green:ld1";
 			gpios = <&pcf0 0 1>;
 		};
 
 		ld2 {
-			label = "allnet:green:ld2";
+			label = "all5003:green:ld2";
 			gpios = <&pcf0 1 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts
index 754f9f7ecb..b0f81b0dee 100644
--- a/target/linux/ramips/dts/AWAPN2403.dts
+++ b/target/linux/ramips/dts/AWAPN2403.dts
@@ -65,7 +65,7 @@
 		compatible = "gpio-leds";
 
 		link {
-			label = "asiarf:green:wps";
+			label = "awapn2403:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/AWM002.dtsi b/target/linux/ramips/dts/AWM002.dtsi
index ce45bd3283..1906e6e831 100644
--- a/target/linux/ramips/dts/AWM002.dtsi
+++ b/target/linux/ramips/dts/AWM002.dtsi
@@ -65,12 +65,12 @@
 		compatible = "gpio-leds";
 
 		ld1 {
-			label = "asiarf:green:ld1";
+			label = "awm002:green:ld1";
 			gpios = <&gpio0 0 1>;
 		};
 
 		ld2 {
-			label = "asiarf:green:ld2";
+			label = "awm002:green:ld2";
 			gpios = <&gpio0 1 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts
index 02de20dcc3..4f3ff1be26 100644
--- a/target/linux/ramips/dts/AWM003-EVB.dts
+++ b/target/linux/ramips/dts/AWM003-EVB.dts
@@ -32,17 +32,17 @@
 		compatible = "gpio-leds";
 
 		tx {
-			label = "awm002-evb:green:tx";
+			label = "awm003-evb:green:tx";
 			gpios = <&gpio0 15 1>;
 		};
 
 		rx {
-			label = "awm002-evb:green:rx";
+			label = "awm003-evb:green:rx";
 			gpios = <&gpio0 16 1>;
 		};
 
 		wps {
-			label = "awm002-evb:green:wps";
+			label = "awm003-evb:green:wps";
 			gpios = <&gpio0 21 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/BR-6425.dts b/target/linux/ramips/dts/BR-6425.dts
index 2d62615e65..cb2c89b44d 100644
--- a/target/linux/ramips/dts/BR-6425.dts
+++ b/target/linux/ramips/dts/BR-6425.dts
@@ -40,12 +40,12 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "edimax:green:power";
+			label = "br-6425:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan {
-			label = "edimax:orange:wlan";
+			label = "br-6425:orange:wlan";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index ce8bd61efb..8c8a980256 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -150,17 +150,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "edimax:green:power";
+			label = "br-6475nd:green:power";
 			gpios = <&gpio0 10 1>;
 		};
 
 		wlan {
-			label = "edimax:amber:wlan";
+			label = "br-6475nd:amber:wlan";
 			gpios = <&gpio0 11 1>;
 		};
 
 		wlan_5ghz {
-			label = "edimax:amber:wlan_5ghz";
+			label = "br-6475nd:amber:wlan_5ghz";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/BROADWAY.dts
index 34696ad9ad..95c245d66b 100644
--- a/target/linux/ramips/dts/BROADWAY.dts
+++ b/target/linux/ramips/dts/BROADWAY.dts
@@ -63,12 +63,12 @@
 		compatible = "gpio-leds";
 
 		diskmounted {
-			label = "red:diskmounted";
+			label = "broadway:red:diskmounted";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps_active {
-			label = "red:wps_active";
+			label = "broadway:red:wps_active";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts
index beb2805237..2ee16dfbc4 100644
--- a/target/linux/ramips/dts/CF-WR800N.dts
+++ b/target/linux/ramips/dts/CF-WR800N.dts
@@ -85,17 +85,17 @@
 		compatible = "gpio-leds";
 
 		ethernet {
-			label = "comfast:white:ethernet";
+			label = "cf-wr800n:white:ethernet";
 			gpios = <&gpio2 4 1>;
 		};
 
 		wifi {
-			label = "comfast:white:wifi";
+			label = "cf-wr800n:white:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wps {
-			label = "comfast:white:wps";
+			label = "cf-wr800n:white:wps";
 			gpios = <&gpio1 15 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index acccfdbc62..cec84ac701 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -140,12 +140,12 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "samsung:blue:wps";
+			label = "cy-swr1100:blue:wps";
 			gpios = <&gpio0 0 1>;
 		};
 
 		usb {
-			label = "samsung:blue:usb";
+			label = "cy-swr1100:blue:usb";
 			gpios = <&gpio1 1 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index ae36baf6f9..ce529459f8 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -73,17 +73,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "d-link:blue:power";
+			label = "dap-1350:blue:power";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
-			label = "d-link:red:power";
+			label = "dap-1350:red:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dap-1350:blue:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index d544d21087..3c89f84dd6 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -61,17 +61,17 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "d-link:red:alert";
+			label = "dcs-930:red:alert";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power {
-			label = "d-link:green:status";
+			label = "dcs-930:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dcs-930:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/DCS-930L-B1.dts
index 7b54d8cbc7..525707c3ad 100644
--- a/target/linux/ramips/dts/DCS-930L-B1.dts
+++ b/target/linux/ramips/dts/DCS-930L-B1.dts
@@ -77,12 +77,12 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "d-link:red:power";
+			label = "dcs-930l-b1:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dcs-930l-b1:blue:wps";
 			gpios = <&gpio0 19 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index e1962d5468..6d19f651d8 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -82,27 +82,27 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-300-b1:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-300-b1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-300-b1:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-300-b1:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-300-b1:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts
index c143d6e41d..30c259608c 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/DIR-300-B7.dts
@@ -66,12 +66,12 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:green:status";
+			label = "dir-300-b7:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-300-b7:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts
index 958fdeeb7b..c1e583264c 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/DIR-320-B1.dts
@@ -70,17 +70,17 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:green:status";
+			label = "dir-320-b1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		usb {
-			label = "d-link:green:usb";
+			label = "dir-320-b1:green:usb";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wps {
-			label = "d-link:green:wps";
+			label = "dir-320-b1:green:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts
index 7201532375..5020b78a06 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -82,27 +82,27 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-600-b1:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-600-b1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-600-b1:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-600-b1:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-600-b1:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-600-B2.dts b/target/linux/ramips/dts/DIR-600-B2.dts
index 0f05ad7fd9..d06b85307f 100644
--- a/target/linux/ramips/dts/DIR-600-B2.dts
+++ b/target/linux/ramips/dts/DIR-600-B2.dts
@@ -78,27 +78,27 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-600-b2:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-600-b2:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-600-b2:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-600-b2:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-600-b2:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts
index cd7b19d457..9ec987051e 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -73,12 +73,12 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:green:status";
+			label = "dir-610-a1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
-			label = "d-link:green:wps";
+			label = "dir-610-a1:green:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts
index d95c077fa2..a57ea6d34f 100644
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/DIR-615-D.dts
@@ -78,27 +78,27 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-615-d:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-615-d:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-615-d:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-615-d:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-615-d:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts
index e76d6ee4eb..f9bdc92943 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/DIR-615-H1.dts
@@ -79,27 +79,27 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-615-h1:amber:status";
 			gpios = <&gpio0 7 0>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-615-h1:green:status";
 			gpios = <&gpio0 9 0>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-615-h1:amber:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-615-h1:green:wan";
 			gpios = <&gpio0 13 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-615-h1:blue:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-620-A1.dts b/target/linux/ramips/dts/DIR-620-A1.dts
index 1655982afc..212cf881b7 100644
--- a/target/linux/ramips/dts/DIR-620-A1.dts
+++ b/target/linux/ramips/dts/DIR-620-A1.dts
@@ -82,32 +82,32 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:amber:status";
+			label = "dir-620-a1:amber:status";
 			gpios = <&gpio0 8 1>;
 		};
 
 		status2 {
-			label = "d-link:green:status";
+			label = "dir-620-a1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wan {
-			label = "d-link:amber:wan";
+			label = "dir-620-a1:amber:wan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wan2 {
-			label = "d-link:green:wan";
+			label = "dir-620-a1:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "dir-620-a1:blue:wps";
 			gpios = <&gpio0 13 0>;
 		};
 
 		wps2 {
-			label = "d-link:amber:wps";
+			label = "dir-620-a1:amber:wps";
 			gpios = <&gpio0 11 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts
index 8a5b057b23..166d61ed0d 100644
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -79,12 +79,12 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "d-link:green:status";
+			label = "dir-620-d1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi {
-			label = "d-link:green:wifi";
+			label = "dir-620-d1:green:wifi";
 			gpios = <&gpio0 17 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index ab83901f17..58a078811b 100644
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -119,12 +119,12 @@
 		compatible = "gpio-leds";
 
 		inet {
-			label = "d-link:green:inet";
+			label = "dir-645:green:inet";
 			gpios = <&gpio0 0 1>;
 		};
 
 		wps {
-			label = "d-link:green:wps";
+			label = "dir-645:green:wps";
 			gpios = <&gpio1 2 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts
index ae74500fc6..4f0078710a 100644
--- a/target/linux/ramips/dts/DIR-810L.dts
+++ b/target/linux/ramips/dts/DIR-810L.dts
@@ -119,17 +119,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "d-link:green:power";
+			label = "dir-810l:green:power";
 			gpios = <&gpio0 9 0>;
 		};
 
 		wan {
-			label = "d-link:orange:wan";
+			label = "dir-810l:orange:wan";
 			gpios = <&gpio0 12 0>;
 		};
 
 		status {
-			label = "d-link:orange:power";
+			label = "dir-810l:orange:power";
 			gpios = <&gpio0 13 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index 7689b17574..832b715b9f 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -142,12 +142,12 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "linksys:green:power";
+			label = "e1700:green:power";
 			gpios = <&gpio0 10 1>;
 		};
 
 		wan {
-			label = "linksys:green:wps";
+			label = "e1700:green:wps";
 			gpios = <&gpio0 12 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts
index 45f7d69338..d0a49f60e2 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/F5D8235_V2.dts
@@ -71,47 +71,47 @@
 		compatible = "gpio-leds";
 
 		internet {
-			label = "f5d8235v2:blue:internet";
+			label = "f5d8235-v2:blue:internet";
 			gpios = <&gpio0 5 1>;
 		};
 
 		internet2 {
-			label = "f5d8235v2:amber:internet";
+			label = "f5d8235-v2:amber:internet";
 			gpios = <&gpio0 6 1>;
 		};
 
 		modem {
-			label = "f5d8235v2:blue:modem";
+			label = "f5d8235-v2:blue:modem";
 			gpios = <&gpio0 11 1>;
 		};
 
 		modem2 {
-			label = "f5d8235v2:amber:modem";
+			label = "f5d8235-v2:amber:modem";
 			gpios = <&gpio0 8 1>;
 		};
 
 		router {
-			label = "f5d8235v2:blue:router";
+			label = "f5d8235-v2:blue:router";
 			gpios = <&gpio0 9 1>;
 		};
 
 		storage {
-			label = "f5d8235v2:blue:storage";
+			label = "f5d8235-v2:blue:storage";
 			gpios = <&gpio0 23 1>;
 		};
 
 		storage2 {
-			label = "f5d8235v2:amber:storage";
+			label = "f5d8235-v2:amber:storage";
 			gpios = <&gpio0 22 1>;
 		};
 
 		security {
-			label = "f5d8235v2:blue:security";
+			label = "f5d8235-v2:blue:security";
 			gpios = <&gpio0 13 1>;
 		};
 
 		security2 {
-			label = "f5d8235v2:amber:security";
+			label = "f5d8235-v2:amber:security";
 			gpios = <&gpio0 12 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts
index 874d606bdc..89e93568fa 100644
--- a/target/linux/ramips/dts/F7C027.dts
+++ b/target/linux/ramips/dts/F7C027.dts
@@ -86,22 +86,22 @@
 		compatible = "gpio-leds";
 
 		status {
-			label = "belkin:blue:status";
+			label = "f7c027:blue:status";
 			gpios = <&gpio0 7 1>;
 		};
 
 		power {
-			label = "belkin:blue:power";
+			label = "f7c027:blue:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		orange {
-			label = "belkin:orange:status";
+			label = "f7c027:orange:status";
 			gpios = <&gpio0 11 1>;
 		};
 
 		relay {
-			label = "belkin:device:relay";
+			label = "f7c027:device:relay";
 			gpios = <&gpio0 13 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts
index 1febfb57c9..a6a7402774 100644
--- a/target/linux/ramips/dts/FREESTATION5.dts
+++ b/target/linux/ramips/dts/FREESTATION5.dts
@@ -85,17 +85,17 @@
 		// The following leds are defined in the ArcOS firmware, but reportedly
 		// not present in the Freestation5 device.
 		wifi {
-			label = "freestation:unknown:wifi";
+			label = "freestation5:unknown:wifi";
 			gpios = <&gpio0 7 1>;
 		};
 
 		powerg {
-			label = "freestation:unknown:powerg";
+			label = "freestation5:unknown:powerg";
 			gpios = <&gpio0 9 1>;
 		};
 
 		usb {
-			label = "freestation:unknown:usb";
+			label = "freestation5:unknown:usb";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/HG255D.dts
index 2aa3cc923f..4fbe3e62ec 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/HG255D.dts
@@ -57,32 +57,32 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "hg255d:power";
+			label = "hg255d:green:power";
 			gpios = <&gpio0 8 1>;
 		};
 
 		internet {
-			label = "hg255d:internet";
+			label = "hg255d:green:internet";
 			gpios = <&gpio0 13 1>;
 		};
 
 		wifi {
-			label = "hg255d:wlan";
+			label = "hg255d:green:wlan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		usb {
-			label = "hg255d:usb";
+			label = "hg255d:green:usb";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
-			label = "hg255d:wps";
+			label = "hg255d:green:wps";
 			gpios = <&gpio0 12 1>;
 		};
 
 		voice {
-			label = "hg255d:voice";
+			label = "hg255d:green:voice";
 			gpios = <&gpio0 5 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index 1c41f6c2eb..12bc8c0149 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -91,12 +91,12 @@
 		compatible = "gpio-leds";
 
 		system {
-			label = "kingston:blue:system";
+			label = "mlw221:blue:system";
 			gpios = <&gpio2 3 1>;
 		};
 
 		wifi {
-			label = "kingston:blue:wifi";
+			label = "mlw221:blue:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts
index c1b5276888..c417bff2c8 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/MLWG2.dts
@@ -91,12 +91,12 @@
 		compatible = "gpio-leds";
 
 		system {
-			label = "kingston:blue:system";
+			label = "mlwg2:blue:system";
 			gpios = <&gpio2 3 1>;
 		};
 
 		wifi {
-			label = "kingston:blue:wifi";
+			label = "mlwg2:blue:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts
index 1389b80744..8a7d684bde 100644
--- a/target/linux/ramips/dts/MPRA1.dts
+++ b/target/linux/ramips/dts/MPRA1.dts
@@ -81,12 +81,12 @@
 		compatible = "gpio-leds";
 
 		system {
-			label = "hame:blue:system";
+			label = "mpr-a1:blue:system";
 			gpios = <&gpio0 20 1>;
 		};
 
 		power {
-			label = "hame:red:power";
+			label = "mpr-a1:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index 849e911b48..4b8fd29d04 100644
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -77,12 +77,12 @@
 		compatible = "gpio-leds";
 
 		system {
-			label = "hame:blue:system";
+			label = "mpr-a2:blue:system";
 			gpios = <&gpio0 20 1>;
 		};
 
 		power {
-			label = "hame:red:power";
+			label = "mpr-a2:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/MZK-750DHP.dts
index 250287486f..bdf3f8f13d 100644
--- a/target/linux/ramips/dts/MZK-750DHP.dts
+++ b/target/linux/ramips/dts/MZK-750DHP.dts
@@ -80,12 +80,12 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "mzk750:green:wps";
+			label = "mzk-750dhp:green:wps";
 			gpios = <&gpio1 11 1>;
 		};
 
 		power {
-			label = "mzk750:green:power";
+			label = "mzk-750dhp:green:power";
 			gpios = <&gpio1 15 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/MZK-DP150N.dts
index 4b7b925c4a..893807cfd9 100644
--- a/target/linux/ramips/dts/MZK-DP150N.dts
+++ b/target/linux/ramips/dts/MZK-DP150N.dts
@@ -80,7 +80,7 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "mzkdp150n:green:power";
+			label = "mzk-dp150n:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts
index 7195253ffb..06cc292023 100644
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/MZK-W300NH2.dts
@@ -69,17 +69,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "mzkw300nh2:green:power";
+			label = "mzk-w300nh2:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan {
-			label = "mzkw300nh2:amber:wlan";
+			label = "mzk-w300nh2:amber:wlan";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wps {
-			label = "mzkw300nh2:amber:wps";
+			label = "mzk-w300nh2:amber:wps";
 			gpios = <&gpio0 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts
index b008afd1d7..36c783bbee 100644
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/OY-0001.dts
@@ -84,12 +84,12 @@
 		compatible = "gpio-leds";
 
 		powerled {
-			label = "oy:green:power";
+			label = "oy-0001:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifiled {
-			label = "oy:green:wifi";
+			label = "oy-0001:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index 89029bfda0..b65ade400e 100644
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -88,12 +88,12 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "linksys:orange:wifi";
+			label = "re6500:orange:wifi";
 			gpios = <&gpio0 0 1>;
 		};
 
 		power {
-			label = "linksys:white:power";
+			label = "re6500:white:power";
 			gpios = <&gpio0 9 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RP-N53.dts b/target/linux/ramips/dts/RP-N53.dts
index 80ece00074..2287a8c66a 100644
--- a/target/linux/ramips/dts/RP-N53.dts
+++ b/target/linux/ramips/dts/RP-N53.dts
@@ -120,42 +120,42 @@
 		compatible = "gpio-leds";
 
 		backlight {
-			label = "asus:white:back";
+			label = "rp-n53:white:back";
 			gpios = <&gpio1 4 1>;
 		};
 
 		wifi0 {
-			label = "asus:blue:5g3";
+			label = "rp-n53:blue:5g3";
 			gpios = <&gpio1 5 1>;
 		};
 
 		wifi1 {
-			label = "asus:blue:5g2";
+			label = "rp-n53:blue:5g2";
 			gpios = <&gpio1 6 1>;
 		};
 
 		wifi2 {
-			label = "asus:blue:5g1";
+			label = "rp-n53:blue:5g1";
 			gpios = <&gpio1 7 1>;
 		};
 
 		wifi3 {
-			label = "asus:blue:wifi";
+			label = "rp-n53:blue:wifi";
 			gpios = <&gpio1 8 1>;
 		};
 
 		wifi4 {
-			label = "asus:blue:2g1";
+			label = "rp-n53:blue:2g1";
 			gpios = <&gpio1 9 1>;
 		};
 
 		wifi5 {
-			label = "asus:blue:2g2";
+			label = "rp-n53:blue:2g2";
 			gpios = <&gpio1 10 1>;
 		};
 
 		wifi6 {
-			label = "asus:blue:2g3";
+			label = "rp-n53:blue:2g3";
 			gpios = <&gpio1 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/RT-N10-PLUS.dts
index 7bbd221f40..edbd92b59d 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N10-PLUS.dts
@@ -54,7 +54,7 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "asus:green:wps";
+			label = "rt-n10-plus:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/RT-N13U.dts
index 4e1737ef2b..7e0fbd2f90 100644
--- a/target/linux/ramips/dts/RT-N13U.dts
+++ b/target/linux/ramips/dts/RT-N13U.dts
@@ -51,12 +51,12 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "rt-n13u:power";
+			label = "rt-n13u:blue:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
-			label = "rt-n13u:wifi";
+			label = "rt-n13u:blue:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts
index cd46bdf574..6d1080ba01 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/RT-N14U.dts
@@ -83,27 +83,27 @@
 		compatible = "gpio-leds";
 
 		wan {
-			label = "asus:blue:wan";
+			label = "rt-n14u:blue:wan";
 			gpios = <&gpio2 0 1>;
 		};
 
 		lan {
-			label = "asus:blue:lan";
+			label = "rt-n14u:blue:lan";
 			gpios = <&gpio2 1 1>;
 		};
 
 		usb {
-			label = "asus:blue:usb";
+			label = "rt-n14u:blue:usb";
 			gpios = <&gpio2 2 1>;
 		};
 
 		power {
-			label = "asus:blue:power";
+			label = "rt-n14u:blue:power";
 			gpios = <&gpio2 3 1>;
 		};
 
 		air {
-			label = "asus:blue:air";
+			label = "rt-n14u:blue:air";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index 3ecd1b7f73..8ea4970e46 100644
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -129,22 +129,22 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "asus:blue:power";
+			label = "rt-n56u:blue:power";
 			gpios = <&gpio0 0 1>;
 		};
 
 		lan {
-			label = "asus:blue:lan";
+			label = "rt-n56u:blue:lan";
 			gpios = <&gpio0 19 1>;
 		};
 
 		wan {
-			label = "asus:blue:wan";
+			label = "rt-n56u:blue:wan";
 			gpios = <&gpio1 3 1>;
 		};
 
 		usb {
-			label = "asus:blue:usb";
+			label = "rt-n56u:blue:usb";
 			gpios = <&gpio1 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index d273559616..e2798fb346 100644
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -89,7 +89,7 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "storylink:green:usb";
+			label = "sap-g3200u3:green:usb";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts
index b56ff9fb7e..5bd6444f87 100644
--- a/target/linux/ramips/dts/TEW-691GR.dts
+++ b/target/linux/ramips/dts/TEW-691GR.dts
@@ -102,7 +102,7 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "trendnet:green:wps";
+			label = "tew-691gr:green:wps";
 			gpios = <&gpio0 9 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts
index d537e29906..17835f616e 100644
--- a/target/linux/ramips/dts/TEW-692GR.dts
+++ b/target/linux/ramips/dts/TEW-692GR.dts
@@ -116,12 +116,12 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "trendnet:orange:wps";
+			label = "tew-692gr:orange:wps";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps2 {
-			label = "trendnet:green:wps";
+			label = "tew-692gr:green:wps";
 			gpios = <&gpio1 4 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts
index 92a7a57a62..3eb2526546 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/UR-326N4G.dts
@@ -63,27 +63,27 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "ur326:green:3g";
+			label = "ur-326n4g:green:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		gateway {
-			label = "ur326:green:gateway";
+			label = "ur-326n4g:green:gateway";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "ur326:green:ap";
+			label = "ur-326n4g:green:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "ur326:green:wps";
+			label = "ur-326n4g:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 
 		station {
-			label = "ur326:green:station";
+			label = "ur-326n4g:green:station";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts
index a6ef6cdc7e..76f669a04f 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/UR-336UN.dts
@@ -42,27 +42,27 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "ur336:green:3g";
+			label = "ur-336un:green:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		gateway {
-			label = "ur336:green:gateway";
+			label = "ur-336un:green:gateway";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "ur336:green:ap";
+			label = "ur-336un:green:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "ur336:green:wps";
+			label = "ur-336un:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 
 		station {
-			label = "ur336:green:station";
+			label = "ur-336un:green:station";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/W150M.dts
index 2309df6034..875c4687af 100644
--- a/target/linux/ramips/dts/W150M.dts
+++ b/target/linux/ramips/dts/W150M.dts
@@ -51,32 +51,32 @@
 		compatible = "gpio-leds";
 
 		3grouter {
-			label = "tenda:blue:3grouter";
+			label = "w150m:blue:3grouter";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "tenda:blue:ap";
+			label = "w150m:blue:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wisprouter {
-			label = "tenda:blue:wisprouter";
+			label = "w150m:blue:wisprouter";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wirelessrouter {
-			label = "tenda:blue:wirelessrouter";
+			label = "w150m:blue:wirelessrouter";
 			gpios = <&gpio0 13 1>;
 		};
 
 		3g {
-			label = "tenda:blue:3g";
+			label = "w150m:blue:3g";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wpsreset {
-			label = "tenda:blue:wpsreset";
+			label = "w150m:blue:wpsreset";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts
index 8afe74196f..0f423bacae 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -67,12 +67,12 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "alfa:blue:usb";
+			label = "w502u:blue:usb";
 			gpios = <&gpio0 13 1>;
 		};
 
 		wps {
-			label = "alfa:blue:wps";
+			label = "w502u:blue:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index 66bf90149f..e197bb94d0 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -51,12 +51,12 @@
 		compatible = "gpio-leds";
 
 		user {
-			label = "wcr150gn:amber:user";
+			label = "wcr-150gn:amber:user";
 			gpios = <&gpio0 12 1>;
 		};
 
 		power {
-			label = "wcr150gn:amber:power";
+			label = "wcr-150gn:amber:power";
 			gpios = <&gpio0 8 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index 756d1805d9..69b8641276 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -102,37 +102,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "buffalo:red:power";
+			label = "whr-1166d:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
-			label = "buffalo:green:wifi";
+			label = "whr-1166d:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
-			label = "buffalo:green:power";
+			label = "whr-1166d:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
-			label = "buffalo:orange:wifi";
+			label = "whr-1166d:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
-			label = "buffalo:green:internet";
+			label = "whr-1166d:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
-			label = "buffalo:orange:router";
+			label = "whr-1166d:orange:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
-			label = "buffalo:green:router";
+			label = "whr-1166d:green:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index 83bc407452..5916715752 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -80,37 +80,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "buffalo:red:power";
+			label = "whr-300hp2:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
-			label = "buffalo:green:wifi";
+			label = "whr-300hp2:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
-			label = "buffalo:green:power";
+			label = "whr-300hp2:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
-			label = "buffalo:orange:wifi";
+			label = "whr-300hp2:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
-			label = "buffalo:green:internet";
+			label = "whr-300hp2:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
-			label = "buffalo:green:router";
+			label = "whr-300hp2:green:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
-			label = "buffalo:orange:router";
+			label = "whr-300hp2:orange:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index 5e06060422..8e20859617 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -80,37 +80,37 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "buffalo:red:power";
+			label = "whr-600d:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
-			label = "buffalo:green:wifi";
+			label = "whr-600d:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
-			label = "buffalo:green:power";
+			label = "whr-600d:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
-			label = "buffalo:orange:wifi";
+			label = "whr-600d:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
-			label = "buffalo:green:internet";
+			label = "whr-600d:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
-			label = "buffalo:green:router";
+			label = "whr-600d:green:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
-			label = "buffalo:orange:router";
+			label = "whr-600d:orange:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/WL-330N.dts
index 0e7c027b70..a7238dceca 100644
--- a/target/linux/ramips/dts/WL-330N.dts
+++ b/target/linux/ramips/dts/WL-330N.dts
@@ -69,12 +69,12 @@
 		compatible = "gpio-leds";
 
 		link {
-			label = "asus:blue:link";
+			label = "wl-330n:blue:link";
 			gpios = <&gpio0 9 1>;
 		};
 
 		power {
-			label = "asus:blue:power";
+			label = "wl-330n:blue:power";
 			gpios = <&gpio0 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts
index 12a24b5692..c02f6a907f 100644
--- a/target/linux/ramips/dts/WL-330N3G.dts
+++ b/target/linux/ramips/dts/WL-330N3G.dts
@@ -69,17 +69,17 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "asus:blue:3g";
+			label = "wl-330n3g:blue:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		3g2 {
-			label = "asus:red:3g";
+			label = "wl-330n3g:red:3g";
 			gpios = <&gpio0 13 1>;
 		};
 
 		power {
-			label = "asus:blue:power";
+			label = "wl-330n3g:blue:power";
 			gpios = <&gpio0 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
index e7e8e4a395..3a456b8418 100644
--- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts
+++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
@@ -88,17 +88,17 @@
 		compatible = "gpio-leds";
 
 		diag {
-			label = "buffalo:red:diag";
+			label = "wli-tx4-ag300n:red:diag";
 			gpios = <&gpio0 10 1>;
 		};
 
 		power {
-			label = "buffalo:blue:power";
+			label = "wli-tx4-ag300n:blue:power";
 			gpios = <&gpio0 12 1>;
 		};
 
 		security {
-			label = "buffalo:blue:security";
+			label = "wli-tx4-ag300n:blue:security";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts
index bd0d596d6a..36eb473d5c 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/WNCE2001.dts
@@ -86,22 +86,22 @@
 		compatible = "gpio-leds";
 
 		power-green {
-			label = "netgear:green:power";
+			label = "wnce2001:green:power";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power-red {
-			label = "netgear:red:power";
+			label = "wnce2001:red:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan-green {
-			label = "netgear:green:wlan";
+			label = "wnce2001:green:wlan";
 			gpios = <&gpio0 12 0>;
 		};
 
 		wlan-red {
-			label = "netgear:red:wlan";
+			label = "wnce2001:red:wlan";
 			gpios = <&gpio0 13 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts
index f5c1319f30..def7751024 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-4M.dts
@@ -59,27 +59,27 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "wr512:green:3g";
+			label = "wr512-3gn:green:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		gateway {
-			label = "wr512:green:gateway";
+			label = "wr512-3gn:green:gateway";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "wr512:green:ap";
+			label = "wr512-3gn:green:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "wr512:green:wps";
+			label = "wr512-3gn:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 
 		station {
-			label = "wr512:green:station";
+			label = "wr512-3gn:green:station";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/WR512-3GN-8M.dts
index d0cc0efb63..b439f0a78d 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-8M.dts
@@ -59,27 +59,27 @@
 		compatible = "gpio-leds";
 
 		3g {
-			label = "wr512:green:3g";
+			label = "wr512-3gn:green:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		gateway {
-			label = "wr512:green:gateway";
+			label = "wr512-3gn:green:gateway";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
-			label = "wr512:green:ap";
+			label = "wr512-3gn:green:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wps {
-			label = "wr512:green:wps";
+			label = "wr512-3gn:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 
 		station {
-			label = "wr512:green:station";
+			label = "wr512-3gn:green:station";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index dd075dbf17..2dc59cc281 100644
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -71,42 +71,42 @@
 		compatible = "gpio-leds";
 
 		internet_g {
-			label = "buffalo:green:internet";
+			label = "wsr-1166:green:internet";
 			gpios = <&gpio1 9 1>;
 		};
 
 		router_g {
-			label = "buffalo:green:router";
+			label = "wsr-1166:green:router";
 			gpios = <&gpio1 10 1>;
 		};
 
 		router_o {
-			label = "buffalo:orange:router";
+			label = "wsr-1166:orange:router";
 			gpios = <&gpio1 11 1>;
 		};
 
 		internet_o {
-			label = "buffalo:orange:internet";
+			label = "wsr-1166:orange:internet";
 			gpios = <&gpio1 12 1>;
 		};
 
 		wifi_o {
-			label = "buffalo:orange:wifi";
+			label = "wsr-1166:orange:wifi";
 			gpios = <&gpio1 13 1>;
 		};
 
 		power {
-			label = "buffalo:green:power";
+			label = "wsr-1166:green:power";
 			gpios = <&gpio1 14 1>;
 		};
 
 		diag {
-			label = "buffalo:orange:diag";
+			label = "wsr-1166:orange:diag";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wifi_g {
-			label = "buffalo:green:wifi";
+			label = "wsr-1166:green:wifi";
 			gpios = <&gpio1 16 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index 7b4fd74e80..5eb813f002 100644
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -66,42 +66,42 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "buffalo:green:power";
+			label = "wsr-600:green:power";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wifi_o {
-			label = "buffalo:orange:wifi";
+			label = "wsr-600:orange:wifi";
 			gpios = <&gpio1 9 1>;
 		};
 
 		diag {
-			label = "buffalo:orange:diag";
+			label = "wsr-600:orange:diag";
 			gpios = <&gpio1 10 1>;
 		};
 
 		wifi_g {
-			label = "buffalo:green:wifi";
+			label = "wsr-600:green:wifi";
 			gpios = <&gpio1 12 1>;
 		};
 
 		router_o {
-			label = "buffalo:orange:router";
+			label = "wsr-600:orange:router";
 			gpios = <&gpio1 13 1>;
 		};
 
 		router_g {
-			label = "buffalo:green:router";
+			label = "wsr-600:green:router";
 			gpios = <&gpio1 14 1>;
 		};
 
 		internet_o {
-			label = "buffalo:orange:internet";
+			label = "wsr-600:orange:internet";
 			gpios = <&gpio1 15 1>;
 		};
 
 		internet_g {
-			label = "buffalo:green:internet";
+			label = "wsr-600:green:internet";
 			gpios = <&gpio1 16 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WT3020-4M.dts b/target/linux/ramips/dts/WT3020-4M.dts
index 4295939cf5..6670a1cc6e 100644
--- a/target/linux/ramips/dts/WT3020-4M.dts
+++ b/target/linux/ramips/dts/WT3020-4M.dts
@@ -95,7 +95,7 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "nexx:blue:power";
+			label = "wt3020:blue:power";
 			gpios = <&gpio3 0 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WT3020-8M.dts b/target/linux/ramips/dts/WT3020-8M.dts
index 122499d608..3abd8fef65 100644
--- a/target/linux/ramips/dts/WT3020-8M.dts
+++ b/target/linux/ramips/dts/WT3020-8M.dts
@@ -95,7 +95,7 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "nexx:blue:power";
+			label = "wt3020:blue:power";
 			gpios = <&gpio3 0 0>;
 		};
 	};
diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/WZR-AGL300NH.dts
index 5d6c25d2cf..98b50babd7 100644
--- a/target/linux/ramips/dts/WZR-AGL300NH.dts
+++ b/target/linux/ramips/dts/WZR-AGL300NH.dts
@@ -112,22 +112,22 @@
 		compatible = "gpio-leds";
 
 		router {
-			label = "buffalo:green:router";
+			label = "wzr-agl300nh:green:router";
 			gpios = <&gpio0 8 1>;
 		};
 
 		diag {
-			label = "buffalo:red:diag";
+			label = "wzr-agl300nh:red:diag";
 			gpios = <&gpio0 12 1>;
 		};
 
 		security_g {
-			label = "buffalo:orange:security_g";
+			label = "wzr-agl300nh:orange:security_g";
 			gpios = <&gpio0 11 1>;
 		};
 
 		security_n {
-			label = "buffalo:orange:security_n";
+			label = "wzr-agl300nh:orange:security_n";
 			gpios = <&gpio0 13 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/Y1.dts b/target/linux/ramips/dts/Y1.dts
index 783cdaa6df..4a6411581c 100644
--- a/target/linux/ramips/dts/Y1.dts
+++ b/target/linux/ramips/dts/Y1.dts
@@ -17,32 +17,32 @@
 		compatible = "gpio-leds";
 
 		power1 {
-			label = "lenovo:blue:power";
+			label = "y1:blue:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan1 {
-			label = "lenovo:blue:wifi";
+			label = "y1:blue:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wlan2 {
-			label = "lenovo:blue:wifi5g";
+			label = "y1:blue:wifi5g";
 			gpios = <&gpio2 10 1>;
 		};
 
 		usb {
-			label = "lenovo:blue:usb";
+			label = "y1:blue:usb";
 			gpios = <&gpio2 12 1>;
 		};
 
 		lan {
-			label = "lenovo:blue:lan";
+			label = "y1:blue:lan";
 			gpios = <&gpio2 15 1>;
 		};
 
 		internet {
-			label = "lenovo:blue:internet";
+			label = "y1:blue:internet";
 			gpios = <&gpio2 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/Y1S.dts
index b8c6ad085e..f61280b755 100644
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/Y1S.dts
@@ -48,37 +48,37 @@
 		compatible = "gpio-leds";
 
 		power1 {
-			label = "lenovo:yellow:power";
+			label = "y1s:yellow:power";
 			gpios = <&gpio0 14 1>;
 		};
 
 		power2 {
-			label = "lenovo:blue:power";
+			label = "y1s:blue:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan1 {
-			label = "lenovo:yellow:wifi";
+			label = "y1s:yellow:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wlan2 {
-			label = "lenovo:blue:wifi";
+			label = "y1s:blue:wifi";
 			gpios = <&gpio2 10 1>;
 		};
 
 		usb1 {
-			label = "lenovo:yellow:usb";
+			label = "y1s:yellow:usb";
 			gpios = <&gpio2 13 1>;
 		};
 
 		usb2 {
-			label = "lenovo:blue:usb";
+			label = "y1s:blue:usb";
 			gpios = <&gpio2 12 1>;
 		};
 
 		internet {
-			label = "lenovo:blue:internet";
+			label = "y1s:blue:internet";
 			gpios = <&gpio2 11 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index 69060a3130..84974cf38c 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -90,17 +90,17 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "zbtlink:blue:power";
+			label = "zbt-wa05:blue:power";
 			gpios = <&gpio1 14 1>;
 		};
 
 		usb {
-			label = "zbtlink:blue:usb";
+			label = "zbt-wa05:blue:usb";
 			gpios = <&gpio1 15 0>;
 		};
 
 		air {
-			label = "zbtlink:blue:air";
+			label = "zbt-wa05:blue:air";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index 8c56c158a0..8d21a2dfa7 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -87,17 +87,17 @@
 		compatible = "gpio-leds";
 
 		sys {
-			label = "zbt-wr8305rt:sys";
+			label = "zbt-wr8305rt:green:sys";
 			gpios = <&gpio1 14 1>;
 		};
 
 		lan {
-			label = "zbt-wr8305rt:usb";
+			label = "zbt-wr8305rt:green:usb";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wifi {
-			label = "zbt-wr8305rt:wifi";
+			label = "zbt-wr8305rt:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts
index 62af06a500..997349bb70 100644
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/ZTE-Q7.dts
@@ -88,12 +88,12 @@
 		compatible = "gpio-leds";
 
 		statred {
-			label = "zte:red:status";
+			label = "zte-q7:red:status";
 			gpios = <&gpio0 13 1>;
 		};
 
 		statblue {
-			label = "zte:blue:status";
+			label = "zte-q7:blue:status";
 			gpios = <&gpio0 9 1>;
 		};
 	};