diff --git a/modules/hpc/hpc.nix b/modules/hpc/hpc.nix
index b955f1f..28425ed 100644
--- a/modules/hpc/hpc.nix
+++ b/modules/hpc/hpc.nix
@@ -141,11 +141,11 @@ in
   options.features.hpc = {
     enable = mkEnableOption "Enable HPC features";
 
-    manage = mkEnableOption "Enable management features";
+    manageNode = mkEnableOption "Enable management features";
 
-    login = mkEnableOption "Enable login node features";
+    loginNode = mkEnableOption "Enable login node features";
 
-    compute = mkEnableOption "Enable compute features";
+    computeNode = mkEnableOption "Enable compute features";
 
     knem = mkEnableOption "Enable knem for openmpi";
   };
@@ -153,11 +153,11 @@ in
   config = mkIf cfg.enable (mkMerge [
     configuration
 
-    (mkIf cfg.manage manage)
+    (mkIf cfg.manageNode manage)
 
-    (mkIf cfg.login login)
+    (mkIf cfg.loginNode login)
 
-    (mkIf cfg.compute compute)
+    (mkIf cfg.computeNode compute)
 
     (mkIf cfg.knem knem)
   ]);