diff --git a/config/ap.nix b/config/ap.nix
index 6cb2b37..9b53ed3 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -23,7 +23,7 @@
         priv6 = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -87,7 +87,7 @@
         priv8 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -155,7 +155,7 @@
         priv10 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -224,7 +224,7 @@
         priv9 = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -355,7 +355,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-b1 = {
+        switch-b3 = {
           ports = [ "lan" ];
         };
       };
@@ -395,7 +395,7 @@
         priv12 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -427,7 +427,7 @@
         priv12 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -490,7 +490,7 @@
         pub = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -547,7 +547,7 @@
         priv13 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -630,7 +630,7 @@
         priv14 = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -698,7 +698,7 @@
         pub.type = "bridge";
       };
       links = {
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "lan" ];
         };
       };
@@ -805,7 +805,7 @@
         priv18 = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -837,7 +837,7 @@
         pub = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -869,7 +869,7 @@
         priv19 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -952,7 +952,7 @@
         pub = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -984,7 +984,7 @@
         priv4 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1017,7 +1017,7 @@
         priv22 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1057,7 +1057,7 @@
         priv26 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1100,7 +1100,7 @@
         priv4 = {
           ports = [ "lan:1" "lan:2" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1365,7 +1365,7 @@
         priv5 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1436,7 +1436,7 @@
         priv17 = {
           ports = [ "lan" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1513,7 +1513,7 @@
         priv11 = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1545,7 +1545,7 @@
         priv35 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1585,7 +1585,7 @@
         priv6 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1625,7 +1625,7 @@
         priv6 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1790,7 +1790,7 @@
         pub = {
           ports = [ "lan:4" "lan:3" "lan:2" "lan:1" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1819,7 +1819,7 @@
         priv35 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b2 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };
@@ -1896,7 +1896,7 @@
         c3d2 = {
           ports = [ "lan:1" "lan:2" "lan:3" "lan:4" ];
         };
-        switch-b1 = {
+        switch-b3 = {
           ports = [ "wan" ];
         };
       };