diff --git a/systems.nix b/systems.nix
index f3bdcdb..7d466dd 100644
--- a/systems.nix
+++ b/systems.nix
@@ -111,6 +111,6 @@ let
     };
 in
 {
-  sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
-  raspberry4 = mkSystem "aarch64-unknown-linux-gnu" "raspberry4";
+  pi400 = mkSystem "aarch64-unknown-linux-gnu" "pi400";
+  pi4 = mkSystem "aarch64-unknown-linux-gnu" "pi4";
 }
diff --git a/systems/raspberry4/default.nix b/systems/pi4/default.nix
similarity index 70%
rename from systems/raspberry4/default.nix
rename to systems/pi4/default.nix
index 8cdbf6a..6efac2c 100644
--- a/systems/raspberry4/default.nix
+++ b/systems/pi4/default.nix
@@ -33,22 +33,11 @@
 
   #hardware.raspberry-pi."4".fkms-3d.enable = true;
 
-  jopejoe1 = {
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
   networking = {
     useDHCP = lib.mkDefault true;
   };
 
-  services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
+  #services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
 
   powerManagement.cpuFreqGovernor = "ondemand";
 }
diff --git a/systems/sukuna-biko-na/default.nix b/systems/pi400/default.nix
similarity index 69%
rename from systems/sukuna-biko-na/default.nix
rename to systems/pi400/default.nix
index 9b5b360..f62b7ef 100644
--- a/systems/sukuna-biko-na/default.nix
+++ b/systems/pi400/default.nix
@@ -27,20 +27,6 @@
 
   hardware.raspberry-pi."4".fkms-3d.enable = true;
 
-  jopejoe1 = {
-    audio.enable = true;
-    bluetooth.enable = true;
-    local.enable = true;
-    nix.enable = true;
-    kodi.enable = true;
-    plasma.enable = true;
-    user = {
-      jopejoe1.enable = true;
-      root.enable = true;
-    };
-    ssh.enable = true;
-  };
-
   networking = {
     useDHCP = lib.mkDefault true;
   };