diff --git a/flake.nix b/flake.nix
index 8eff23d..6086814 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,22 +125,23 @@
     in rec {
 
       nixosConfigurations = {
-        desktop = import ./hosts/desktop { inherit inputs globals overlays; };
-        wsl = import ./hosts/wsl { inherit inputs globals overlays; };
-        oracle = import ./hosts/oracle { inherit inputs globals overlays; };
+        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
+        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
+        flame = import ./hosts/flame { inherit inputs globals overlays; };
       };
 
       darwinConfigurations = {
-        macbook = import ./hosts/macbook { inherit inputs globals overlays; };
+        lookingglass =
+          import ./hosts/macbook { inherit inputs globals overlays; };
       };
 
       # For quickly applying local settings with:
-      # home-manager switch --flake .#desktop
+      # home-manager switch --flake .#tempest
       homeConfigurations = {
-        desktop =
-          nixosConfigurations.desktop.config.home-manager.users.${globals.user}.home;
-        macbook =
-          darwinConfigurations.macbook.config.home-manager.users."Noah.Masur".home;
+        tempest =
+          nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
+        lookingglass =
+          darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
       };
 
       # Package servers into images with a generator
diff --git a/hosts/oracle/default.nix b/hosts/flame/default.nix
similarity index 98%
rename from hosts/oracle/default.nix
rename to hosts/flame/default.nix
index e4a50db..857f8e8 100644
--- a/hosts/oracle/default.nix
+++ b/hosts/flame/default.nix
@@ -1,12 +1,13 @@
-{ inputs, globals, overlays, ... }:
-
-with inputs;
-
+# The Flame
 # System configuration for an Oracle free server
 
 # How to install:
 # https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/
 
+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
 nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
   specialArgs = { };
@@ -26,7 +27,7 @@ nixpkgs.lib.nixosSystem {
       caddy.enable = true;
 
       # FQDNs for various services
-      networking.hostName = "oracle";
+      networking.hostName = "flame";
       bookServer = "books.masu.rs";
       streamServer = "stream.masu.rs";
       nextcloudServer = "cloud.masu.rs";
diff --git a/hosts/oracle/hardware-configuration.nix b/hosts/flame/hardware-configuration.nix
similarity index 100%
rename from hosts/oracle/hardware-configuration.nix
rename to hosts/flame/hardware-configuration.nix
diff --git a/hosts/wsl/default.nix b/hosts/hydra/default.nix
similarity index 94%
rename from hosts/wsl/default.nix
rename to hosts/hydra/default.nix
index ef448c4..63e3273 100644
--- a/hosts/wsl/default.nix
+++ b/hosts/hydra/default.nix
@@ -1,8 +1,10 @@
+# The Hydra
+# System configuration for WSL
+
 { inputs, globals, overlays, ... }:
 
 with inputs;
 
-# System configuration for WSL
 nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
@@ -13,7 +15,7 @@ nixpkgs.lib.nixosSystem {
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager
     {
-      networking.hostName = "wsl";
+      networking.hostName = "hydra";
       nixpkgs.overlays = overlays;
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
@@ -29,6 +31,7 @@ nixpkgs.lib.nixosSystem {
         wslConf.automount.root = "/mnt";
         defaultUser = globals.user;
         startMenuLaunchers = true;
+        nativeSystemd = true;
         wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
         interop.includePath =
           false; # Including Windows PATH will slow down Neovim command mode
diff --git a/hosts/macbook/default.nix b/hosts/lookingglass/default.nix
similarity index 95%
rename from hosts/macbook/default.nix
rename to hosts/lookingglass/default.nix
index 78620ed..3eb9573 100644
--- a/hosts/macbook/default.nix
+++ b/hosts/lookingglass/default.nix
@@ -1,8 +1,10 @@
+# The Looking Glass
+# System configuration for my work Macbook
+
 { inputs, globals, overlays, ... }:
 
 with inputs;
 
-# System configuration for my work MacBook
 darwin.lib.darwinSystem {
   system = "x86_64-darwin";
   specialArgs = { };
diff --git a/hosts/desktop/default.nix b/hosts/tempest/default.nix
similarity index 96%
rename from hosts/desktop/default.nix
rename to hosts/tempest/default.nix
index 0bbf3aa..73e8216 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/tempest/default.nix
@@ -1,8 +1,10 @@
+# The Tempest
+# System configuration for my desktop
+
 { inputs, globals, overlays, ... }:
 
 with inputs;
 
-# System configuration for my desktop
 nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
@@ -15,7 +17,7 @@ nixpkgs.lib.nixosSystem {
     home-manager.nixosModules.home-manager
     {
       physical = true;
-      networking.hostName = "desktop";
+      networking.hostName = "tempest";
       nixpkgs.overlays = [ nur.overlay ] ++ overlays;
       # Set registry to flake packages, used for nix X commands
       nix.registry.nixpkgs.flake = nixpkgs;
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/tempest/hardware-configuration.nix
similarity index 100%
rename from hosts/desktop/hardware-configuration.nix
rename to hosts/tempest/hardware-configuration.nix