diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index dc66be7..b4a54d9 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -58,7 +58,7 @@ cpe:
 
     model: TL-Archer-C7v2
     location: C3D2 Main
-    lan-access: priv1
+    lan-access: c3d2
     radios:
       'platform/qca955x_wmac':
         channel: 1
@@ -67,7 +67,7 @@ cpe:
           'ZW public':
             net: pub
           'C3D2 legacy':
-            net: priv1
+            net: c3d2
             psk: |
               -----BEGIN PGP MESSAGE-----
               
@@ -88,7 +88,7 @@ cpe:
           'ZW public':
             net: pub
           'C3D2':
-            net: priv1
+            net: c3d2
             psk: |
               -----BEGIN PGP MESSAGE-----
               
@@ -120,7 +120,7 @@ cpe:
 
     model: TL-WDR4300
     location: C3D2 Kammer
-    lan-access: priv1
+    lan-access: c3d2
     radios:
       'platform/ar934x_wmac':
         channel: 13
@@ -129,7 +129,7 @@ cpe:
           'ZW public':
             net: pub
           'C3D2 legacy':
-            net: priv1
+            net: c3d2
             psk: |
               -----BEGIN PGP MESSAGE-----
               
@@ -150,7 +150,7 @@ cpe:
           'ZW public':
             net: pub
           'C3D2':
-            net: priv1
+            net: c3d2
             psk: |
               -----BEGIN PGP MESSAGE-----
               
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index c1a6fbc..a9103b4 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -55,8 +55,6 @@ switches:
           - mgmt
           - pub
           - c3d2
-          # obsolete:
-          - priv1
       ap3:
         mode: trunk
         ports:
@@ -65,8 +63,6 @@ switches:
           - mgmt
           - pub
           - c3d2
-          # obsolete:
-          - priv1
       ap4:
         mode: trunk
         ports:
@@ -135,6 +131,7 @@ switches:
           - pub
           - core
           - serv
+          - c3d2
           - up1
           - up2
           - up3