diff --git a/package/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh
index b180a0242f..f7039a4e1d 100644
--- a/package/base-files/files/lib/functions/migrations.sh
+++ b/package/base-files/files/lib/functions/migrations.sh
@@ -28,11 +28,34 @@ migrate_led_sysfs() {
 	done;
 }
 
+remove_board_led_sysfs() {
+	local cfg="$1"
+	local sysfs
+	local name
+	local new_sysfs
+
+	config_get sysfs ${cfg} sysfs
+	config_get name ${cfg} name
+
+	echo "${sysfs}" | grep -q ":.*:" || return
+
+	new_sysfs=$(echo ${sysfs} | sed "s/^[^:]*://")
+
+	uci set system.${cfg}.sysfs="${new_sysfs}"
+
+	logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}"
+}
+
 migrate_leds() {
 	config_load system
 	config_foreach migrate_led_sysfs led "$@"
 }
 
+remove_board_leds() {
+	config_load system
+	config_foreach remove_board_led_sysfs led
+}
+
 migrations_apply() {
 	local realm="$1"
 	[ -n "$(uci changes ${realm})" ] && uci -q commit ${realm}
diff --git a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
index 89ddf12998..f0d262c847 100644
--- a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
+++ b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
@@ -20,34 +20,34 @@
 		compatible = "gpio-leds";
 
 		led_router: router {
-			label = "wn-ag300dgr:green:router";
+			label = "green:router";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		children {
-			label = "wn-ag300dgr:green:children";
+			label = "green:children";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		eco {
-			label = "wn-ag300dgr:green:eco";
+			label = "green:eco";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		notification {
-			label = "wn-ag300dgr:amber:notification";
+			label = "amber:notification";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "wn-ag300dgr:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
-			label = "wn-ag300dgr:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
index bc20d70eed..787b516056 100644
--- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
+++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
@@ -36,18 +36,18 @@
 		compatible = "gpio-leds";
 
 		ops {
-			label = "wlr-7100:white:ops";
+			label = "white:ops";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "wlr-7100:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "wlr-7100:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
index 733479ff4e..e34c304b47 100644
--- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
+++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
@@ -16,33 +16,33 @@
 		compatible = "gpio-leds";
 
 		led_user: user {
-			label = "mikrotik:yellow:user";
+			label = "yellow:user";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		led1 {
-			label = "mikrotik:green:led1";
+			label = "green:led1";
 			gpios = <&cpld_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led2 {
-			label = "mikrotik:green:led2";
+			label = "green:led2";
 			gpios = <&cpld_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led3 {
-			label = "mikrotik:green:led3";
+			label = "green:led3";
 			gpios = <&cpld_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		led4 {
-			label = "mikrotik:green:led4";
+			label = "green:led4";
 			gpios = <&cpld_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led5 {
-			label = "mikrotik:green:led5";
+			label = "green:led5";
 			gpios = <&cpld_gpio 8 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
index 17e42d7ba0..344241a322 100644
--- a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
+++ b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
@@ -21,24 +21,24 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "bluesocket:green:wifi5g";
+			label = "green:wifi5g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan2g {
-			label = "bluesocket:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_status_green: status_green {
-			label = "bluesocket:green:status";
+			label = "green:status";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status_yellow: status_yellow {
-			label = "bluesocket:yellow:status";
+			label = "yellow:status";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index d7f1a0711f..65c0be073b 100644
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -32,23 +32,23 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "ap-105:green:power";
+			label = "green:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_red: power_red {
-			label = "ap-105:red:power";
+			label = "red:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			panic-indicator;
 		};
 
 		wifi_2g_red {
-			label = "ap-105:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_5g_red {
-			label = "ap-105:red:wlan5g";
+			label = "red:wlan5g";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -57,13 +57,13 @@
 		compatible = "gpio-leds";
 
 		wifi_2g_green {
-			label = "ap-105:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wifi_5g_green {
-			label = "ap-105:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 1a509d864e..053c91557b 100644
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -23,7 +23,7 @@
 		compatible = "gpio-leds";
 
 		led_diag: diag {
-			label = "buffalo:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -32,41 +32,41 @@
 		compatible = "gpio-leds";
 
 		band2g_a {
-			label = "buffalo:amber:band2g";
+			label = "amber:band2g";
 			gpios = <&ath9k0 1 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "buffalo:green:usb";
+			label = "green:usb";
 			gpios = <&ath9k0 3 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
 			linux,default-trigger = "usbport";
 		};
 
 		band2g_g {
-			label = "buffalo:green:band2g";
+			label = "green:band2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		band5g_g {
-			label = "buffalo:green:band5g";
+			label = "green:band5g";
 			gpios = <&ath9k1 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		router {
-			label = "buffalo:green:router";
+			label = "green:router";
 			gpios = <&ath9k1 3 GPIO_ACTIVE_LOW>;
 		};
 
 		movie_engine {
-			label = "buffalo:blue:movie_engine";
+			label = "blue:movie_engine";
 			gpios = <&ath9k1 4 GPIO_ACTIVE_LOW>;
 		};
 
 		band5g_a {
-			label = "buffalo:amber:band5g";
+			label = "amber:band5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index c67b94b117..85fd54b396 100644
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -27,35 +27,35 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "d-link:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_power_orange: power_orange {
-			label = "d-link:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_power_blue: power_blue {
-			label = "d-link:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		planet_orange {
-			label = "d-link:orange:planet";
+			label = "orange:planet";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		planet_blue {
-			label = "d-link:blue:planet";
+			label = "blue:planet";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -64,13 +64,13 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "d-link:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
-			label = "d-link:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
index abcecd0406..8a27452eb8 100644
--- a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
+++ b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
@@ -36,17 +36,17 @@
 		compatible = "gpio-leds";
 
 		led_d2: d2 {
-			label = "ja76pf2:green:d2";
+			label = "green:d2";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		d3 {
-			label = "ja76pf2:green:d3";
+			label = "green:d3";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		d4 {
-			label = "ja76pf2:green:d4";
+			label = "green:d4";
 			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index fa7e607288..afc49ce865 100644
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -27,38 +27,38 @@
 		compatible = "gpio-leds";
 
 		wifi1 {
-			label = "mr16:green:wifi1";
+			label = "green:wifi1";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2 {
-			label = "mr16:green:wifi2";
+			label = "green:wifi2";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi3 {
-			label = "mr16:green:wifi3";
+			label = "green:wifi3";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi4 {
-			label = "mr16:green:wifi4";
+			label = "green:wifi4";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "mr16:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_orange: power_orange {
-			label = "mr16:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			panic-indicator;
 		};
 
 		led_power_green: power_green {
-			label = "mr16:green:power";
+			label = "green:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index db47126623..9e41b61357 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -25,7 +25,7 @@
 		compatible = "reset-leds";
 
 		usb_led {
-			label = "netgear:green:usb";
+			label = "green:usb";
 			resets = <&rst 12>;
 			trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
 			linux,default-trigger = "usbport";
@@ -36,28 +36,28 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "netgear:orange:wps";
+			label = "orange:wps";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_orange: power_orange {
-			label = "netgear:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_green {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -66,12 +66,12 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "netgear:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 		wlan5g {
-			label = "netgear:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
index 22ae58929c..3c1d97f25e 100644
--- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
+++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
@@ -28,34 +28,34 @@
 		compatible = "gpio-leds";
 
 		led_power_green: led_power_green {
-			label = "ws-ap3610:green:power";
+			label = "green:power";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_red: led_power_red {
-			label = "ws-ap3610:red:power";
+			label = "red:power";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan5_blue {
-			label = "ws-ap3610:blue:wlan5";
+			label = "blue:wlan5";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_wlan5_green {
-			label = "ws-ap3610:green:wlan5";
+			label = "green:wlan5";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan2_blue {
-			label = "ws-ap3610:blue:wlan2";
+			label = "blue:wlan2";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		led_wlan2_green {
-			label = "ws-ap3610:green:wlan2";
+			label = "green:wlan2";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
index 16407128ab..cd0e5015a9 100644
--- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
+++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
@@ -24,7 +24,7 @@
 		compatible = "gpio-leds";
 
 		led_rf: rf_green {
-			label = "ubnt:green:rf";
+			label = "green:rf";
 			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index 576f84d88c..e93c5ca652 100644
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -55,42 +55,42 @@
 		pinctrl-0 = <&switch_led_pins>;
 
 		security {
-			label = "whr-g301n:orange:security";
+			label = "orange:security";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_diag: diag {
-			label = "whr-g301n:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "whr-g301n:green:router";
+			label = "green:router";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "whr-g301n:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "whr-g301n:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "whr-g301n:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "whr-g301n:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "whr-g301n:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -99,7 +99,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "whr-g301n:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
index 511216838c..b632d3b8a8 100644
--- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
+++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
@@ -40,47 +40,47 @@
 		pinctrl-0 = <&switch_led_pins>;
 
 		led_power_green: power_green {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power_amber: power_amber {
-			label = "d-link:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "d-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "d-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "d-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "d-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "d-link:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_green {
-			label = "d-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -89,7 +89,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "d-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
index d8f98ba6c0..4752ad1edd 100644
--- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
+++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
@@ -34,27 +34,27 @@
 		pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
 		rssilow {
-			label = "enh202-v1:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimedium {
-			label = "enh202-v1:amber:rssimedium";
+			label = "amber:rssimedium";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "enh202-v1:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "enh202-v1:amber:lan";
+			label = "amber:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "enh202-v1:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -63,7 +63,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "enh202-v1:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index ec0001b867..d67af04d1c 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -54,63 +54,63 @@
 		pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wan_green {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "netgear:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_green {
-			label = "netgear:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_amber {
-			label = "netgear:amber:lan1";
+			label = "amber:lan1";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_green {
-			label = "netgear:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_amber {
-			label = "netgear:amber:lan2";
+			label = "amber:lan2";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_green {
-			label = "netgear:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_amber {
-			label = "netgear:amber:lan3";
+			label = "amber:lan3";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_green {
-			label = "netgear:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_amber {
-			label = "netgear:amber:lan4";
+			label = "amber:lan4";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -119,12 +119,12 @@
 		compatible = "gpio-leds";
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan_blue {
-			label = "netgear:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index f3d06b5fd5..44dbe9c55e 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -33,22 +33,22 @@
 		pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
 		led_power: power {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "netgear:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "netgear:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -57,7 +57,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "netgear:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi
index 7e54cd46b1..23d12e4edf 100644
--- a/target/linux/ath79/dts/ar7240_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink.dtsi
@@ -39,12 +39,12 @@
 		pinctrl-0 = <&pinmux_switch_led_pins>;
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -53,7 +53,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
index 7ec0469dcd..e0ac582f9d 100644
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
@@ -4,7 +4,7 @@
 
 &leds {
 	lan {
-		label = "tp-link:green:lan";
+		label = "green:lan";
 		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index 5ceada8375..bd6caacdf6 100644
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -4,27 +4,27 @@
 
 &leds {
 	lan1 {
-		label = "tp-link:green:lan1";
+		label = "green:lan1";
 		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 	};
 
 	lan2 {
-		label = "tp-link:green:lan2";
+		label = "green:lan2";
 		gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 	};
 
 	lan3 {
-		label = "tp-link:green:lan3";
+		label = "green:lan3";
 		gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 	};
 
 	lan4 {
-		label = "tp-link:green:lan4";
+		label = "green:lan4";
 		gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 	};
 
 	wan {
-		label = "tp-link:green:wan";
+		label = "green:wan";
 		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 1b303711a8..1b124f3f2e 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -57,57 +57,57 @@
 		pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
 		wan_green {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "netgear:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_green {
-			label = "netgear:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_amber {
-			label = "netgear:amber:lan1";
+			label = "amber:lan1";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_green {
-			label = "netgear:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_amber {
-			label = "netgear:amber:lan2";
+			label = "amber:lan2";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_green {
-			label = "netgear:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_amber {
-			label = "netgear:amber:lan3";
+			label = "amber:lan3";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_green {
-			label = "netgear:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_amber {
-			label = "netgear:amber:lan4";
+			label = "amber:lan4";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -116,18 +116,18 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&ath9k 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wlan_blue {
-			label = "netgear:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
index ec4dd871cc..62614166db 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -51,62 +51,62 @@
 		pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
 		wan_green {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "netgear:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_green {
-			label = "netgear:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1_amber {
-			label = "netgear:amber:lan1";
+			label = "amber:lan1";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_green {
-			label = "netgear:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2_amber {
-			label = "netgear:amber:lan2";
+			label = "amber:lan2";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_green {
-			label = "netgear:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3_amber {
-			label = "netgear:amber:lan3";
+			label = "amber:lan3";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_green {
-			label = "netgear:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4_amber {
-			label = "netgear:amber:lan4";
+			label = "amber:lan4";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		usb_green {
-			label = "netgear:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
@@ -117,18 +117,18 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wlan_blue {
-			label = "netgear:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index 3cbedc3bf8..62884f0902 100644
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -36,12 +36,12 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
index 9d0f34924f..af8e297b1d 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
@@ -10,7 +10,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
index e39f2ee3f9..cae2f5477d 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
@@ -10,7 +10,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
index 9d4f3f2027..218ea5e429 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
@@ -17,7 +17,7 @@
 
 &leds {
 	led3g {
-		label = "tp-link:green:3g";
+		label = "green:3g";
 		gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
index cc138cd59f..17e06dfac7 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
@@ -10,7 +10,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
index c02154a902..b0f6c3695a 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -39,17 +39,17 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led3g {
-			label = "tp-link:green:3g";
+			label = "green:3g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
@@ -60,7 +60,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
index db192cd30b..fcc66c018c 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
@@ -19,12 +19,12 @@
 		compatible = "gpio-leds";
 
 		led_globe: globe {
-			label = "ubnt:green:globe";
+			label = "green:globe";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		power {
-			label = "ubnt:green:power";
+			label = "green:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 963c241d81..c4c0235f7b 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -37,12 +37,12 @@
 		compatible = "gpio-leds";
 
 		led_dome_green: dome_green {
-			label = "ubnt:green:dome";
+			label = "green:dome";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		dome_orange {
-			label = "ubnt:orange:dome";
+			label = "orange:dome";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
index c4af52a76a..3a002aaedf 100644
--- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
+++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
@@ -32,18 +32,18 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "fritz300e:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		lan {
-			label = "fritz300e:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "fritz300e:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
@@ -53,27 +53,27 @@
 		compatible = "gpio-leds";
 
 		rssi0 {
-			label = "fritz300e:green:rssi0";
+			label = "green:rssi0";
 			gpios = <&ath9k 10 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "fritz300e:green:rssi1";
+			label = "green:rssi1";
 			gpios = <&ath9k 4 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "fritz300e:green:rssi2";
+			label = "green:rssi2";
 			gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi3 {
-			label = "fritz300e:green:rssi3";
+			label = "green:rssi3";
 			gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi4 {
-			label = "fritz300e:green:rssi4";
+			label = "green:rssi4";
 			gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
index 46d7e0f331..3b2dc0ecfc 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	sec_vpn {
-		label = "buffalo:orange:vpn";
+		label = "orange:vpn";
 		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
index 89e77224ca..2840f91ec1 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
@@ -40,12 +40,12 @@
 		compatible = "gpio-leds";
 
 		led_diag: diag {
-			label = "buffalo:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "buffalo:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index 1a3aec00fa..f035f86c7c 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -66,7 +66,7 @@
 		compatible = "gpio-leds";
 
 		led_diag: diag {
-			label = "buffalo:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -75,35 +75,35 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "buffalo:blue:usb";
+			label = "blue:usb";
 			gpios = <&ath9k 4 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
 		};
 
 		wireless {
-			label = "buffalo:green:wireless";
+			label = "green:wireless";
 			gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		security {
-			label = "buffalo:orange:security";
+			label = "orange:security";
 			gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "buffalo:green:router";
+			label = "green:router";
 			gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
 		};
 
 		movie_engine_on {
-			label = "buffalo:blue:movie_engine_on";
+			label = "blue:movie_engine_on";
 			gpios = <&ath9k 8 GPIO_ACTIVE_LOW>;
 		};
 
 		movie_engine_off {
-			label = "buffalo:blue:movie_engine_off";
+			label = "blue:movie_engine_off";
 			gpios = <&ath9k 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
index 8bf89e4ecd..4f186c2c11 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
@@ -14,17 +14,17 @@
 		compatible = "gpio-leds";
 
 		led_movie_engine {
-			label = "buffalo:blue:movie_engine";
+			label = "blue:movie_engine";
 			gpios = <&ath9k 13 GPIO_ACTIVE_LOW>;
 		};
 
 		router {
-			label = "buffalo:green:router";
+			label = "green:router";
 			gpios = <&ath9k 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless {
-			label = "buffalo:green:wireless";
+			label = "green:wireless";
 			gpios = <&ath9k 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
@@ -58,7 +58,7 @@
 
 &leds {
 	sec_vpn {
-		label = "buffalo:orange:security";
+		label = "orange:security";
 		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
index 0ac10a56f9..dd4cbf03eb 100644
--- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
@@ -49,12 +49,12 @@
 		compatible = "gpio-leds";
 
 		led_wps: wps {
-			label = "tplink:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "tplink:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
@@ -65,13 +65,13 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "tplink:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
-			label = "tplink:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index 43b24dae5a..52e83ea8d0 100644
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -24,7 +24,7 @@
 		compatible = "gpio-leds";
 
 		led_usr: usr {
-			label = "ubnt:yellow:usr";
+			label = "yellow:usr";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
index a28f8fbcd4..eab08d1d74 100644
--- a/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
+++ b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
@@ -11,22 +11,22 @@
 		compatible = "gpio-leds";
 
 		link1 {
-			label = "ubnt:red:link1";
+			label = "red:link1";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		link2 {
-			label = "ubnt:orange:link2";
+			label = "orange:link2";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		link3 {
-			label = "ubnt:green:link3";
+			label = "green:link3";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_link4: link4 {
-			label = "ubnt:green:link4";
+			label = "green:link4";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 662ffa2e5c..c8697d193d 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -45,17 +45,17 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index 3ff992a841..e17303a0fb 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -45,25 +45,25 @@
 		compatible = "gpio-leds";
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index a35dbc2d1a..ad517d8baf 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -39,22 +39,22 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		qss_r {
-			label = "tp-link:red:qss";
+			label = "red:qss";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		qss_g {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
index b0d68fb35f..15e29f552e 100644
--- a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
+++ b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
@@ -39,12 +39,12 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		led_power_green: power {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status_red: status {
-			label = "d-link:red:status";
+			label = "red:status";
 			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
index 389c6d1e4b..26b3b3f04c 100644
--- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
@@ -22,18 +22,18 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "gl-ar150:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		configurable {
-			label = "gl-ar150:green:configurable";
+			label = "green:configurable";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power: power {
-			label = "gl-ar150:green:power";
+			label = "green:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index a551a4a4f4..7d04b01377 100644
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -20,13 +20,13 @@
 		compatible = "gpio-leds";
 
 		led_wlan: wlan {
-			label = "air-pen:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
-			label = "air-pen:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index de6d9f85d7..85e70495fc 100644
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -18,18 +18,18 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "carambola2:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		eth0 {
-			label = "carambola2:orange:eth0";
+			label = "orange:eth0";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		eth1 {
-			label = "carambola2:orange:eth1";
+			label = "orange:eth1";
 			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
index 53c2af3b19..d005bf0dc4 100644
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
@@ -37,17 +37,17 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "ap121f:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		led_vpn: vpn {
-			label = "ap121f:green:vpn";
+			label = "green:vpn";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "ap121f:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts
index e00a8c638e..8ce5beb059 100644
--- a/target/linux/ath79/dts/ar9331_arduino_yun.dts
+++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts
@@ -53,13 +53,13 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "yun:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		usb {
-			label = "yun:white:usb";
+			label = "white:usb";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&hub_port1>;
 			linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index d0f9f9b724..9303121408 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -21,7 +21,7 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "dorin:green:status";
+			label = "green:status";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index 9df6de1685..0d7b7cfb84 100644
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -31,22 +31,22 @@
 		pinctrl-0 = <&switch_led_disable_pins>;
 
 		modbus {
-			label = "eg200:red:modbus";
+			label = "red:modbus";
 			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_etactica: etactica {
-			label = "eg200:red:etactica";
+			label = "red:etactica";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		eth0 {
-			label = "eg200:red:eth0";
+			label = "red:eth0";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "eg200:red:wlan";
+			label = "red:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
index c96aaa2222..8cdc9ac4ca 100644
--- a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
+++ b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
@@ -26,13 +26,13 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "gl-inet:red:wlan";
+			label = "red:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "gl-inet:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
index ead81adc55..d62bdd9d67 100644
--- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
@@ -18,23 +18,23 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "gl-mifi:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "gl-mifi:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan {
-			label = "gl-mifi:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
 		};
 
 		3g4g {
-			label = "gl-mifi:green:3g4g";
+			label = "green:3g4g";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
index 40ebcccd2b..8632011de3 100644
--- a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
@@ -33,7 +33,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "ts-d084:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
index 812b5b0ec7..cdc92f697d 100644
--- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
@@ -32,7 +32,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "pisen:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 5ea2569fed..7c52ae1617 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -22,23 +22,23 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wps: wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 
 		led3g {
-			label = "tp-link:green:3g";
+			label = "green:3g";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index 2c8dddbe5e..da04aad6cb 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -23,18 +23,18 @@
 		pinctrl-0 = <&switch_led_disable_pins>;
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_lan: lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		led3g {
-			label = "tp-link:green:3g";
+			label = "green:3g";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
index 236609d958..4ea658713d 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
@@ -30,7 +30,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tl-wr703n:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
index b8a4fe96b5..db43484112 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
@@ -30,7 +30,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tl-wr710n:green:system";
+			label = "green:system";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index ed120b4776..c1d88f4812 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -43,42 +43,42 @@
 		pinctrl-0 = <&switch_led_disable_pins>;
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 354e276f7b..da1e59d4c3 100644
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -32,29 +32,29 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "ens202ext-v1:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan {
-			label = "ens202ext-v1:amber:wlan";
+			label = "amber:wlan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		rssilow {
-			label = "ens202ext-v1:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimedium {
-			label = "ens202ext-v1:amber:rssimedium";
+			label = "amber:rssimedium";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		rssihigh {
-			label = "ens202ext-v1:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index d3fd4f114b..7eafd1acd4 100644
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -42,39 +42,39 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "pcs:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "pcs:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan {
-			label = "pcs:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "pcs:blue:lan1";
+			label = "blue:lan1";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "pcs:blue:lan2";
+			label = "blue:lan2";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "pcs:blue:lan3";
+			label = "blue:lan3";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "pcs:blue:lan4";
+			label = "blue:lan4";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
index 685afa5b74..7057c3b1ad 100644
--- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
+++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
@@ -64,32 +64,32 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		volume1 {
-			label = "wmb001n:blue:volume1";
+			label = "blue:volume1";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		volume2 {
-			label = "wmb001n:blue:volume2";
+			label = "blue:volume2";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		volume3 {
-			label = "wmb001n:blue:volume3";
+			label = "blue:volume3";
 			gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
 		};
 
 		volume4 {
-			label = "wmb001n:blue:volume4";
+			label = "blue:volume4";
 			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		volume5 {
-			label = "wmb001n:blue:volume5";
+			label = "blue:volume5";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_wifi: wifi {
-			label = "wmb001n:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi
index dc97b103a4..f229a1917e 100644
--- a/target/linux/ath79/dts/ar9341_tplink.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink.dtsi
@@ -19,44 +19,44 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index 460277c077..750522ded1 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -27,7 +27,7 @@
 
 &leds {
 	usb {
-		label = "tp-link:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
index b3de436e92..12755aea2f 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
@@ -35,43 +35,43 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "tp-link:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_re: re {
-			label = "tp-link:blue:re";
+			label = "blue:re";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		signal1 {
-			label = "tp-link:blue:signal1";
+			label = "blue:signal1";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		signal2 {
-			label = "tp-link:blue:signal2";
+			label = "blue:signal2";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		signal3 {
-			label = "tp-link:blue:signal3";
+			label = "blue:signal3";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		signal4 {
-			label = "tp-link:blue:signal4";
+			label = "blue:signal4";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		signal5 {
-			label = "tp-link:blue:signal5";
+			label = "blue:signal5";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
index 36abbb1c31..9f540f82d9 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
@@ -42,29 +42,29 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power_green {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_power_orange: power_orange {
-			label = "tp-link:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan_green {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan_orange {
-			label = "tp-link:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
index 420d03861f..4a4e51f4b8 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
@@ -28,23 +28,23 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index 0932fe9da2..cb6b25e664 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -37,7 +37,7 @@
 
 &leds {
 	usb {
-		label = "tp-link:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
index bd088a39cf..58845f4cb6 100644
--- a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
+++ b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
@@ -20,13 +20,13 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "etg3-r:green:power";
+			label = "green:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		notification {
-			label = "etg3-r:green:notification";
+			label = "green:notification";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
index 38cd058134..6f6e4c6bb6 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
@@ -16,22 +16,22 @@
 		compatible = "gpio-leds";
 
 		rssi0 {
-			label = "ubnt:blue:rssi0";
+			label = "blue:rssi0";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "ubnt:blue:rssi1";
+			label = "blue:rssi1";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "ubnt:blue:rssi2";
+			label = "blue:rssi2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssi3: rssi3 {
-			label = "ubnt:blue:rssi3";
+			label = "blue:rssi3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
index 4fcb7cd139..6114650ac5 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
@@ -16,22 +16,22 @@
 		compatible = "gpio-leds";
 
 		rssi0 {
-			label = "ubnt:blue:rssi0";
+			label = "blue:rssi0";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "ubnt:blue:rssi1";
+			label = "blue:rssi1";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "ubnt:blue:rssi2";
+			label = "blue:rssi2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssi3: rssi3 {
-			label = "ubnt:blue:rssi3";
+			label = "blue:rssi3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
index 68b608a017..7e4b9cd415 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
@@ -16,22 +16,22 @@
 		compatible = "gpio-leds";
 
 		rssi0 {
-			label = "ubnt:blue:rssi0";
+			label = "blue:rssi0";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "ubnt:blue:rssi1";
+			label = "blue:rssi1";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "ubnt:blue:rssi2";
+			label = "blue:rssi2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssi3: rssi3 {
-			label = "ubnt:blue:rssi3";
+			label = "blue:rssi3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index a0012a7461..ff4e177ca8 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -21,22 +21,22 @@
 		compatible = "gpio-leds";
 
 		link1 {
-			label = "ubnt:red:link1";
+			label = "red:link1";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		link2 {
-			label = "ubnt:orange:link2";
+			label = "orange:link2";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		link3 {
-			label = "ubnt:green:link3";
+			label = "green:link3";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_link4: link4 {
-			label = "ubnt:green:link4";
+			label = "green:link4";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
index c3ac486471..aed25e2f67 100644
--- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
+++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
@@ -36,12 +36,12 @@
 		compatible = "gpio-leds";
 
 		led_power_orange: power_orange {
-			label = "hiveap-121:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_white: power_white {
-			label = "hiveap-121:white:power";
+			label = "white:power";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
index 0bbde9ebfd..95f798cc0f 100644
--- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
+++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
@@ -24,38 +24,38 @@
 		pinctrl-0 = <&led_rssimediumhigh_pin>;
 
 		wan {
-			label = "cf-e120a-v3:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "cf-e120a-v3:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "cf-e120a-v3:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		rssilow {
-			label = "cf-e120a-v3:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "cf-e120a-v3:red:rssimediumlow";
+			label = "red:rssimediumlow";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "cf-e120a-v3:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "cf-e120a-v3:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
index c2dfa6ba2d..a6a4811053 100644
--- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
+++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
@@ -21,27 +21,27 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "wpj344:green:status";
+			label = "green:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		sig1 {
-			label = "wpj344:red:sig1";
+			label = "red:sig1";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		sig2 {
-			label = "wpj344:yellow:sig2";
+			label = "yellow:sig2";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		sig3 {
-			label = "wpj344:green:sig3";
+			label = "green:sig3";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		sig4 {
-			label = "wpj344:green:sig4";
+			label = "green:sig4";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
index 59ec9451fc..a35c177b3c 100644
--- a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
+++ b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
@@ -20,18 +20,18 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "devolo:white:wlan";
+			label = "white:wlan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		led_dlan_white: dlan_white {
-			label = "devolo:white:dlan";
+			label = "white:dlan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_dlan_red: dlan_red {
-			label = "devolo:red:dlan";
+			label = "red:dlan";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 			panic-indicator;
 		};
diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
index 2c242a1b0a..bd4c58f3c9 100644
--- a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
@@ -21,40 +21,40 @@
 		pinctrl-0 = <&enable_gpio_11>;
 
 		led_power_blue: power_blue {
-			label = "d-link:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "d-link:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port1>;
 		};
 
 		wan_blue {
-			label = "d-link:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "d-link:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
-			label = "d-link:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_orange: power_orange {
-			label = "d-link:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_orange {
-			label = "d-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -63,7 +63,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "d-link:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
index 17c58073d5..189945848d 100644
--- a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
@@ -18,27 +18,27 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_green {
-			label = "d-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "d-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_orange: power_orange {
-			label = "d-link:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_orange {
-			label = "d-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
index 35d6c55b59..26e98f8711 100644
--- a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
+++ b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
@@ -45,27 +45,27 @@
 		pinctrl-0 = <&enable_gpio_11 &enable_gpio_16>;
 
 		led_power_green: power_green {
-			label = "ws-ap3705i:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_red: power_red {
-			label = "ws-ap3705i:red:power";
+			label = "red:power";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan_blue {
-			label = "ws-ap3705i:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan_green {
-			label = "ws-ap3705i:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
 
 		radio2 {
-			label = "ws-ap3705i:green:radio2";
+			label = "green:radio2";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
@@ -75,7 +75,7 @@
 		compatible = "gpio-leds";
 
 		radio1 {
-			label = "ws-ap3705i:green:radio1";
+			label = "green:radio1";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
index e95ffc787a..789069632b 100644
--- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
@@ -21,38 +21,38 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "mikrotik:green:power";
+			label = "green:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		rssilow {
-			label = "mikrotik:green:rssilow";
+			label = "green:rssilow";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "mikrotik:green:rssimediumlow";
+			label = "green:rssimediumlow";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimedium {
-			label = "mikrotik:green:rssimedium";
+			label = "green:rssimedium";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "mikrotik:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		rssihigh {
-			label = "mikrotik:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		led_user: user {
-			label = "mikrotik:green:user";
+			label = "green:user";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index ad9caa690e..92b0beccd7 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -47,35 +47,35 @@
 		pinctrl-0 = <&enable_gpio_11>;
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wlan2g_green {
-			label = "netgear:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g_blue {
-			label = "netgear:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_amber {
-			label = "netgear:amber:wps";
+			label = "amber:wps";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
index e3780632e9..0ca3b761bf 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
@@ -2,7 +2,7 @@
 
 &leds {
 	usb_green {
-		label = "netgear:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
index 91c2971f8c..da6020769f 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
@@ -2,12 +2,12 @@
 
 &leds {
 	wan_green {
-		label = "netgear:green:wan";
+		label = "green:wan";
 		gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 	};
 
 	wan_amber {
-		label = "netgear:amber:wan";
+		label = "amber:wan";
 		gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
index 428f35cd2f..443f0c6724 100644
--- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
+++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
@@ -24,19 +24,19 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "raccoon:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "raccoon:yellow:wlan24";
+			label = "yellow:wlan24";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_system: system {
-			label = "raccoon:blue:sys";
+			label = "blue:sys";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -45,7 +45,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "raccoon:red:wlan5";
+			label = "red:wlan5";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index 27f750baba..0d20475459 100644
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -35,35 +35,35 @@
 		compatible = "gpio-leds";
 
 		led_power_amber: power_amber {
-			label = "pcs:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power_green {
-			label = "pcs:green:power";
+			label = "green:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan_amber {
-			label = "pcs:amber:wlan";
+			label = "amber:wlan";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan_green {
-			label = "pcs:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan_amber {
-			label = "pcs:lan:amber";
+			label = "lan:amber";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan_green {
-			label = "pcs:lan:green";
+			label = "lan:green";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 9886c3dee5..3ab1cb34b3 100644
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -42,20 +42,20 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "pcs:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>,
 				<&gpio 4 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "pcs:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps_white {
-			label = "pcs:white:wps";
+			label = "white:wps";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
index 9d1cd52440..dff2644b11 100644
--- a/target/linux/ath79/dts/ar9344_qihoo_c301.dts
+++ b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
@@ -21,12 +21,12 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		led_wlan_g: wlan_g {
-			label = "c301:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan_o: wlan_o {
-			label = "c301:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index 7a5bda64c5..f61f2bf628 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -18,37 +18,37 @@
 		compatible = "gpio-leds";
 
 		signal0 {
-			label = "rut955:green:signal0";
+			label = "green:signal0";
 			gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal1 {
-			label = "rut955:green:signal1";
+			label = "green:signal1";
 			gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal2 {
-			label = "rut955:green:signal2";
+			label = "green:signal2";
 			gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal3 {
-			label = "rut955:green:signal3";
+			label = "green:signal3";
 			gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal4 {
-			label = "rut955:green:signal4";
+			label = "green:signal4";
 			gpios = <&gpio_ext 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_system_red: system_red {
-			label = "rut955:red:system";
+			label = "red:system";
 			gpios = <&gpio_ext 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_system_green: system_green {
-			label = "rut955:green:system";
+			label = "green:system";
 			gpios = <&gpio_ext 6 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index b158d8709a..98ad19cdeb 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -17,37 +17,37 @@
 		compatible = "gpio-leds";
 
 		signal0 {
-			label = "rut955:green:signal0";
+			label = "green:signal0";
 			gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal1 {
-			label = "rut955:green:signal1";
+			label = "green:signal1";
 			gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal2 {
-			label = "rut955:green:signal2";
+			label = "green:signal2";
 			gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal3 {
-			label = "rut955:green:signal3";
+			label = "green:signal3";
 			gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		signal4 {
-			label = "rut955:green:signal4";
+			label = "green:signal4";
 			gpios = <&gpio_ext 4 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_system_red: system_red {
-			label = "rut955:red:system";
+			label = "red:system";
 			gpios = <&gpio_ext 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_system_green: system_green {
-			label = "rut955:green:system";
+			label = "green:system";
 			gpios = <&gpio_ext 6 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
index 3b89b77412..c495eb298c 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
@@ -16,12 +16,12 @@
 		compatible = "gpio-leds";
 
 		led_lan: lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
index 346c2aa19f..fa533d9f50 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
@@ -16,12 +16,12 @@
 		compatible = "gpio-leds";
 
 		led_lan: lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
index be29d944b2..a1dca81093 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
@@ -14,27 +14,27 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		link1 {
-			label = "tp-link:green:link1";
+			label = "green:link1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		link2 {
-			label = "tp-link:green:link2";
+			label = "green:link2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		link3 {
-			label = "tp-link:green:link3";
+			label = "green:link3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: link4 {
-			label = "tp-link:green:link4";
+			label = "green:link4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index 089114f21b..1fce869160 100644
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -14,32 +14,32 @@
 		compatible = "gpio-leds";
 
 		lan0 {
-			label = "tp-link:green:lan0";
+			label = "green:lan0";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		link1 {
-			label = "tp-link:green:link1";
+			label = "green:link1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		link2 {
-			label = "tp-link:green:link2";
+			label = "green:link2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		link3 {
-			label = "tp-link:green:link3";
+			label = "green:link3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_link4: link4 {
-			label = "tp-link:green:link4";
+			label = "green:link4";
 		};
 	};
 };
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
index af992249f6..59a06346ae 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -13,7 +13,7 @@
 
 &leds {
 	usb {
-		label = "tp-link:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		linux,default-trigger = "usbport";
 		trigger-sources = <&hub_port>;
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index fd9f2b48ca..21fd079e1a 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -38,14 +38,14 @@
 
 &leds {
 	usb1 {
-		label = "tp-link:green:usb1";
+		label = "green:usb1";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port1>;
 		linux,default-trigger = "usbport";
 	};
 
 	usb2 {
-		label = "tp-link:green:usb2";
+		label = "green:usb2";
 		gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port2>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
index 68d79a6745..e7430988ad 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
@@ -17,19 +17,19 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -38,7 +38,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
index c0b0f0bd41..da3b0c63aa 100644
--- a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
+++ b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
@@ -21,12 +21,12 @@
 		compatible = "gpio-leds";
 
 		led_white: led-white {
-			label = "ubnt:white:dome";
+			label = "white:dome";
 			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_blue: led-blue {
-			label = "ubnt:blue:dome";
+			label = "blue:dome";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
index 00ae776f04..c440d71721 100644
--- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
@@ -24,22 +24,22 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "mynet-n750:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet {
-			label = "mynet-n750:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "mynet-n750:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power: power {
-			label = "mynet-n750:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
index 77e0a0b20f..6bacee4b4d 100644
--- a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
@@ -24,34 +24,34 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "mynet-wifi-rangeextender:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 			/* LED has no off state. It's either on or it blinks */
 		};
 
 		lan {
-			label = "mynet-wifi-rangeextender:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi {
-			label = "mynet-wifi-rangeextender:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wifi-rssi-low {
-			label = "mynet-wifi-rangeextender:blue:rssi-low";
+			label = "blue:rssi-low";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi-rssi-med {
-			label = "mynet-wifi-rangeextender:blue:rssi-med";
+			label = "blue:rssi-med";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi-rssi-max {
-			label = "mynet-wifi-rangeextender:blue:rssi-max";
+			label = "blue:rssi-max";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index c897b23015..cd2e389ccd 100644
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -38,20 +38,20 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "wb2000:green:2g";
+			label = "green:2g";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		usb {
-			label = "wb2000:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&hub_port1>, <&hub_port2>;
 			linux,default-trigger = "usbport";
 		};
 
 		led_system: system {
-			label = "wb2000:green:system";
+			label = "green:system";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
@@ -71,7 +71,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "wb2000:green:5g";
+			label = "green:5g";
 			gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index 58780a0417..fd587c5da0 100644
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -48,18 +48,18 @@
 		pinctrl-0 = <&enable_gpio20_gpio22>;
 
 		wifi {
-			label = "zbt-wd323:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan1 {
-			label = "zbt-wd323:orange:lan1";
+			label = "orange:lan1";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "zbt-wd323:orange:lan2";
+			label = "orange:lan2";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
index ac1df6bf68..749acedcda 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts
@@ -23,38 +23,38 @@
 		pinctrl-names = "default";
 
 		wlan {
-			label = "cf-e130n-v2:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "cf-e130n-v2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		unused {
-			label = "cf-e130n-v2:green:unused";
+			label = "green:unused";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "cf-e130n-v2:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "cf-e130n-v2:red:rssimediumlow";
+			label = "red:rssimediumlow";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "cf-e130n-v2:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "cf-e130n-v2:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
index a7c2571fda..7e2ff5d0ee 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
@@ -22,38 +22,38 @@
 		pinctrl-names = "default";
 
 		wlan {
-			label = "cf-e313ac:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "cf-e313ac:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "cf-e313ac:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "cf-e313ac:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "cf-e313ac:red:rssimediumlow";
+			label = "red:rssimediumlow";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "cf-e313ac:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "cf-e313ac:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
index ff975567d1..723c9eda13 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -23,37 +23,37 @@
 		pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
 		wan {
-			label = "cf-e314n-v2:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "cf-e314n-v2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "cf-e314n-v2:red:signal1";
+			label = "red:signal1";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "cf-e314n-v2:red:signal2";
+			label = "red:signal2";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "cf-e314n-v2:green:signal3";
+			label = "green:signal3";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "cf-e314n-v2:green:signal4";
+			label = "green:signal4";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "cf-e314n-v2:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index d5711334fd..5c69a9bde0 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -29,33 +29,33 @@
 		pinctrl-0 = <&jtag_disable_pins &led_wan_pin>;
 
 		wan {
-			label = "cf-e5:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "cf-e5:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "cf-e5:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		rssi0 {
-			label = "cf-e5:blue:rssi0";
+			label = "blue:rssi0";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "cf-e5:blue:rssi1";
+			label = "blue:rssi1";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "cf-e5:blue:rssi2";
+			label = "blue:rssi2";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 847dae6895..46b08da838 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -35,37 +35,37 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		lan1 {
-			label = "cf-e560ac:blue:lan1";
+			label = "blue:lan1";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "cf-e560ac:blue:lan2";
+			label = "blue:lan2";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "cf-e560ac:blue:lan3";
+			label = "blue:lan3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "cf-e560ac:blue:lan4";
+			label = "blue:lan4";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "cf-e560ac:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "cf-e560ac:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "cf-e560ac:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index ad5275c0a1..f52467c4e2 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -23,17 +23,17 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		lan {
-			label = "cf-ew72:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wan: wan {
-			label = "cf-ew72:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "cf-ew72:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index 467dfaeb15..2fbdc8fd07 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -23,17 +23,17 @@
 		pinctrl-0 = <&jtag_disable_pins &pinmux_led_rssihigh &pinmux_led_rssilow>;
 
 		led_lan: lan {
-			label = "cf-wr752ac-v1:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssihigh {
-			label = "cf-wr752ac-v1:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "cf-wr752ac-v1:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 4b4e23e1aa..2cc9d46fac 100644
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -39,22 +39,22 @@
 		pinctrl-0 = <&pinmux_led_eth_pins>;
 
 		sig1 {
-			label = "wpj531:red:sig1";
+			label = "red:sig1";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		sig2 {
-			label = "wpj531:yellow:sig2";
+			label = "yellow:sig2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		sig3 {
-			label = "wpj531:green:sig3";
+			label = "green:sig3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_sig4: sig4 {
-			label = "wpj531:green:sig4";
+			label = "green:sig4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
index b3fc8ea0bf..dafce16a2a 100644
--- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
+++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
@@ -42,14 +42,14 @@
 		compatible = "gpio-export";
 
 		usb_power {
-			label = "d-link:power:usb";
+			label = "power:usb";
 			gpio-export,name = "d-link:power:usb";
 			gpio-export,output = <0>;
 			gpios = <&gpio_ext 3 GPIO_ACTIVE_LOW>;
 		};
 
 		zwave_power {
-			label = "d-link:power:zwave";
+			label = "power:zwave";
 			gpio-export,name = "d-link:power:zwave";
 			gpio-export,output = <0>;
 			gpios = <&gpio_ext 1 GPIO_ACTIVE_LOW>;
@@ -76,12 +76,12 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		status {
-			label = "d-link:red:status";
+			label = "red:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 5ca651cfc4..eb91d7e0b4 100644
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -33,29 +33,29 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "ews511ap:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		lan1 {
-			label = "ews511ap:blue:lan1";
+			label = "blue:lan1";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "ews511ap:blue:lan2";
+			label = "blue:lan2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "ews511ap:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
-			label = "ews511ap:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
index 5a92d83669..cf531ed8c4 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
@@ -21,13 +21,9 @@
 };
 
 &led_status {
-	label = "gl-ar300m-lite:red:status";
-};
-
-&led_lan {
-	label = "gl-ar300m-lite:green:lan";
+	label = "red:status";
 };
 
 &led_wlan {
-	label = "gl-ar300m-lite:green:wlan";
+	label = "green:wlan";
 };
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 617076b074..86c895fc6a 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -43,17 +43,17 @@
 		// Colors for non-Lite versions
 
 		led_status: status {
-			label = "gl-ar300m:green:status";
+			label = "green:status";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
-		led_lan: lan {
-			label = "gl-ar300m:green:lan";
+		lan {
+			label = "green:lan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_wlan: wlan {
-			label = "gl-ar300m:red:wlan";
+			label = "red:wlan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 1bc41839d1..57a7ed1a0c 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -40,19 +40,19 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "gl-ar750:white:power";
+			label = "white:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "gl-ar750:white:wlan2g";
+			label = "white:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "gl-ar750:white:wlan5g";
+			label = "white:wlan5g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index f423e709f9..acb458f7ec 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -26,30 +26,30 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "gl-x750:green:power";
+			label = "green:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "gl-x750:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "gl-x750:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan {
-			label = "gl-x750:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		4g {
-			label = "gl-x750:green:4g";
+			label = "green:4g";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index 98b52a7b24..455bfb336f 100644
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -33,33 +33,33 @@
 		pinctrl-0 = <&jtag_disable_pins &pinmux_led_wan_pin>;
 
 		wan {
-			label = "t1:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "t1:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "t1:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_rssi0: rssi0 {
-			label = "t1:blue:rssi0";
+			label = "blue:rssi0";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi1 {
-			label = "t1:blue:rssi1";
+			label = "blue:rssi1";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "t1:blue:rssi2";
+			label = "blue:rssi2";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 65b85a78f1..f6bd7ad58f 100644
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -21,46 +21,46 @@
 		compatible = "gpio-leds";
 
 		wlan2g {
-			label = "tp-link:white:wlan2g";
+			label = "white:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:white:wlan5g";
+			label = "white:wlan5g";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		qss {
-			label = "tp-link:white:qss";
+			label = "white:qss";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:white:wan";
+			label = "white:wan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:white:lan";
+			label = "white:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "tp-link:white:usb";
+			label = "white:usb";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		internet {
-			label = "tp-link:white:internet";
+			label = "white:internet";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_system: system {
-			label = "tp-link:white:system";
+			label = "white:system";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index 92da0b1a5e..2f6c4147c9 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -58,56 +58,56 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port>;
 			linux,default-trigger = "usbport";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index 6ab63ebde0..bd3858e59a 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -22,38 +22,38 @@
 
 		/* D12 */
 		wan {
-			label = "tp-link:white:wan";
+			label = "white:wan";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* D11 */
 		4g {
-			label = "tp-link:white:4g";
+			label = "white:4g";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* D5 */
 		wps {
-			label = "tp-link:white:wps";
+			label = "white:wps";
 			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* D3 */
 		wlan {
-			label = "tp-link:white:wlan";
+			label = "white:wlan";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		/* D2 */
 		led_power: power {
-			label = "tp-link:white:power";
+			label = "white:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* D4 */
 		lan {
-			label = "tp-link:white:lan";
+			label = "white:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index e6fc128229..a162d9030f 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -21,36 +21,36 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		internet {
-			label = "tp-link:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index 4a0fa49474..aaa9e1f908 100644
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -31,23 +31,23 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "a770:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status: status {
-			label = "a770:green:status";
+			label = "green:status";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wan {
-			label = "a770:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "a770:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index 7643717c0e..961caa8ade 100644
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -23,32 +23,32 @@
 		pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
 		wan {
-			label = "cf-e110n-v2:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "cf-e110n-v2:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "cf-e110n-v2:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "cf-e110n-v2:red:rssimediumlow";
+			label = "red:rssimediumlow";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "cf-e110n-v2:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_rssihigh: rssihigh {
-			label = "cf-e110n-v2:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -57,7 +57,7 @@
 		compatible = "gpio-leds";
 
 		wlan {
-			label = "cf-e110n-v2:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
index 9b3a66f703..5002079940 100644
--- a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
@@ -33,32 +33,32 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status: status {
-			label = "d-link:red:status";
+			label = "red:status";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "d-link:red:rssilow";
+			label = "red:rssilow";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "d-link:green:rssimediumlow";
+			label = "green:rssimediumlow";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "d-link:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		rssihigh {
-			label = "d-link:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
index f54e757c62..5448b7beb0 100644
--- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
@@ -20,39 +20,39 @@
 		pinctrl-0 = <&led_wan_pin>;
 
 		power {
-			label = "mikrotik:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		led_user: user {
-			label = "mikrotik:green:user";
+			label = "green:user";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "mikrotik:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "mikrotik:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		rssilow {
-			label = "mikrotik:green:rssilow";
+			label = "green:rssilow";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "mikrotik:green:rssimediumlow";
+			label = "green:rssimediumlow";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "mikrotik:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
@@ -60,7 +60,7 @@
 		unregistered here to avoid conflict.
 
 		rssihigh {
-			label = "mikrotik:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 		*/
diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
index 5edd2adc83..3295776bf9 100644
--- a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
@@ -4,7 +4,7 @@
 
 &leds {
 	lan {
-		label = "tp-link:green:lan";
+		label = "green:lan";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
index 2722c59b0e..1d8098944a 100644
--- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
@@ -9,12 +9,12 @@
 
 &leds {
 	lan0 {
-		label = "tp-link:green:lan0";
+		label = "green:lan0";
 		gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 	};
 
 	lan1 {
-		label = "tp-link:green:lan1";
+		label = "green:lan1";
 		gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index 387bd6ba1d..7c64dcc24f 100644
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -18,22 +18,22 @@
 		compatible = "gpio-leds";
 
 		link1 {
-			label = "tp-link:green:link1";
+			label = "green:link1";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		link2 {
-			label = "tp-link:green:link2";
+			label = "green:link2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		link3 {
-			label = "tp-link:green:link3";
+			label = "green:link3";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led_link4: link4 {
-			label = "tp-link:green:link4";
+			label = "green:link4";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index efe892e288..c45280aff0 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -18,28 +18,28 @@
 		compatible = "gpio-leds";
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		security_red {
-			label = "tp-link:red:security";
+			label = "red:security";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		security_green {
-			label = "tp-link:green:security";
+			label = "green:security";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index 537c577918..7d8519ef9b 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -24,42 +24,42 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		lan {
-			label = "tp-link:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_re: re {
-			label = "tp-link:blue:re";
+			label = "blue:re";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		signal1 {
-			label = "tp-link:blue:signal1";
+			label = "blue:signal1";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		signal2 {
-			label = "tp-link:blue:signal2";
+			label = "blue:signal2";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		signal3 {
-			label = "tp-link:blue:signal3";
+			label = "blue:signal3";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		signal4 {
-			label = "tp-link:blue:signal4";
+			label = "blue:signal4";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led_signal5: signal5 {
-			label = "tp-link:blue:signal5";
+			label = "blue:signal5";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index 8bb708c6b6..b6349e5371 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -18,7 +18,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
index a0d0afcccf..027ed82cbe 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
@@ -13,12 +13,12 @@
 
 &leds {
 	led_system: system {
-		label = "tp-link:green:system";
+		label = "green:system";
 		gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 	};
 
 	wan_orange {
-		label = "tp-link:orange:wan";
+		label = "orange:wan";
 		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index e85f37f425..b68cd87e98 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -14,38 +14,38 @@
 		compatible = "gpio-leds";
 
 		wifi {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_qss: qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 25447b8bff..269ca03645 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -21,54 +21,54 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wifi {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_green {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_red {
-			label = "tp-link:red:wan";
+			label = "red:wan";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port>;
diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index 6c1d583f01..091d6696a3 100644
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -18,7 +18,7 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts b/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
index 43bf582b5a..bdb983cd7c 100644
--- a/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
@@ -45,43 +45,43 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "fritz1750e:green:power";
+			label = "green:power";
 			gpios = <&spi_gpio 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "fritz1750e:green:wlan";
+			label = "green:wlan";
 			gpios = <&spi_gpio 5 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		lan {
-			label = "fritz1750e:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
 		};
 
 		rssi0 {
-			label = "fritz1750e:green:rssi0";
+			label = "green:rssi0";
 			gpios = <&spi_gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
 		rssi1 {
-			label = "fritz1750e:green:rssi1";
+			label = "green:rssi1";
 			gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		rssi2 {
-			label = "fritz1750e:green:rssi2";
+			label = "green:rssi2";
 			gpios = <&spi_gpio 2 GPIO_ACTIVE_HIGH>;
 		};
 
 		rssi3 {
-			label = "fritz1750e:green:rssi3";
+			label = "green:rssi3";
 			gpios = <&spi_gpio 3 GPIO_ACTIVE_HIGH>;
 		};
 
 		rssi4 {
-			label = "fritz1750e:green:rssi4";
+			label = "green:rssi4";
 			gpios = <&spi_gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
index 86cd7153e3..0d30535976 100644
--- a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
@@ -19,33 +19,33 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "fritz450e:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan {
-			label = "fritz450e:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "fritz450e:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi2 {
-			label = "fritz450e:green:rssi2";
+			label = "green:rssi2";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi3 {
-			label = "fritz450e:green:rssi3";
+			label = "green:rssi3";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		rssi4 {
-			label = "fritz450e:green:rssi4";
+			label = "green:rssi4";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
index 28b19f92ef..bf1c026d17 100644
--- a/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
@@ -48,43 +48,43 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "fritzdvbc:green:power";
+			label = "green:power";
 			gpios = <&spi_gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "fritzdvbc:green:wlan";
+			label = "green:wlan";
 			gpios = <&spi_gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		tv {
-			label = "fritzdvbc:green:tv";
+			label = "green:tv";
 			gpios = <&spi_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		rssihigh {
-			label = "fritzdvbc:green:rssihigh";
+			label = "green:rssihigh";
 			gpios = <&spi_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumhigh {
-			label = "fritzdvbc:green:rssimediumhigh";
+			label = "green:rssimediumhigh";
 			gpios = <&spi_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimedium {
-			label = "fritzdvbc:green:rssimedium";
+			label = "green:rssimedium";
 			gpios = <&spi_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		rssimediumlow {
-			label = "fritzdvbc:green:rssimediumlow";
+			label = "green:rssimediumlow";
 			gpios = <&spi_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		rssilow {
-			label = "fritzdvbc:green:rssilow";
+			label = "green:rssilow";
 			gpios = <&spi_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index d629c751de..33053771ad 100644
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -20,23 +20,23 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "bhr-4grv2:green:power";
+			label = "green:power";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		diag {
-			label = "bhr-4grv2:orange:diag";
+			label = "orange:diag";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		vpn_orange {
-			label = "bhr-4grv2:orange:vpn";
+			label = "orange:vpn";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		vpn_green {
-			label = "bhr-4grv2:green:vpn";
+			label = "green:vpn";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
index d4aa0d742a..f19e186796 100644
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
@@ -17,30 +17,30 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "iodata:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		eco {
-			label = "iodata:green:eco";
+			label = "green:eco";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g {
-			label = "iodata:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "iodata:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		notification {
-			label = "iodata:amber:notification";
+			label = "amber:notification";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
index e259cb0266..9a938aff30 100644
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	copy {
-		label = "iodata:green:copy";
+		label = "green:copy";
 		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
index 2054643302..1e7d92db3f 100644
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	function {
-		label = "iodata:green:function";
+		label = "green:function";
 		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
index 388bd3ef09..af2607d7b7 100644
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	copy {
-		label = "iodata:green:copy";
+		label = "green:copy";
 		gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
index 5898518f20..d56fab120b 100644
--- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
+++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
@@ -17,38 +17,38 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "nbg6616:green:power";
+			label = "green:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		usb1 {
-			label = "nbg6616:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port0>;
 		};
 
 		usb2 {
-			label = "nbg6616:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port1>;
 		};
 
 		wifi2g {
-			label = "nbg6616:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5g {
-			label = "nbg6616:green:wifi5g";
+			label = "green:wifi5g";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
-			label = "nbg6616:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index d825eb005b..1cca39de38 100644
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -31,25 +31,25 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "all-wap02860ac:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "all-wap02860ac:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "all-wap02860ac:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
-			label = "all-wap02860ac:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
index d04f61193a..240d20ff1f 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
@@ -5,32 +5,6 @@
 / {
 	compatible = "comfast,cf-wr650ac-v1", "qca,qca9558";
 	model = "Comfast CF-WR650AC v1";
-
-	leds {
-		compatible = "gpio-leds";
-
-		wps {
-			label = "cf-wr650ac-v1:blue:wps";
-			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-		};
-
-		network {
-			label = "cf-wr650ac-v1:blue:network";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "cf-wr650ac-v1:blue:wlan2";
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
-		wlan5g {
-			label = "cf-wr650ac-v1:blue:wlan5";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
 };
 
 &spi {
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
index 6edd75d61a..1b20c3b615 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
@@ -5,32 +5,6 @@
 / {
 	compatible = "comfast,cf-wr650ac-v2", "qca,qca9558";
 	model = "Comfast CF-WR650AC v2";
-
-	leds {
-		compatible = "gpio-leds";
-
-		wps {
-			label = "cf-wr650ac-v2:blue:wps";
-			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-		};
-
-		network {
-			label = "cf-wr650ac-v2:blue:network";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan2g {
-			label = "cf-wr650ac-v2:blue:wlan2";
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
-		wlan5g {
-			label = "cf-wr650ac-v2:blue:wlan5";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
 };
 
 &spi {
diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index b57bcc3942..5d32551274 100644
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -17,6 +17,32 @@
 		};
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		wps {
+			label = "blue:wps";
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+		};
+
+		network {
+			label = "blue:network";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan2g {
+			label = "blue:wlan2";
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+
+		wlan5g {
+			label = "blue:wlan5";
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+	};
+
 	watchdog {
 		compatible = "linux,wdt-gpio";
 		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index 3164d783ff..6efdfcab3c 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_status_blue: status_blue {
-			label = "dvl1200e:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_status_red: status_red {
-			label = "dvl1200e:red:status";
+			label = "red:status";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
index 11ac6fd18f..4ef43be4ba 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_status_blue: status_blue {
-			label = "dvl1200i:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_status_red: status_red {
-			label = "dvl1200i:red:status";
+			label = "red:status";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
index 11325a69c8..1cf5c09d72 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_status_blue: status_blue {
-			label = "dvl1750c:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_status_red: status_red {
-			label = "dvl1750c:red:status";
+			label = "red:status";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 7de8ee0bdb..6a6228327f 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -34,13 +34,13 @@
 		compatible = "gpio-leds";
 
 		led_status_blue: status_blue {
-			label = "dvl1750e:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_status_red: status_red {
-			label = "dvl1750e:red:status";
+			label = "red:status";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
index 7ba011faf2..59a9f4c523 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_status_blue: status_blue {
-			label = "dvl1750i:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_status_red: status_red {
-			label = "dvl1750i:red:status";
+			label = "red:status";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
index a113097f62..8352b37f4a 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
@@ -18,12 +18,12 @@
 
 		led_status_red: status_red {
 			/* This LED is not visible on the external casing. */
-			label = "dvl1750x:red:status";
+			label = "red:status";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "dvl1750x:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
index 2cd05d9159..f0cf22511a 100644
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
@@ -20,18 +20,18 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "d-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_power_red: power_red {
-			label = "d-link:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2g {
-			label = "d-link:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 776e92ceec..4af1860aca 100644
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -20,32 +20,32 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "dw33d:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		mmc {
-			label = "dw33d:blue:mmc";
+			label = "blue:mmc";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		usb {
-			label = "dw33d:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		wlan2g {
-			label = "dw33d:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		internet {
-			label = "dw33d:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
index e4e3ca3409..5e38f2e459 100644
--- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
@@ -20,25 +20,25 @@
 		compatible = "gpio-leds";
 
 		led_power_orange: power_orange {
-			label = "ecb1750:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "ecb1750:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "ecb1750:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "ecb1750:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
index aa14fd4f3f..9d37664306 100644
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
@@ -20,30 +20,30 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "epg5000:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "epg5000:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "epg5000:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps_amber {
-			label = "epg5000:amber:wps";
+			label = "amber:wps";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_blue {
-			label = "epg5000:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index ccead91cfc..c4a73f2563 100644
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -20,19 +20,19 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "librerouter-v1:green:system";
+			label = "green:system";
 			gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		wifi_green {
-			label = "librerouter-v1:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		status_blue {
-			label = "librerouter-v1:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
index 222de88784..d1f307bd48 100644
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
@@ -10,7 +10,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "mikrotik:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&ath10k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index 3936fd993e..34cc35735f 100644
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -10,7 +10,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "mikrotik:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&ath10k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
index 57aeedd677..70b3ee68c3 100644
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
@@ -17,7 +17,7 @@
 		compatible = "gpio-leds";
 
 		led_user: user {
-			label = "mikrotik:green:user";
+			label = "green:user";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index bbecdfce83..04abb8717e 100644
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -44,47 +44,47 @@
 		compatible = "gpio-leds";
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		left_blue {
-			label = "netgear:blue:left";
+			label = "blue:left";
 			gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		right_blue {
-			label = "netgear:blue:right";
+			label = "blue:right";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		client_red {
-			label = "netgear:red:client";
+			label = "red:client";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		client_green {
-			label = "netgear:green:client";
+			label = "green:client";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		router_red {
-			label = "netgear:red:router";
+			label = "red:router";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		router_green {
-			label = "netgear:green:router";
+			label = "green:router";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index eefa839b88..dbefa40dcf 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -21,25 +21,25 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "koala:green:power";
+			label = "green:power";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wifi2 {
-			label = "koala:yellow:wlan2";
+			label = "yellow:wlan2";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5 {
-			label = "koala:red:wlan58";
+			label = "red:wlan58";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		led_system: system {
-			label = "koala:blue:sys";
+			label = "blue:sys";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index eb93201ab0..8c7a7af91b 100644
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -13,13 +13,13 @@
 		compatible = "gpio-leds";
 
 		wifi2 {
-			label = "ursus:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5 {
-			label = "ursus:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 51a22f09a2..eb196eb2e5 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -20,22 +20,22 @@
 		compatible = "gpio-leds";
 
 		power {
-			label = "om5pac:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_green {
-			label = "om5pac:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_yellow {
-			label = "om5pac:yellow:wifi";
+			label = "yellow:wifi";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_red {
-			label = "om5pac:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
index 0b191149cd..412a6e7b33 100644
--- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
+++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
@@ -36,24 +36,24 @@
 		compatible = "gpio-leds";
 
 		led_status_amber: status_amber {
-			label = "wlr-8100:amber:status";
+			label = "amber:status";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		ops {
-			label = "wlr-8100:white:ops";
+			label = "white:ops";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2g {
-			label = "wlr-8100:blue:wifi2g";
+			label = "blue:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5g {
-			label = "wlr-8100:blue:wifi5g";
+			label = "blue:wifi5g";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
index 83458df56d..d59d87b5e6 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
@@ -18,33 +18,33 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		usb1 {
-			label = "tp-link:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		usb2 {
-			label = "tp-link:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
index c8381296c1..9ffbce0a21 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
@@ -18,7 +18,7 @@
 
 &leds {
 	wlan5g {
-		label = "tp-link:green:wlan5g";
+		label = "green:wlan5g";
 		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		linux,default-trigger = "phy0tpt";
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
index ee35fa6599..e2d1d63813 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
@@ -18,7 +18,7 @@
 
 &leds {
 	wlan5g {
-		label = "tp-link:green:wlan5g";
+		label = "green:wlan5g";
 		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		linux,default-trigger = "phy0tpt";
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
index 634c23c356..be99b8e3e4 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
@@ -18,7 +18,7 @@
 
 &leds {
 	wlan5g {
-		label = "tp-link:green:wlan5g";
+		label = "green:wlan5g";
 		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		linux,default-trigger = "phy0tpt";
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
index 6d7e0dd5e6..598c5570aa 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
@@ -17,30 +17,30 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:white:system";
+			label = "white:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan {
-			label = "tp-link:white:wlan";
+			label = "white:wlan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:white:lan";
+			label = "white:lan";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 
 		usb {
-			label = "tp-link:white:usb";
+			label = "white:usb";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port1>, <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		qss {
-			label = "tp-link:white:qss";
+			label = "white:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 3e57326e0b..11ebbdacea 100644
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -46,30 +46,30 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g_green {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan2g_red {
-			label = "tp-link:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g_green {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g_red {
-			label = "tp-link:red:wlan5g";
+			label = "red:wlan5g";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 0c11d786c9..55f4edf19e 100644
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -19,39 +19,39 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "tp-link:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan_link {
-			label = "tp-link:green:lan_link";
+			label = "green:lan_link";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 
 		lan_data {
-			label = "tp-link:green:lan_data";
+			label = "green:lan_data";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_blue {
-			label = "tp-link:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps_red {
-			label = "tp-link:red:wps";
+			label = "red:wps";
 			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index 70e14c4ebe..9f241ebc2f 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -21,33 +21,33 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		usb1 {
-			label = "tp-link:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		usb2 {
-			label = "tp-link:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wlan2g {
-			label = "tp-link:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		qss {
-			label = "tp-link:blue:qss";
+			label = "blue:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -56,7 +56,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g {
-			label = "tp-link:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 6173a5ca75..476162a00e 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -18,26 +18,26 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
 		};
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wifi_green {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wifi_wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index 82dee361bc..bbbf69fa59 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -21,19 +21,19 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index 881e3c88ab..871b69af78 100644
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -20,22 +20,22 @@
 		compatible = "gpio-leds";
 
 		power_orange {
-			label = "trendnet:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power_green {
-			label = "trendnet:green:power";
+			label = "green:power";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		planet_green {
-			label = "trendnet:green:planet";
+			label = "green:planet";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		planet_orange {
-			label = "trendnet:orange:planet";
+			label = "orange:planet";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 5dd06803e7..94991a8f49 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -17,43 +17,43 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "nbg6716:white:power";
+			label = "white:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "nbg6716:white:internet";
+			label = "white:internet";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		usb1 {
-			label = "nbg6716:white:usb1";
+			label = "white:usb1";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port1>;
 		};
 
 		usb2 {
-			label = "nbg6716:white:usb2";
+			label = "white:usb2";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port0>;
 		};
 
 		wifi2g {
-			label = "nbg6716:white:wifi2g";
+			label = "white:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5g {
-			label = "nbg6716:white:wifi5g";
+			label = "white:wifi5g";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps {
-			label = "nbg6716:white:wps";
+			label = "white:wps";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index e05f4bb45f..e7e421c076 100644
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -46,34 +46,34 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "fritz4020:green:power";
+			label = "green:power";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan {
-			label = "fritz4020:green:wlan";
+			label = "green:wlan";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "fritz4020:green:lan";
+			label = "green:lan";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "fritz4020:green:wan";
+			label = "green:wan";
 			gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		info {
-			label = "fritz4020:green:info";
+			label = "green:info";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		led_info_red: info_red {
-			label = "fritz4020:red:info";
+			label = "red:info";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 02f54097f3..6659bbe688 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -57,55 +57,55 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan_green {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "tp-link:amber:wan";
+			label = "amber:wan";
 			gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index fe8569c427..4430d05247 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	usb {
-		label = "tp-link:green:usb";
+		label = "green:usb";
 		gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
 		linux,default-trigger = "usbport";
 		trigger-sources = <&hub_port>;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 2d62944421..c407dc3cde 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	usb	{
-		label =	"tp-link:green:usb";
+		label =	"green:usb";
 		gpios =	<&led_gpio 7 GPIO_ACTIVE_LOW>;
 		linux,default-trigger =	"usbport";
 		trigger-sources	= <&hub_port>;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index a5933d27e7..9ba6ccfafd 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -40,40 +40,40 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan_green {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "tp-link:amber:wan";
+			label = "amber:wan";
 			gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
index a46b537d3e..2a6bea30f2 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
@@ -9,12 +9,12 @@
 
 &leds {
 	wan_amber {
-		label = "tp-link:amber:wan";
+		label = "amber:wan";
 		gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 	};
 
 	wps {
-		label = "tp-link:green:wps";
+		label = "green:wps";
 		gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
index 5c8564154c..afef276db2 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
@@ -9,12 +9,12 @@
 
 &leds {
 	wan_amber {
-		label = "tp-link:amber:wan";
+		label = "amber:wan";
 		gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 	};
 
 	wps {
-		label = "tp-link:green:wps";
+		label = "green:wps";
 		gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
index 67cef957c9..cda2a3615b 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	wan_amber {
-		label = "tp-link:amber:wan";
+		label = "amber:wan";
 		gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
index 9c46a1b222..7ba94aa42e 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -34,30 +34,30 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan_green {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
index 0e93e06e2f..21203451cb 100644
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -39,7 +39,7 @@
 		compatible = "gpio-leds";
 
 		led_status: status {
-			label = "tp-link:white:status";
+			label = "white:status";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 077724d4b9..a403877c89 100644
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -36,17 +36,17 @@
 		compatible = "gpio-leds";
 
 		led_red: led_red {
-			label = "mi-router-4q:red:led";
+			label = "red:led";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		led_yellow: led_yellow {
-			label = "mi-router-4q:yellow:led";
+			label = "yellow:led";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		led_blue: led_blue {
-			label = "mi-router-4q:blue:led";
+			label = "blue:led";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
index a85f99881c..913155a0bd 100644
--- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts
+++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
@@ -37,22 +37,22 @@
 		compatible = "gpio-leds";
 
 		sig1 {
-			label = "wpj563:green:sig1";
+			label = "green:sig1";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		sig2 {
-			label = "wpj563:green:sig2";
+			label = "green:sig2";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		sig3 {
-			label = "wpj563:green:sig4";
+			label = "green:sig4";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		led_sig4: sig4 {
-			label = "wpj563:green:sig4";
+			label = "green:sig4";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
index 754d5fad1c..02a3e3e44a 100644
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
@@ -6,6 +6,13 @@
 #include <dt-bindings/input/input.h>
 
 / {
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -21,6 +28,26 @@
 			debounce-interval = <60>;
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "green:power";
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+		};
+
+		wps {
+			label = "green:wps";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan {
+			label = "green:wlan";
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+	};
 };
 
 &uart {
diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
index de7ad15cc7..23f912df32 100644
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
@@ -5,31 +5,4 @@
 / {
 	compatible = "dlink,dir-842-c1", "qca,qca9563";
 	model = "D-Link DIR-842 C1";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "dir-842-c1:green:power";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "dir-842-c1:green:wps";
-			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan {
-			label = "dir-842-c1:green:wlan";
-			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
 };
diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
index de0e554b7b..1a62764a92 100644
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
@@ -5,33 +5,6 @@
 / {
 	compatible = "dlink,dir-842-c2", "qca,qca9563";
 	model = "D-Link DIR-842 C2";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "dir-842-c2:green:power";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "dir-842-c2:green:wps";
-			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan {
-			label = "dir-842-c2:green:wlan";
-			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
 };
 
 &usb_phy0 {
diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
index 6954a330dc..e43113ad5f 100644
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
@@ -5,31 +5,4 @@
 / {
 	compatible = "dlink,dir-842-c3", "qca,qca9563";
 	model = "D-Link DIR-842 C3";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "dir-842-c3:green:power";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-		};
-
-		wps {
-			label = "dir-842-c3:green:wps";
-			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan {
-			label = "dir-842-c3:green:wlan";
-			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
 };
diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
index 0197921ec4..572a0bc6ea 100644
--- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
@@ -20,22 +20,22 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "dir-859-a1:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power: power {
-			label = "dir-859-a1:green:power";
+			label = "green:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet {
-			label = "dir-859-a1:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "dir-859-a1:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
index c4450fea1a..b4f7718230 100644
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
@@ -9,19 +9,19 @@
 
 &leds {
 	led_power: power {
-		label = "elecom:blue:power";
+		label = "blue:power";
 		gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		default-state = "on";
 	};
 
 	wlan2g {
-		label = "elecom:blue:wlan2g";
+		label = "blue:wlan2g";
 		gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		linux,default-trigger = "phy1tpt";
 	};
 
 	wlan5g {
-		label = "elecom:blue:wlan5g";
+		label = "blue:wlan5g";
 		gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		linux,default-trigger = "phy0tpt";
 	};
diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
index 18074c72b4..3af6f59d09 100644
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
@@ -9,13 +9,13 @@
 
 &leds {
 	led_power: power {
-		label = "elecom:white:power";
+		label = "white:power";
 		gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		default-state = "on";
 	};
 
 	wlan2g {
-		label = "elecom:white:wlan2g";
+		label = "white:wlan2g";
 		gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		linux,default-trigger = "phy0tpt";
 	};
diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
index ebe4a0ff52..7efdfa62af 100644
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
@@ -17,7 +17,7 @@
 		compatible = "gpio-leds";
 
 		wps {
-			label = "elecom:red:wps";
+			label = "red:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 762cc895ea..24b0860d7c 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -41,19 +41,19 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "gl-ar750s:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		led_wlan2g: wlan2g {
-			label = "gl-ar750s:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		led_wlan5g: wlan5g {
-			label = "gl-ar750s:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
index d5a14ab470..0f77cfa5f1 100644
--- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
@@ -21,13 +21,13 @@
 		/* other LEDs are connected to ath10k (QCA9888) gpiochip */
 
 		led_power_green: power_green {
-			label = "wg1200cr:green:power";
+			label = "green:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led_power_red: power_red {
-			label = "wg1200cr:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
index 607db3ca22..befd1620e9 100644
--- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
@@ -22,44 +22,44 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		wlan2g_red {
-			label = "wg800hp:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		active_red {
-			label = "wg800hp:red:active";
+			label = "red:active";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		active_green {
-			label = "wg800hp:green:active";
+			label = "green:active";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_red: power_red {
-			label = "wg800hp:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_green: power_green {
-			label = "wg800hp:green:power";
+			label = "green:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan5g_red {
-			label = "wg800hp:red:wlan5g";
+			label = "red:wlan5g";
 			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g_green {
-			label = "wg800hp:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g_green {
-			label = "wg800hp:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 173dfdd557..ca29336147 100644
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -49,34 +49,34 @@
 		pinctrl-0 = <&jtag_disable_pins>;
 
 		led_power_green: power_green {
-			label = "netgear:green:power";
+			label = "green:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_amber: power_amber {
-			label = "netgear:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wan_green {
-			label = "netgear:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_amber {
-			label = "netgear:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g_green {
-			label = "netgear:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wps_green {
-			label = "netgear:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -85,7 +85,7 @@
 		compatible = "gpio-leds";
 
 		wlan5g_blue {
-			label = "netgear:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
index 07e2ad0548..8682413b0b 100644
--- a/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
@@ -9,7 +9,7 @@
 
 &leds {
 	usb_green {
-		label = "netgear:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port0>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
index d5cd01eac4..6e25215501 100644
--- a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
@@ -9,14 +9,14 @@
 
 &leds {
 	usb1_green {
-		label = "netgear:green:usb1";
+		label = "green:usb1";
 		gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port0>;
 		linux,default-trigger = "usbport";
 	};
 
 	usb2_green {
-		label = "netgear:green:usb2";
+		label = "green:usb2";
 		gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port1>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index 94a10d45f7..e89a4de1ee 100644
--- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
@@ -20,17 +20,17 @@
 		compatible = "gpio-leds";
 
 		status_blue {
-			label = "phicomm:blue:status";
+			label = "blue:status";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		led_status_red: status_red {
-			label = "phicomm:red:status";
+			label = "red:status";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		status_yellow {
-			label = "phicomm:yellow:status";
+			label = "yellow:status";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index d37e1aed37..ce73d0838f 100644
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -20,12 +20,12 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "wr818:red:system";
+			label = "red:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi_2g {
-			label = "wr818:red:wifi2g";
+			label = "red:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
index 2ef5bee281..95ac123f48 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -20,55 +20,55 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wifi2g {
-			label = "tp-link:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5g {
-			label = "tp-link:green:wifi5g";
+			label = "green:wifi5g";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wifi_wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
index d09ee56d53..399f410612 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts
@@ -17,40 +17,40 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
index 9f4386c2c2..d00320ad02 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
@@ -17,40 +17,40 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:amber:wan";
+			label = "amber:wan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 5f66570013..77ba6c4ffb 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -57,69 +57,69 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		usb1 {
-			label = "tp-link:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port1>;
 			linux,default-trigger = "usbport";
 		};
 
 		usb2 {
-			label = "tp-link:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
index 7f79165cb4..63c9977c6c 100644
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -18,62 +18,62 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		usb {
-			label = "tp-link:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			trigger-sources = <&hub_port0>;
 			linux,default-trigger = "usbport";
 		};
 
 		wlan5g {
-			label = "tp-link:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan2g {
-			label = "tp-link:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
index 321b6296d1..184c208f58 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
@@ -21,13 +21,13 @@
 		compatible = "gpio-leds";
 
 		led_status_green: status_green {
-			label = "tp-link:green:status";
+			label = "green:status";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
 
 		led_status_amber: status_amber {
-			label = "tp-link:amber:status";
+			label = "amber:status";
 			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
index ed8d90710e..85b9cf6a10 100644
--- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
@@ -19,39 +19,39 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g {
-			label = "tp-link:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wlan5g {
-			label = "tp-link:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		lan_link {
-			label = "tp-link:green:lan_link";
+			label = "green:lan_link";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		lan_data {
-			label = "tp-link:green:lan_data";
+			label = "green:lan_data";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		wps_blue {
-			label = "tp-link:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps_red {
-			label = "tp-link:red:wps";
+			label = "red:wps";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
index 49fa914bd3..0ce1da832c 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
@@ -49,23 +49,23 @@
 		compatible = "gpio-leds";
 
 		led_power: power {
-			label = "tp-link:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi2g {
-			label = "tp-link:green:wifi2g";
+			label = "green:wifi2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
 
 		wifi5g {
-			label = "tp-link:green:wifi5g";
+			label = "green:wifi5g";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
index 2704d4c8cd..b8f48047e2 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
@@ -18,49 +18,49 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "heartbeat";
 		};
 
 		wifi_green {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wifi_wps {
-			label = "tp-link:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		wan {
-			label = "tp-link:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_fail {
-			label = "tp-link:orange:wan";
+			label = "orange:wan";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		lan1 {
-			label = "tp-link:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
index 7603898def..2f2d59ebd3 100644
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -80,7 +80,7 @@
 
 &leds {
 	usb {
-		label = "tp-link:green:usb";
+		label = "green:usb";
 		gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		trigger-sources = <&hub_port0>;
 		linux,default-trigger = "usbport";
diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 51cefa3f34..7a5a957f7b 100644
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -17,12 +17,12 @@
 		compatible = "gpio-leds";
 
 		led_white: led_white {
-			label = "ubnt:white:dome";
+			label = "white:dome";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_blue: led_blue {
-			label = "ubnt:blue:dome";
+			label = "blue:dome";
 			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9563_yuncore_a782.dts b/target/linux/ath79/dts/qca9563_yuncore_a782.dts
index 3774b75365..5a84195bfb 100644
--- a/target/linux/ath79/dts/qca9563_yuncore_a782.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_a782.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "a782:red:system";
+			label = "red:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wlan2g {
-			label = "a782:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
index 5865e9526b..05032fc955 100644
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
@@ -17,13 +17,13 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "xd4200:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wlan2g {
-			label = "xd4200:blue:wlan2g";
+			label = "blue:wlan2g";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy1tpt";
 		};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
index 992c14842b..6b27468551 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
@@ -24,23 +24,23 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:green:system";
+			label = "green:system";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		qss {
-			label = "tp-link:green:qss";
+			label = "green:qss";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "tp-link:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
index dcb450a2d3..5c897b16a0 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -14,49 +14,49 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		qss {
-			label = "tp-link:blue:qss";
+			label = "blue:qss";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan_blue {
-			label = "tp-link:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_red {
-			label = "tp-link:red:wan";
+			label = "red:wan";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan1 {
-			label = "tp-link:blue:lan1";
+			label = "blue:lan1";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:blue:lan2";
+			label = "blue:lan2";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:blue:lan3";
+			label = "blue:lan3";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:blue:lan4";
+			label = "blue:lan4";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
index 88aff2c4cc..21a2be993c 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
@@ -17,49 +17,49 @@
 		compatible = "gpio-leds";
 
 		led_system: system {
-			label = "tp-link:blue:system";
+			label = "blue:system";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		qss {
-			label = "tp-link:blue:qss";
+			label = "blue:qss";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan {
-			label = "tp-link:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
 
 		wan_blue {
-			label = "tp-link:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_red {
-			label = "tp-link:red:wan";
+			label = "red:wan";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan1 {
-			label = "tp-link:blue:lan1";
+			label = "blue:lan1";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		lan2 {
-			label = "tp-link:blue:lan2";
+			label = "blue:lan2";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		lan3 {
-			label = "tp-link:blue:lan3";
+			label = "blue:lan3";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 
 		lan4 {
-			label = "tp-link:blue:lan4";
+			label = "blue:lan4";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
index 5a6e65464a..4334b70ce8 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
@@ -17,12 +17,12 @@
 		compatible = "gpio-leds";
 
 		wan_blue {
-			label = "tp-link:blue:wan";
+			label = "blue:wan";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_diag_orange: diag_orange {
-			label = "tp-link:orange:diag";
+			label = "orange:diag";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 			default-state = "on";
 		};
diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
index 02bdbb8476..04711541c3 100644
--- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
@@ -2,12 +2,8 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
-arduino,yun)
-	migrate_leds "arduino:=yun:"
-	;;
 dlink,dap-1330-a1)
 	migrate_leds ":red:power=:red:status" \
 		":red:wifi=:red:rssilow" \
@@ -29,32 +25,13 @@ tplink,tl-wdr4300-v1-il|\
 tplink,tl-wdr4310-v1)
 	migrate_leds ":blue:=:green:"
 	;;
-tplink,archer-c25-v1|\
-tplink,archer-c58-v1|\
-tplink,archer-c59-v1|\
-tplink,archer-c59-v2|\
-tplink,archer-c60-v1|\
-tplink,archer-c60-v2|\
-tplink,archer-c7-v4|\
-tplink,archer-c7-v5|\
-tplink,tl-wr902ac-v1)
-	migrate_leds "^$boardonly:=tp-link:"
-	;;
-tplink,re355-v1)
-	migrate_leds "re355:=tp-link:"
-	;;
-tplink,re450-v1)
-	migrate_leds "re450:=tp-link:"
-	;;
 tplink,tl-wpa8630-v1)
-	migrate_leds "^tl-wpa8630:=tp-link:" \
-		':wlan$=:wifi2g' ':wlan5$=:wifi5g'
-	;;
-wd,mynet-n750)
-	migrate_leds "wd:=mynet-n750:"
+	migrate_leds ':wlan$=:wifi2g' ':wlan5$=:wifi5g'
 	;;
 esac
 
+remove_board_leds
+
 migrations_apply system
 
 exit 0
diff --git a/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
index c12a7ac02c..4d9a6d11a9 100644
--- a/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
@@ -2,14 +2,12 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
-mikrotik,*)
-	migrate_leds "^rb:=mikrotik:"
-	;;
 esac
 
+remove_board_leds
+
 migrations_apply system
 
 exit 0
diff --git a/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration
new file mode 100644
index 0000000000..4d9a6d11a9
--- /dev/null
+++ b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration
@@ -0,0 +1,13 @@
+. /lib/functions.sh
+. /lib/functions/migrations.sh
+
+board=$(board_name)
+
+case "$board" in
+esac
+
+remove_board_leds
+
+migrations_apply system
+
+exit 0
diff --git a/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
index 377135f530..07ec5848e1 100644
--- a/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
@@ -2,17 +2,15 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
 tplink,tl-wr802n-v1)
 	migrate_leds ":blue:=:green:"
 	;;
-tplink,tl-wr802n-v2)
-	migrate_leds "^$boardonly:=tp-link:"
-	;;
 esac
 
+remove_board_leds
+
 migrations_apply system
 
 exit 0
