diff --git a/flake.nix b/flake.nix
index c5bd9a4..5892444 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,10 +65,10 @@
         ./machines/buck/configuration.nix
       ];
       # ThinkCentre M700 mini-pc (server)
-      pedro = mkNixosSystem [
+      cj = mkNixosSystem [
         nixos-hardware.nixosModules.common-pc-hdd
         nixos-hardware.nixosModules.common-cpu-intel-cpu-only
-        ./machines/pedro/configuration.nix 
+        ./machines/cj/configuration.nix 
       ];
     };
   };
diff --git a/home/jacob.nix b/home/jacob.nix
index 4470ef4..dcab719 100644
--- a/home/jacob.nix
+++ b/home/jacob.nix
@@ -273,7 +273,7 @@
           password_cmd = "${pkgs.coreutils}/bin/cat /run/secrets/spotify/password";
           backend = "pulseaudio";
           device = "pipewire";
-          device_name = "pedro";
+          device_name = "buck";
           device_type = "computer";
         };
       };
diff --git a/machines/pedro/configuration.nix b/machines/cj/configuration.nix
similarity index 99%
rename from machines/pedro/configuration.nix
rename to machines/cj/configuration.nix
index 8eb36aa..2033146 100644
--- a/machines/pedro/configuration.nix
+++ b/machines/cj/configuration.nix
@@ -50,7 +50,7 @@
   time.timeZone = "America/New_York";
 
   networking = {
-    hostName = "pedro"; # Define your hostname.
+    hostName = "cj"; # Define your hostname.
     # networking.hostId is required for ZFS
     hostId = "d9aef7b3";
 
diff --git a/machines/pedro/firewall.nix b/machines/cj/firewall.nix
similarity index 100%
rename from machines/pedro/firewall.nix
rename to machines/cj/firewall.nix
diff --git a/machines/pedro/gitea.nix b/machines/cj/gitea.nix
similarity index 100%
rename from machines/pedro/gitea.nix
rename to machines/cj/gitea.nix
diff --git a/machines/pedro/hardware-configuration-zfs.nix b/machines/cj/hardware-configuration-zfs.nix
similarity index 100%
rename from machines/pedro/hardware-configuration-zfs.nix
rename to machines/cj/hardware-configuration-zfs.nix
diff --git a/machines/pedro/home-assistant.nix b/machines/cj/home-assistant.nix
similarity index 100%
rename from machines/pedro/home-assistant.nix
rename to machines/cj/home-assistant.nix
diff --git a/machines/pedro/nginx.nix b/machines/cj/nginx.nix
similarity index 100%
rename from machines/pedro/nginx.nix
rename to machines/cj/nginx.nix
diff --git a/machines/pedro/pihole.nix b/machines/cj/pihole.nix
similarity index 100%
rename from machines/pedro/pihole.nix
rename to machines/cj/pihole.nix
diff --git a/machines/pedro/syncthing.nix b/machines/cj/syncthing.nix
similarity index 100%
rename from machines/pedro/syncthing.nix
rename to machines/cj/syncthing.nix