diff --git a/.sops.yaml b/.sops.yaml
index 7967e56..b80b8f3 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -5,7 +5,7 @@ keys:
   - &nyarlathotep age1s99d0vlj5qlm287n98jratql5fypvjrxxal0k5jl2aw9dcc8kyvqw5yyt4
   - &bragi age1lqvgpmlemyg9095ujck64u59ma29656zs7a4yxgz4s6u5cld2ccss69jwe
   - &lobon age12nz7dtc0m5wasxm4r9crtkgwnzvauyfp0xh0n8z8jld0arn9ea9qe0agvn
-  - &kaalut age1ktwclxa640l89le6yecm8v2z6hmwr4lusd6x9gyzamhv57887szqtqp59a
+  - &nyarlathotep age1ktwclxa640l89le6yecm8v2z6hmwr4lusd6x9gyzamhv57887szqtqp59a
 
 creation_rules:
   - path_regex: nixos/machines/nyarlathotep/.*
@@ -26,12 +26,12 @@ creation_rules:
         - *nerf
         - *gonne
         - *lobon
-  - path_regex: nixos/machines/kaalut/.*
+  - path_regex: nixos/machines/nyarlathotep/.*
     key_groups:
       - age:
         - *nerf
         - *gonne
-        - *kaalut
+        - *nyarlathotep
   # this is the catchall clause if nothing above machtes. Encrypt to users but not
   # to machines
   - key_groups:
diff --git a/flake-module.nix b/flake-module.nix
index 962d08b..789d7b8 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -69,8 +69,8 @@
             5. Update the `cargoHash` by setting it to `lib.fakeHash` and then inserting the result.
             6. Check if we can get rid of alias-to-sieve when stalwart-mail has a builtin mail-forwarding feature.
           '';
-            # This override encapsulates the buildRustPackage function in a function that takes the arguments given by the nixpkgs-version of stalwart-mail
-            # and adds our patch to the arguments before handing the new arguments to buildRustPackage.
+          # This override encapsulates the buildRustPackage function in a function that takes the arguments given by the nixpkgs-version of stalwart-mail
+          # and adds our patch to the arguments before handing the new arguments to buildRustPackage.
             prev.stalwart-mail.override (
               let
                 rp = pkgs.rustPlatform;
diff --git a/nixos/machines/kaalut/allowlistPass.yaml b/nixos/machines/nyarlathotep/allowlistPass.yaml
similarity index 100%
rename from nixos/machines/kaalut/allowlistPass.yaml
rename to nixos/machines/nyarlathotep/allowlistPass.yaml
diff --git a/nixos/machines/kaalut/backupKey.yaml b/nixos/machines/nyarlathotep/backupKey.yaml
similarity index 100%
rename from nixos/machines/kaalut/backupKey.yaml
rename to nixos/machines/nyarlathotep/backupKey.yaml
diff --git a/nixos/machines/kaalut/configuration.nix b/nixos/machines/nyarlathotep/configuration.nix
similarity index 98%
rename from nixos/machines/kaalut/configuration.nix
rename to nixos/machines/nyarlathotep/configuration.nix
index 2134b42..6cbfd19 100644
--- a/nixos/machines/kaalut/configuration.nix
+++ b/nixos/machines/nyarlathotep/configuration.nix
@@ -37,7 +37,7 @@
     ];
   };
 
-  networking.hostName = "kaalut";
+  networking.hostName = "nyarlathotep";
   vmNetwork.ipv4 = "192.168.0.17";
   system.stateVersion = "24.05";
 
diff --git a/nixos/machines/kaalut/hardware-configuration.nix b/nixos/machines/nyarlathotep/hardware-configuration.nix
similarity index 100%
rename from nixos/machines/kaalut/hardware-configuration.nix
rename to nixos/machines/nyarlathotep/hardware-configuration.nix
diff --git a/nixos/machines/kaalut/koma.aliases.yaml b/nixos/machines/nyarlathotep/koma.aliases.yaml
similarity index 100%
rename from nixos/machines/kaalut/koma.aliases.yaml
rename to nixos/machines/nyarlathotep/koma.aliases.yaml
diff --git a/nixos/machines/kaalut/mathebau.aliases.yaml b/nixos/machines/nyarlathotep/mathebau.aliases.yaml
similarity index 100%
rename from nixos/machines/kaalut/mathebau.aliases.yaml
rename to nixos/machines/nyarlathotep/mathebau.aliases.yaml
diff --git a/nixos/machines/kaalut/mathechor.aliases.yaml b/nixos/machines/nyarlathotep/mathechor.aliases.yaml
similarity index 100%
rename from nixos/machines/kaalut/mathechor.aliases.yaml
rename to nixos/machines/nyarlathotep/mathechor.aliases.yaml
diff --git a/nixos/machines/kaalut/stalwartAdmin.yaml b/nixos/machines/nyarlathotep/stalwartAdmin.yaml
similarity index 100%
rename from nixos/machines/kaalut/stalwartAdmin.yaml
rename to nixos/machines/nyarlathotep/stalwartAdmin.yaml
diff --git a/nixos/modules/borgbackup.nix b/nixos/modules/borgbackup.nix
index 9889238..03df3e2 100644
--- a/nixos/modules/borgbackup.nix
+++ b/nixos/modules/borgbackup.nix
@@ -76,13 +76,6 @@ in {
           path = "/var/lib/backups/ithaqua";
           allowSubRepos = true;
         };
-        kaalut = {
-          authorizedKeysAppendOnly = [
-            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcAJkEXcvrDEQf1zRhBXLe1CSHOTooM3qy0KMfS9oug Kaalut Backup"
-          ];
-          path = "/var/lib/backups/kaalut";
-          allowSubRepos = true;
-        };
         lobon = {
           authorizedKeysAppendOnly = [
             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICEptjf1UWRlo6DG9alAIRwkSDUAVHwDKkHC6/DeYKzi Lobon Backup"
@@ -90,6 +83,13 @@ in {
           path = "/var/lib/backups/lobon";
           allowSubRepos = true;
         };
+        nyarlathotep = {
+          authorizedKeysAppendOnly = [
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFcAJkEXcvrDEQf1zRhBXLe1CSHOTooM3qy0KMfS9oug nyarlathotep Backup"
+          ];
+          path = "/var/lib/backups/nyarlathotep";
+          allowSubRepos = true;
+        };
         sanctamariamaterdei = {
           authorizedKeysAppendOnly = [
             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9Le5OI4ympQ0mQKYHmxgxGF598rzpD5VVpWK1mGfd8 Sanctamariamaterdei Backupsystem"
diff --git a/nixos/modules/mail.nix b/nixos/modules/mail.nix
index f1861a2..54644bd 100644
--- a/nixos/modules/mail.nix
+++ b/nixos/modules/mail.nix
@@ -307,7 +307,7 @@ in {
         # We don't want this in order to not need to persist borg cache and simplify new deployments.
         BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK = "yes";
       };
-      repo = "borg@192.168.1.11:kaluut"; # TODO for https://gitea.mathebau.de/Fachschaft/nixConfig/issues/33
+      repo = "borg@192.168.1.11:nyarlathotep"; # TODO for https://gitea.mathebau.de/Fachschaft/nixConfig/issues/33
       startAt = "daily";
       user = "root";
       group = "root";