diff --git a/bsp/default/root_file_system/etc/config/network b/bsp/default/root_file_system/etc/config/network
index 6ecaf20..874ae05 100644
--- a/bsp/default/root_file_system/etc/config/network
+++ b/bsp/default/root_file_system/etc/config/network
@@ -4,7 +4,7 @@ config interface 'loopback'
         option ipaddr '127.0.0.1'
         option netmask '255.0.0.0'
 
-config interface 'wlanmesh'
+config interface 'w2mesh'
         option mtu '1532'
         option proto 'batadv'
         option mesh 'bat0'
diff --git a/bsp/default/root_file_system/etc/config/wireless.tpl b/bsp/default/root_file_system/etc/config/wireless.tpl
index 80f5018..25596a5 100644
--- a/bsp/default/root_file_system/etc/config/wireless.tpl
+++ b/bsp/default/root_file_system/etc/config/wireless.tpl
@@ -6,7 +6,8 @@ config wifi-device  radio0
 
 config wifi-iface
         option device   radio0
-        option network  wlanmesh
+        option network  w2mesh
+        option ifname   w2mesh
         option mode     adhoc
         option bssid    '${BSSID_MESH}'
         option ssid     '${ESSID_MESH}'
@@ -18,6 +19,7 @@ config wifi-iface
 config wifi-iface
         option device   radio0
         option network  mesh
+        option ifname   w2ap
         option mode     ap
         option ssid     '${ESSID_AP}'
         option 'encryption' 'none'
diff --git a/bsp/wr1043nd/root_file_system/etc/network.wr1043nd-v1 b/bsp/wr1043nd/root_file_system/etc/network.wr1043nd-v1
index 230e7a7..21be7db 100644
--- a/bsp/wr1043nd/root_file_system/etc/network.wr1043nd-v1
+++ b/bsp/wr1043nd/root_file_system/etc/network.wr1043nd-v1
@@ -5,6 +5,6 @@ CLIENT_PORTS="3 4 5t"
 WAN_PORTS="0 5t"
 BATMAN_PORTS="1 2 5t"
 
-CLIENTIF="eth0.1 wlan0"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=
 ROUTERMAC=
diff --git a/bsp/wr740n/root_file_system/etc/network.wr740n-v4 b/bsp/wr740n/root_file_system/etc/network.wr740n-v4
index 5156d16..d1d29d0 100644
--- a/bsp/wr740n/root_file_system/etc/network.wr740n-v4
+++ b/bsp/wr740n/root_file_system/etc/network.wr740n-v4
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
-CLIENTIF="eth0.1 wlan0-1"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=wlan0
diff --git a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2
index 73705ed..cd75ea3 100644
--- a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2
+++ b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 wlan0-1"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=wlan0
diff --git a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4
index 5156d16..d1d29d0 100644
--- a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4
+++ b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
-CLIENTIF="eth0.1 wlan0-1"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=wlan0
diff --git a/bsp/wr841/root_file_system/etc/network.tl-wr841n-v8 b/bsp/wr841/root_file_system/etc/network.tl-wr841n-v8
index 288c85c..4b7dc96 100644
--- a/bsp/wr841/root_file_system/etc/network.tl-wr841n-v8
+++ b/bsp/wr841/root_file_system/etc/network.tl-wr841n-v8
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 4 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 2 0t"
 
-CLIENTIF="eth1.1 wlan0-1"
+CLIENTIF="eth1.1 w2ap"
 ETHMESHMAC=eth0
 ROUTERMAC=wlan0
diff --git a/bsp/wr841/root_file_system/etc/network.tl-wr841n-v9 b/bsp/wr841/root_file_system/etc/network.tl-wr841n-v9
index 44256d4..02cefd8 100644
--- a/bsp/wr841/root_file_system/etc/network.tl-wr841n-v9
+++ b/bsp/wr841/root_file_system/etc/network.tl-wr841n-v9
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 wlan0-1"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=eth0
diff --git a/bsp/wr841/root_file_system/etc/network.tl-wr841nd-v7 b/bsp/wr841/root_file_system/etc/network.tl-wr841nd-v7
index 73705ed..cd75ea3 100644
--- a/bsp/wr841/root_file_system/etc/network.tl-wr841nd-v7
+++ b/bsp/wr841/root_file_system/etc/network.tl-wr841nd-v7
@@ -6,6 +6,6 @@ CLIENT_PORTS="1 2 0t"
 WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
-CLIENTIF="eth0.1 wlan0-1"
+CLIENTIF="eth0.1 w2ap"
 ETHMESHMAC=eth1
 ROUTERMAC=wlan0