diff --git a/common/net.nix b/common/net.nix
index 6e5d5bf..51f80f4 100644
--- a/common/net.nix
+++ b/common/net.nix
@@ -73,7 +73,7 @@
       10.0.40.106             xeon06-ipmi0
       
       # Node Entry for node: xeon07 (ID=21)
-      10.0.40.7               xeon07 xeon07-eth0
+      10.0.40.7               xeon07 xeon07-eth0 hut
       10.0.42.7               xeon07-ib0
       10.0.40.107             xeon07-ipmi0
       
diff --git a/common/slurm.nix b/common/slurm.nix
index e4890e3..2da5a02 100644
--- a/common/slurm.nix
+++ b/common/slurm.nix
@@ -3,7 +3,7 @@
 {
   services.slurm = {
     client.enable = true;
-    controlMachine = "xeon07";
+    controlMachine = "hut";
     clusterName = "owl";
     nodeName = [
       "xeon[01-02,07]  Sockets=2 CoresPerSocket=14 ThreadsPerCore=2 Feature=xeon"
diff --git a/doc/install.md b/doc/install.md
index 41e7684..8eae8c7 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -32,19 +32,19 @@ sdX
 
 ## Prepare nix and nixos-install
 
-Mount the nix store from the xeon07 node in read-only /nix.
+Mount the nix store from the hut node in read-only /nix.
 
 ```
 # mkdir /nix
-# mount -o ro xeon07:/nix /nix
+# mount -o ro hut:/nix /nix
 ```
 
-Get the nix binary and nixos-install tool from xeon07:
+Get the nix binary and nixos-install tool from hut:
 
 ```
-# ssh xeon07 'readlink -f $(which nix)'
+# ssh hut 'readlink -f $(which nix)'
 /nix/store/0sxbaj71c4c4n43qhdxm31f56gjalksw-nix-2.13.3/bin/nix
-# ssh xeon07 'readlink -f $(which nixos-install)'
+# ssh hut 'readlink -f $(which nixos-install)'
 /nix/store/9yq8ps06ysr2pfiwiij39ny56yk3pdcs-nixos-install/bin/nixos-install
 ```
 
diff --git a/flake.nix b/flake.nix
index e07bff9..d3fc4ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,7 @@
           ./xeon02/configuration.nix
         ];
       };
-      xeon07 = nixpkgs.lib.nixosSystem {
+      hut = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ( {options, ...}: {
@@ -61,7 +61,7 @@
             nix.nixPath = [
                 "nixpkgs=${nixpkgs}"
                 "bscpkgs=${bscpkgs}"
-                "nixos-config=${self.outPath}/xeon07/configuration.nix"
+                "nixos-config=${self.outPath}/hut/configuration.nix"
                 "nixpkgs-overlays=${self.outPath}/overlays-compat"
             ];
             nix.registry.nixpkgs.flake = nixpkgs;
@@ -72,7 +72,7 @@
               else throw ("Refusing to build from a dirty Git tree!");
           })
           agenix.nixosModules.default
-          ./xeon07/configuration.nix
+          ./hut/configuration.nix
         ];
       };
       xeon08 = nixpkgs.lib.nixosSystem {
diff --git a/xeon07/configuration.nix b/hut/configuration.nix
similarity index 95%
rename from xeon07/configuration.nix
rename to hut/configuration.nix
index f3b6ab4..423b18d 100644
--- a/xeon07/configuration.nix
+++ b/hut/configuration.nix
@@ -14,7 +14,7 @@
   boot.loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2BB240G7_PHDV6462004Y240AGN";
 
   networking = {
-    hostName = "xeon07";
+    hostName = "hut";
     interfaces.eno1.ipv4.addresses = [ {
       address = "10.0.40.7";
       prefixLength = 24;
diff --git a/xeon07/gitlab-runner.nix b/hut/gitlab-runner.nix
similarity index 100%
rename from xeon07/gitlab-runner.nix
rename to hut/gitlab-runner.nix
diff --git a/xeon07/monitoring.nix b/hut/monitoring.nix
similarity index 100%
rename from xeon07/monitoring.nix
rename to hut/monitoring.nix
diff --git a/xeon07/nfs.nix b/hut/nfs.nix
similarity index 100%
rename from xeon07/nfs.nix
rename to hut/nfs.nix
diff --git a/xeon07/secrets.nix b/hut/secrets.nix
similarity index 100%
rename from xeon07/secrets.nix
rename to hut/secrets.nix
diff --git a/xeon07/secrets/nosv-token.age b/hut/secrets/nosv-token.age
similarity index 100%
rename from xeon07/secrets/nosv-token.age
rename to hut/secrets/nosv-token.age
diff --git a/xeon07/secrets/ovni-token.age b/hut/secrets/ovni-token.age
similarity index 100%
rename from xeon07/secrets/ovni-token.age
rename to hut/secrets/ovni-token.age
diff --git a/xeon07/slurm-daemon.nix b/hut/slurm-daemon.nix
similarity index 100%
rename from xeon07/slurm-daemon.nix
rename to hut/slurm-daemon.nix