Index: /nodes/CNodeGrip/wleiden.conf
===================================================================
--- /nodes/CNodeGrip/wleiden.conf	(revision 9853)
+++ /nodes/CNodeGrip/wleiden.conf	(revision 9854)
@@ -36,21 +36,21 @@
 DHCP=no
 NS_IP=172.16.16.59/29
-NS_MAC= 00:15:6D:70:50:09
+NS_MAC=00:15:6D:70:50:09
 VR0
 
 $config{'vr1'}=sprintf <<VR1;
-COMMENT=Link naar ROCl
+COMMENT=Link naar ROC2
 TYPE=ethernet
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.254/30
-DESC=Link naar ROCl
-SDESC=2rocl
+IP=172.16.5.29/29
+DESC=Link naar ROC2
+SDESC=2roc2
 MODE=managed
-ESSID=il-nw.rocl.wleiden.net
-CHANNEL=11
+ESSID=il-nw.roc2.wleiden.net
+CHANNEL=52
 DHCP=no
-BulletIP=192.168.1.20/24
-BulletMAC=00:15:6D:AD:34:35
+Bullet2_IP=192.168.1.20/24
+Bullet2_MAC=00:15:6D:AD:34:35
 VR1
 
@@ -67,6 +67,6 @@
 CHANNEL=8
 DHCP=no
-BulletIP=192.168.1.20/24
-BulletMAC=00:15:6D:30:29:6B
+Bullet2_IP=192.168.1.20/24
+Bullet2_MAC=00:15:6D:30:29:6B
 VR2
 
Index: /nodes/CNodeIMI/wleiden.conf
===================================================================
--- /nodes/CNodeIMI/wleiden.conf	(revision 9853)
+++ /nodes/CNodeIMI/wleiden.conf	(revision 9854)
@@ -29,11 +29,13 @@
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.93/30
+172.16.5.244/29
 DHCP=no
 DESC=Link naar rijnvliet
 SDESC=2rijnvliet
-MODE=managed
+MODE=bridge station
 ESSID=il-no.rv.wleiden.net
 CHANNEL=60
-NS_MAC=00:15:6D:
+NS_MAC=00:15:6D:EC:81:EE
+NS_IP=172.16.5.243/29
 VR0
 
@@ -59,5 +61,5 @@
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.249/30
+IP=172.16.5.249/29
 DHCP=no
 DESC=b-Link naar Grip
@@ -66,5 +68,6 @@
 ESSID=il-zo.imi.wleiden.net
 CHANNEL=4
-BulletMAC=00:15:6D:
+Bullet2_MAC=00:15:6D:E8:F9:DE
+Bullet2_IP=172.16.5.250/29
 VR2
 
@@ -94,6 +97,6 @@
 SDESC=2lvlz
 DHCP=no
-Bullet2MAC=00:15:6D:E8:F9:B8
-BulletIP=172.16.5.2/29
+Bullet2_MAC=00:15:6D:E8:F9:B8
+Bullet2_IP=172.16.5.2/29
 UE1
 
Index: /nodes/CNodeRV/wleiden.conf
===================================================================
--- /nodes/CNodeRV/wleiden.conf	(revision 9853)
+++ /nodes/CNodeRV/wleiden.conf	(revision 9854)
@@ -38,5 +38,5 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.94/30
+IP=172.16.5.241/29
 DHCP=no
 DESC=Link naar IMI
@@ -46,4 +46,5 @@
 CHANNEL=60
 NS_MAC=00:15:6D:ED:82:7C
+NS_IP=172.16.5.242/29
 VR1
 
Index: /nodes/CNodeWBRotary/wleiden.conf
===================================================================
--- /nodes/CNodeWBRotary/wleiden.conf	(revision 9853)
+++ /nodes/CNodeWBRotary/wleiden.conf	(revision 9854)
@@ -35,5 +35,5 @@
 ESSID=il-w.wbrotary.wleiden.net
 CHANNEL=36
-BulletM5_MAC=00:15:6D:8E:DB:BB
+BulletM5_MAC=00:27:22:10:34:C6
 BulletM5_IP=172.16.18.42/29
 VR0
@@ -65,6 +65,6 @@
 MODE=master
 ESSID=ap-Woubrugge-RotaryWO
-BULLETIP=172.25.56.2
-BULLETMAC=00:15:6D:30:2A:5D
+BULLET2_IP=172.25.56.2
+BULLET2_MAC=00:15:6D:30:2A:5D
 CHANNEL=3
 VR2