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 4e52e30b9ddc6c743bad3e799b81f12a8096bbf5..4d7a545665fde2f033ac91979b7b9ec0ea42cbe0 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
@@ -21,36 +21,31 @@
 		#size-cells = <0>;
 
 		poll-interval = <20>;
-		button@0 {
-			label = "usb";
+		usb {
 			linux,code = <BTN_2>;
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
 
-		button@1 {
-			label = "reset";
+		reset {
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
 
-		button@2 {
-			label = "movie_engine";
+		movie_engine {
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
 			debounce-interval = <60>;
 		};
 
-		button@3 {
-			label = "aoss";
+		aoss {
 			linux,code = <KEY_WPS_BUTTON>;
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
 
-		button@4 {
-			label = "router_off";
+		router_off {
 			linux,code = <BTN_5>;
 			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 			debounce-interval = <60>;
@@ -60,12 +55,12 @@
 
 	leds {
 		compatible = "gpio-leds";
-		led@0 {
+		security {
 			label = "buffalo:orange:security";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
-		led@1 {
+		diag {
 			label = "buffalo:red:diag";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
@@ -120,7 +115,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0000 {
+	ath9k@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};