diff --git a/config/hosts/athame/nixos/default.nix b/config/hosts/athame/nixos/default.nix
index b1c55689..b37f7654 100644
--- a/config/hosts/athame/nixos/default.nix
+++ b/config/hosts/athame/nixos/default.nix
@@ -57,7 +57,7 @@ with lib;
   };
 
   kw.fw.public.interfaces = singleton "enp1s0";
-  kw.fw.private.interfaces = singleton "hexnet";
+  kw.fw.private.interfaces = singleton "yggdrasil";
 
   kw.fw.public.tcp.ports = singleton 52969;
 
@@ -68,7 +68,7 @@ with lib;
       (lib.head config.networking.interfaces.enp1s0.ipv6.addresses).address;
   };
 
-  hexchen.network = {
+  network.yggdrasil = {
     enable = true;
     pubkey = "55e3f29c252d16e73ac849a6039824f94df1dee670c030b9e29f90584f935575";
     listen.enable = true;
diff --git a/config/hosts/dummy/nixos/default.nix b/config/hosts/dummy/nixos/default.nix
index b4f7c411..9ad26595 100644
--- a/config/hosts/dummy/nixos/default.nix
+++ b/config/hosts/dummy/nixos/default.nix
@@ -5,7 +5,7 @@ with lib;
 let
   hexchen = (import sources.hexchen) { };
   hexYgg = filterAttrs (_: c: c.enable)
-    (mapAttrs (_: host: host.config.hexchen.network) hexchen.hosts);
+    (mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
 in
 {
   # stuff so dummy host is buildable (you probably don't want/need this???)
@@ -14,7 +14,7 @@ in
   networking.useDHCP = false;
   users.users.root.hashedPassword = "";
 
-  hexchen.network = {
+  network.yggdrasil = {
     enable = true;
     pubkey = "0000000000000000000000000000000000000000000000000000000000000000";
     listen.enable = true;
diff --git a/config/hosts/samhain/nixos/default.nix b/config/hosts/samhain/nixos/default.nix
index 5071ba69..5bf6389d 100644
--- a/config/hosts/samhain/nixos/default.nix
+++ b/config/hosts/samhain/nixos/default.nix
@@ -5,7 +5,7 @@ with lib;
 let
   hexchen = (import sources.hexchen) { };
   hexYgg = filterAttrs (_: c: c.enable)
-    (mapAttrs (_: host: host.config.hexchen.network) hexchen.hosts);
+    (mapAttrs (_: host: host.config.network.yggdrasil) hexchen.hosts);
 in
 {
   imports = [
@@ -75,7 +75,7 @@ in
   #  package = pkgs.ckb-next;
   #};
 
-  kw.fw.private.interfaces = singleton "hexnet";
+  kw.fw.private.interfaces = singleton "yggdrasil";
   kw.fw.public.interfaces = singleton "br";
 
   hardware.openrazer = {
@@ -129,7 +129,7 @@ in
 
   services.avahi.enable = true;
 
-  hexchen.network = {
+  network.yggdrasil = {
     enable = true;
     pubkey = "a7110d0a1dc9ec963d6eb37bb6922838b8088b53932eae727a9136482ce45d47";
     # if server, enable this and set endpoint:
diff --git a/config/hosts/yule/nixos/default.nix b/config/hosts/yule/nixos/default.nix
index b71a4597..517fe5f9 100644
--- a/config/hosts/yule/nixos/default.nix
+++ b/config/hosts/yule/nixos/default.nix
@@ -29,7 +29,7 @@ with lib;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.supportedFilesystems = [ "zfs" ];
 
-  kw.fw.private.interfaces = singleton "hexnet";
+  kw.fw.private.interfaces = singleton "yggdrasil";
   kw.fw.public.interfaces = [ "enp1s0" "wlp2s0" ];
 
   networking.hostId = "dddbb888";
@@ -39,7 +39,7 @@ with lib;
   networking.interfaces.enp1s0.useDHCP = true;
   networking.interfaces.wlp2s0.useDHCP = true;
 
-  hexchen.network = {
+  network.yggdrasil = {
     enable = true;
     pubkey = "9779fd6b5bdba6b9e0f53c96e141f4b11ce5ef749d1b9e77a759a3fdbd33a653";
     # if server, enable this and set endpoint:
diff --git a/config/modules/nixos/default.nix b/config/modules/nixos/default.nix
index 08df897d..6a3ceb65 100644
--- a/config/modules/nixos/default.nix
+++ b/config/modules/nixos/default.nix
@@ -7,7 +7,7 @@
     ./deploy-tf.nix
     (sources.tf-nix + "/modules/nixos/secrets.nix")
     (sources.tf-nix + "/modules/nixos/secrets-users.nix")
-    (sources.hexchen + "/modules/hexnet")
+    (sources.hexchen + "/modules/network/yggdrasil")
   ];
 
   # stubs for hexchens modules, until more generalized
diff --git a/config/modules/nixos/deploy-tf.nix b/config/modules/nixos/deploy-tf.nix
index a10ae85b..9f9365df 100644
--- a/config/modules/nixos/deploy-tf.nix
+++ b/config/modules/nixos/deploy-tf.nix
@@ -67,10 +67,10 @@ in
           };
 
         dns.records."kittywitch_net_${config.networking.hostName}" =
-          mkIf (config.hexchen.network.enable) {
+          mkIf (config.network.yggdrasil.enable) {
             tld = "kittywit.ch.";
             domain = "${config.networking.hostName}.net";
-            aaaa.address = config.hexchen.network.address;
+            aaaa.address = config.network.yggdrasil.address;
           };
 
       } ++ mapAttrsToList
@@ -79,7 +79,7 @@ in
       config.home-manager.users);
 
     security.acme.certs."${config.networking.hostName}.net.kittywit.ch" =
-      mkIf (config.services.nginx.enable && config.hexchen.network.enable) {
+      mkIf (config.services.nginx.enable && config.network.yggdrasil.enable) {
         domain = "${config.networking.hostName}.net.kittywit.ch";
         dnsProvider = "rfc2136";
         credentialsFile = config.secrets.files.dns_creds.path;
diff --git a/nix/sources.json b/nix/sources.json
index 3ce70a54..df183198 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "ref": "main",
         "repo": "https://gitlab.com/hexchen/nixfiles",
-        "rev": "22f97ad0ed80ef2fa1744350bf7819e7ba5d4f57",
-        "sha256": "0nvlx6bmlz44afdr16r4rs6xh1sr4h6rfi83c0l9kdqmx9lrrj8c",
+        "rev": "447d63be2c37cc88d4cb5d4943ba6960bfdbc7c8",
+        "sha256": "188sf7nsxsb0a50a1v42cba9zrabgfvyzbak3dn1yiy8787gygb6",
         "type": "tarball",
-        "url": "https://gitlab.com/hexchen/nixfiles/-/archive/22f97ad0ed80ef2fa1744350bf7819e7ba5d4f57.tar.gz",
+        "url": "https://gitlab.com/hexchen/nixfiles/-/archive/447d63be2c37cc88d4cb5d4943ba6960bfdbc7c8.tar.gz",
         "url_template": "<repo>/-/archive/<rev>.tar.gz"
     },
     "home-manager": {