diff --git a/config/net/c3d2iot.nix b/config/net/c3d2iot.nix
index e4b4e6d..2e81db2 100644
--- a/config/net/c3d2iot.nix
+++ b/config/net/c3d2iot.nix
@@ -3,19 +3,19 @@
     dhcp = {
       start = "10.22.0.2";
       end = "10.22.255.253";
-      router = "c3d2iot-gw";
-      server = "c3d2iot-gw";
+      router = "iot-gw";
+      server = "iot-gw";
       time = 120;
       max-time = 12 * 3600;
     };
     dynamicDomain = true;
     domainName = "c3d2iot.zentralwerk.org";
     hosts4 = {
-      c3d2iot-gw = "10.22.0.1";
+      iot-gw = "10.22.0.1";
     };
     hosts6 = {
       dn42 = {
-        c3d2iot-gw = "fd23:42:c3d2:587:ffff:ffff:ffff:ffff";
+        iot-gw = "fd23:42:c3d2:587:ffff:ffff:ffff:ffff";
       };
     };
     subnet4 = "10.22.0.0/16";
@@ -25,7 +25,7 @@
     };
   };
 
-  site.hosts.c3d2iot-gw = {
+  site.hosts.iot-gw = {
     firewall.enable = true;
     interfaces = {
       core = {
diff --git a/config/net/core.nix b/config/net/core.nix
index 349818b..7d161ec 100644
--- a/config/net/core.nix
+++ b/config/net/core.nix
@@ -74,7 +74,7 @@
       coloradio-gw = "172.20.72.62";
       vpn-gw = "172.20.72.69";
       flpk-gw = "172.20.72.71";
-      c3d2iot-gw = "172.20.72.77";
+      iot-gw = "172.20.72.77";
     };
     hosts6 = {
       dn42 = {
@@ -87,7 +87,7 @@
         cls-gw = "fd23:42:c3d2:581::c3d2:4";
         freifunk = "fd23:42:c3d2:581:8000::1";
         mgmt-gw = "fd23:42:c3d2:581::8:3";
-        c3d2iot-gw = "fd23:42:c3d2:581::8:7";
+        iot-gw = "fd23:42:c3d2:581::8:7";
         priv1-gw = "fd23:42:c3d2:581::c:0";
         priv10-gw = "fd23:42:c3d2:581::c:9";
         priv11-gw = "fd23:42:c3d2:581::c:a";
@@ -154,7 +154,7 @@
         cls-gw = "2a00:8180:2c00:281::8:4";
         freifunk = "2a00:8180:2c00:281:8000::1";
         mgmt-gw = "2a00:8180:2c00:281::8:3";
-        c3d2iot-gw = "2a00:8180:2c00:281::8:7";
+        iot-gw = "2a00:8180:2c00:281::8:7";
         priv1-gw = "2a00:8180:2c00:281::c:0";
         priv10-gw = "2a00:8180:2c00:281::c:9";
         priv11-gw = "2a00:8180:2c00:281::c:a";