diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi b/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi
index a372c6befaf..72f1392b403 100644
--- a/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-wa933-common.dtsi
@@ -86,6 +86,7 @@
 		/* WAN */
 		compatible = "mediatek,eth-mac";
 		reg = <1>;
+		openwrt,netdev-name = "wan";
 		phy-mode = "gmii";
 		phy-handle = <&int_gbe_phy>;
 		nvmem-cells = <&macaddr_factory_e000 1>;
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index 6d832722380..7f32905a23c 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -44,7 +44,7 @@ comfast,cf-wa933|\
 comfast,cf-wa933-128m)
 	ucidef_set_led_netdev "lan1" "lan1" "blue:lan-1" "lan1" "link tx rx"
 	ucidef_set_led_netdev "lan2" "lan2" "blue:lan-2" "lan2" "link tx rx"
-	ucidef_set_led_netdev "wan" "wan" "blue:wan" "eth1" "link tx rx"
+	ucidef_set_led_netdev "wan" "wan" "blue:wan" "wan" "link tx rx"
 	;;
 confiabits,mt7981)
 	ucidef_set_led_netdev "lan1" "lan1" "blue:lan-1" "lan1" "link tx rx"
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 73d929f6f6f..f6151306621 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -41,7 +41,9 @@ mediatek_setup_interfaces()
 	acer,vero-w6m)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" internet
 		;;
-	airtel,aap4221zy)
+	airtel,aap4221zy|\
+	comfast,cf-wa933|\
+	comfast,cf-wa933-128m)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" wan
 		;;
 	arcadyan,mozart)
@@ -135,10 +137,6 @@ mediatek_setup_interfaces()
 	comfast,cf-e393ax)
 		ucidef_set_interfaces_lan_wan "lan1" eth1
 		;;
-	comfast,cf-wa933|\
-	comfast,cf-wa933-128m)
-		ucidef_set_interfaces_lan_wan "lan1 lan2" eth1
-		;;
 	cudy,ap3000wall-v1)
 		ucidef_set_interface_lan "lan1 lan2 lan3 lan4 lan5"
 		;;