diff --git a/flake.nix b/flake.nix
index 442b863..0fdda1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,7 +144,7 @@
         profiles.system = {
           sshUser = "root";
           user = "root";
-          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.nix-builder;
+          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.builder;
           # confirmTimeout = 90; # default: 30s; raspberrypi takes a little longer restarting services
         };
       };
diff --git a/systems/x86_64-linux/nix-builder/default.nix b/systems/x86_64-linux/builder/default.nix
similarity index 94%
rename from systems/x86_64-linux/nix-builder/default.nix
rename to systems/x86_64-linux/builder/default.nix
index 50333a1..5a438f3 100644
--- a/systems/x86_64-linux/nix-builder/default.nix
+++ b/systems/x86_64-linux/builder/default.nix
@@ -1,4 +1,4 @@
-# sudo nixos-rebuild switch --flake .#nix-builder --target-host root@192.168.3.118
+# sudo nixos-rebuild switch --flake .#builder --target-host root@192.168.3.118
 # or
 # deploy .#builder
 { config, pkgs, ... }:
@@ -12,7 +12,7 @@
   # Emulated systems used as alternative to cross-compiling
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
-  networking.hostName = "nix-builder";
+  networking.hostName = "builder";
   networking.networkmanager.enable = true;
 
   time.timeZone = "Europe/Berlin";
diff --git a/systems/x86_64-linux/nix-builder/hardware-configuration.nix b/systems/x86_64-linux/builder/hardware-configuration.nix
similarity index 100%
rename from systems/x86_64-linux/nix-builder/hardware-configuration.nix
rename to systems/x86_64-linux/builder/hardware-configuration.nix