diff --git a/hosts/fw.cloonar.com/modules/firewall.nix b/hosts/fw.cloonar.com/modules/firewall.nix
index 1644008..74f0fda 100644
--- a/hosts/fw.cloonar.com/modules/firewall.nix
+++ b/hosts/fw.cloonar.com/modules/firewall.nix
@@ -44,7 +44,7 @@
             iifname "multimedia" oifname { "lan" } counter accept
 
             # lan and vpn to any
-            iifname { "lan", "wg_cloonar" } oifname { "server", "multimedia", "smart", "wrwks", "wg_epicenter_works", "wg_ghetto_at" } counter accept
+            iifname { "lan", "wg_cloonar" } oifname { "server", "multimedia", "smart", "wrwks", "wg_epicenter", "wg_ghetto_at" } counter accept
 
             # Allow trusted network WAN access
             iifname {
@@ -78,7 +78,7 @@
           # Setup NAT masquerading on the ppp0 interface
           chain postrouting {
             type nat hook postrouting priority filter; policy accept;
-            oifname { "wan", "wrwks", "wg_epicenter_works", "wg_ghetto_at" } masquerade
+            oifname { "wan", "wrwks", "wg_epicenter", "wg_ghetto_at" } masquerade
           }
         }
       '';
diff --git a/hosts/fw.cloonar.com/modules/wireguard.nix b/hosts/fw.cloonar.com/modules/wireguard.nix
index fe4f47a..575b04a 100644
--- a/hosts/fw.cloonar.com/modules/wireguard.nix
+++ b/hosts/fw.cloonar.com/modules/wireguard.nix
@@ -21,7 +21,7 @@
         }
       ];
     };
-    wg_epicenter_works = {
+    wg_epicenter = {
       ips = [ "10.50.60.6/32" ];
       privateKeyFile = config.sops.secrets.wg_epicenter_works_key.path;
       peers = [