diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 1cb45e6afcbc579a8a47866fcc14825ab24b6979..bb42017c5417e159f7a7c614c53a68946ddbe079 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -27,8 +27,7 @@
 		#size-cells = <0>;
 
 		poll-interval = <20>;
-		button@0 {
-			label = "reset";
+		reset {
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
@@ -37,12 +36,12 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led@0 {
+		dome-green {
 			label = "ubnt:green:dome";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
-		led@1 {
+		dome-orange {
 			label = "ubnt:orange:dome";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
@@ -113,7 +112,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0000 {
+	ath9k@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index bea9adc5d4cc6ce9d72950387cbe4e817953eb4a..4c46176f959893ffe72480a1e016660ad52edf8c 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -26,8 +26,7 @@
 		#size-cells = <0>;
 
 		poll-interval = <20>;
-		button@0 {
-			label = "reset";
+		reset {
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
@@ -36,22 +35,22 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led@0 {
+		link1 {
 			label = "ubnt:red:link1";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 
-		led@1 {
+		link2 {
 			label = "ubnt:orange:link2";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
-		led@2 {
+		link3 {
 			label = "ubnt:green:link3";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
-		led@3 {
+		link4 {
 			label = "ubnt:green:link4";
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 		};
@@ -122,7 +121,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0000 {
+	ath9k@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};