Index: nodes/CNodeZwaluwak/wleiden.conf
===================================================================
--- nodes/CNodeZwaluwak/wleiden.conf	(revision 10047)
+++ nodes/CNodeZwaluwak/wleiden.conf	(revision 10053)
@@ -43,6 +43,6 @@
 SDESC=2unused
 DHCP=no
-Bullet2_IP=172.16.6.74/29
-Bullet2_MAC=00:15:6D:E8:E7:4A
+NS_IP=172.16.6.74/29
+NS_MAC=00:15:6D:E8:E7:4A
 MODE=managed
 ESSID=effeniks
@@ -58,6 +58,6 @@
 DESC=Link naar BCsSte
 SDESC=2bcste
-Bullet_IP=172.16.3.252/29
-BulletMAC=00:15:6D:E8:E6:A3
+NS_IP=172.16.3.252/29
+NS_MAC=00:15:6D:E8:E6:A3
 MODE=managed
 ESSID=il-nw.bcste.wleiden.net
@@ -69,10 +69,9 @@
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
-SUBTYPE=802.11a
 IP=172.16.3.70/30
 DESC=A Link naar Unigor
 SDESC=2unigor
 DHCP=no
-AIRLIVE_IP=192.168.1.21
+NS_IP=192.168.1.21
 MODE=managed
 ESSID=ilA-z.unigor.wleiden.net