diff --git a/common/sysadmin/default.nix b/common/base-server/default.nix
similarity index 68%
rename from common/sysadmin/default.nix
rename to common/base-server/default.nix
index 3709583..47a82fa 100644
--- a/common/sysadmin/default.nix
+++ b/common/base-server/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.qenya.sysadmin;
+  cfg = config.qenya.base-server;
 in
 {
-  options.qenya.sysadmin.enable = mkEnableOption "Base configuration for headless servers";
+  options.qenya.base-server.enable = mkEnableOption "Base configuration for headless servers";
 
   config = mkIf cfg.enable {
     time.timeZone = "Etc/UTC";
diff --git a/common/default.nix b/common/default.nix
index 849dc3d..e380932 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ./sysadmin
+    ./base-server
     ./users
     ./environment.nix
     ./home-manager.nix
diff --git a/hosts/kalessin/configuration.nix b/hosts/kalessin/configuration.nix
index 4e2ddea..3250f27 100644
--- a/hosts/kalessin/configuration.nix
+++ b/hosts/kalessin/configuration.nix
@@ -9,7 +9,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   users.users.qenya.extraGroups = [ "wheel" ];
-  qenya.sysadmin.enable = true;
+  qenya.base-server.enable = true;
 
   system.stateVersion = "23.11";
 }
diff --git a/hosts/orm/configuration.nix b/hosts/orm/configuration.nix
index e0cbe89..c31dc6a 100644
--- a/hosts/orm/configuration.nix
+++ b/hosts/orm/configuration.nix
@@ -9,7 +9,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
   
   users.users.qenya.extraGroups = [ "wheel" ];
-  qenya.sysadmin.enable = true;
+  qenya.base-server.enable = true;
 
   age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;
 
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 13b70b3..2fbd757 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -10,7 +10,7 @@
 
   users.users.qenya.extraGroups = [ "wheel" ];
 
-  qenya.sysadmin.enable = true;
+  qenya.base-server.enable = true;
 
   age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age;