diff --git a/machines/kat-mail-test/default.nix b/machines/kat-betamail/default.nix
similarity index 98%
rename from machines/kat-mail-test/default.nix
rename to machines/kat-betamail/default.nix
index 57c40ff..a28c4f6 100644
--- a/machines/kat-mail-test/default.nix
+++ b/machines/kat-betamail/default.nix
@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   nodes,
   sources,
   ssh-keys,
@@ -12,7 +9,7 @@ let
 in
 {
   deployment = {
-    targetHost = "mail-test.kat";
+    targetHost = "betamail.kat";
     tags = [ "kat-vms" ];
   };
   imports = [
diff --git a/machines/kat-mail-test/disks.nix b/machines/kat-betamail/disks.nix
similarity index 100%
rename from machines/kat-mail-test/disks.nix
rename to machines/kat-betamail/disks.nix
diff --git a/machines/kat-mail-test/hardware-configuration.nix b/machines/kat-betamail/hardware-configuration.nix
similarity index 100%
rename from machines/kat-mail-test/hardware-configuration.nix
rename to machines/kat-betamail/hardware-configuration.nix
diff --git a/machines/kat-mail-test/modo.nix b/machines/kat-betamail/modo.nix
similarity index 100%
rename from machines/kat-mail-test/modo.nix
rename to machines/kat-betamail/modo.nix
diff --git a/machines/kat-virt/default.nix b/machines/kat-degette/default.nix
similarity index 97%
rename from machines/kat-virt/default.nix
rename to machines/kat-degette/default.nix
index 0cf00d0..b4dc442 100644
--- a/machines/kat-virt/default.nix
+++ b/machines/kat-degette/default.nix
@@ -1,13 +1,11 @@
 {
-  config,
   lib,
-  pkgs,
   ssh-keys,
   ...
 }:
 {
   deployment = {
-    targetHost = "virt.kat";
+    targetHost = "degette.kat";
     tags = [ "kat-vms" ];
   };
 
diff --git a/machines/kat-virt/hardware-configuration.nix b/machines/kat-degette/hardware-configuration.nix
similarity index 100%
rename from machines/kat-virt/hardware-configuration.nix
rename to machines/kat-degette/hardware-configuration.nix
diff --git a/machines/kat-manah/default.nix b/machines/kat-manah/default.nix
index 165e788..c7c80dd 100644
--- a/machines/kat-manah/default.nix
+++ b/machines/kat-manah/default.nix
@@ -34,8 +34,8 @@
         "kat-orchid"
         "kat-son"
         "kat-www"
-        "kat-virt"
-        "kat-mail-test"
+        "kat-degette"
+        "kat-betamail"
       ];
     };
     wireguardPubKey = "2rMQV5fyBhl7t/0j70iPOfEr/lAWQfLXQKMwtzaXxnM=";
diff --git a/machines/kat-watcher/default.nix b/machines/kat-watcher/default.nix
index 91815a9..c55e717 100644
--- a/machines/kat-watcher/default.nix
+++ b/machines/kat-watcher/default.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   nodes,
   ...
@@ -97,7 +95,7 @@
             AllowedIPs = [
               "10.42.2.1/32"
             ];
-            PublicKey = nodes.kat-mail-test.config.kat.wireguardPubKey;
+            PublicKey = nodes.kat-betamail.config.kat.wireguardPubKey;
           }
         ];
       };
diff --git a/modules/ssh.nix b/modules/ssh.nix
index fe8962d..730766e 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -19,12 +19,12 @@
         proxyJump = "watcher.kat";
       };
 
-      "virt.kat" = {
+      "degette.kat" = {
         user = "root";
         hostname = "fe80::2%%virbr0";
         proxyJump = "manah.kat";
       };
-      "mail-test.kat" = {
+      "betamail.kat" = {
         user = "root";
         hostname = "fe80::3%%virbr0";
         proxyJump = "manah.kat";