diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix
index 3f52e26..7524240 100755
--- a/modules/nixos/core/doas/default.nix
+++ b/modules/nixos/core/doas/default.nix
@@ -9,10 +9,10 @@ let
     devices
     ;
   hostname = config.networking.hostName;
-  jupiter = devices.jupiter.name;
+  mars = devices.mars.name;
   ceres = devices.ceres.name;
-  saturn = devices.saturn.names;
-  callisto = devices.callisto.name;
+  venus = devices.venus.names;
+  charon = devices.charon.name;
 in
 {
   security = {
@@ -24,13 +24,13 @@ in
           noPass = true;
           users = [
             (
-              if hostname == jupiter then
+              if hostname == mars then
                 user0
               else if hostname == ceres then
                 user0
-              else if hostname == callisto then
+              else if hostname == charon then
                 user1
-              else if hostname == saturn then
+              else if hostname == venus then
                 user2
               else
                 ""
diff --git a/modules/nixos/core/ssh/default.nix b/modules/nixos/core/ssh/default.nix
index d53bd15..f505f1e 100755
--- a/modules/nixos/core/ssh/default.nix
+++ b/modules/nixos/core/ssh/default.nix
@@ -16,24 +16,24 @@ let
     devices
     ;
   hostname = config.networking.hostName;
-  jupiter = devices.jupiter.name;
+  mars = devices.mars.name;
   ceres = devices.ceres.name;
-  saturn = devices.saturn.name;
-  callisto = devices.callisto.name;
+  venus = devices.venus.name;
+  charon = devices.charon.name;
 
   userLogic =
-    if hostname == jupiter then
+    if hostname == mars then
       user0
     else if hostname == ceres then
       user0
-    else if hostname == saturn then
+    else if hostname == venus then
       user2
     else
       "";
 in
 {
   users.users =
-    if hostname == callisto then
+    if hostname == charon then
       { }
     else
       {
diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix
index 9876fff..6077616 100755
--- a/modules/nixos/services/ollama/default.nix
+++ b/modules/nixos/services/ollama/default.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (flake.config.machines.devices)
-    jupiter
+    mars
     ceres
     ;
   inherit (flake.config.services.instances)
@@ -63,7 +63,7 @@ in
         user = service.name;
       }
       // (
-        if hostname == jupiter.name then
+        if hostname == mars.name then
           {
             models = service.paths.path1;
             # acceleration = "rocm";
@@ -98,7 +98,7 @@ in
 
   systemd.tmpfiles.rules = [
     (
-      if hostname == jupiter.name then
+      if hostname == mars.name then
         "Z ${service.paths.path1} 0777 ${service.name} ${service.name} -"
       else
         "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -"
diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix
index b9090ad..6ef123c 100755
--- a/modules/nixos/sops/default.nix
+++ b/modules/nixos/sops/default.nix
@@ -8,17 +8,17 @@ let
     devices
     ;
   hostname = config.networking.hostName;
-  jupiter = devices.jupiter.name;
+  mars = devices.mars.name;
   ceres = devices.ceres.name;
-  saturn = devices.saturn.name;
-  callisto = devices.callisto.name;
+  venus = devices.venus.name;
+  charon = devices.charon.name;
 
   userLogic =
-    if hostname == jupiter then
+    if hostname == mars then
       user0
     else if hostname == ceres then
       user0
-    else if hostname == saturn then
+    else if hostname == venus then
       user2
     else
       "";
@@ -32,7 +32,7 @@ in
       generateKey = false;
     };
     secrets =
-      if hostname == callisto then
+      if hostname == charon then
         { }
       else
         {