diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix
index a018dac..31b79b2 100644
--- a/hosts/Dimaga/default.nix
+++ b/hosts/Dimaga/default.nix
@@ -99,7 +99,7 @@ in
     packages = [ start-services ];
 
     # Enable support for primary RAID array
-    raid.sapana.enable = true;
+    raid.storage.enable = true;
 
     # Change how long old generations are kept for.
     retentionPeriod = "30d";
diff --git a/hosts/Hevana/default.nix b/hosts/Hevana/default.nix
index f7b1e33..37bc4a8 100644
--- a/hosts/Hevana/default.nix
+++ b/hosts/Hevana/default.nix
@@ -89,7 +89,7 @@ in
     packages = [ start-services ];
 
     # Enable support for primary RAID array
-    raid.sapana.enable = true;
+    raid.storage.enable = true;
 
     # Change how long old generations are kept for.
     retentionPeriod = "30d";
diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index 8100b5d..1db1b09 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -46,7 +46,7 @@ in
     gpu.intel.enable = true;
 
     # Enable support for primary RAID array (just in case)
-    raid.sapana.enable = true;
+    raid.storage.enable = true;
 
     # Change how long old generations are kept for.
     retentionPeriod = "14d";
diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix
index 2f54330..b85c009 100644
--- a/hosts/Shura/default.nix
+++ b/hosts/Shura/default.nix
@@ -58,7 +58,7 @@ in
     ];
 
     # Enable support for primary RAID array (just in case)
-    raid.sapana.enable = true;
+    raid.storage.enable = true;
 
     # Keep old generations for two weeks.
     retentionPeriod = "14d";
diff --git a/modules/system/raid.nix b/modules/system/raid.nix
index db8e920..c15f460 100644
--- a/modules/system/raid.nix
+++ b/modules/system/raid.nix
@@ -1,6 +1,4 @@
-# Configures bluetooth.
 { lib, config, ... }:
-
 let
   cfg = config.aux.system.raid;
 in
@@ -9,13 +7,13 @@ in
   options = {
     aux.system.raid = {
       enable = lib.mkEnableOption "Enables RAID support.";
-      sapana.enable = lib.mkEnableOption "Enables support for the Sapana/storage array.";
+      storage.enable = lib.mkEnableOption "Enables support for the storage array.";
     };
   };
 
   config = lib.mkMerge [
     (lib.mkIf cfg.enable { boot.swraid.enable = true; })
-    (lib.mkIf cfg.sapana.enable {
+    (lib.mkIf cfg.storage.enable {
       aux.system.raid.enable = true;
       boot.swraid.mdadmConf = ''
         ARRAY /dev/md/Sapana metadata=1.2 UUID=51076daf:efdb34dd:bce48342:3b549fcb