diff --git a/configs/nixos/guests/navidrome.nix b/configs/nixos/guests/navidrome.nix
index f1850db..78f70d6 100644
--- a/configs/nixos/guests/navidrome.nix
+++ b/configs/nixos/guests/navidrome.nix
@@ -39,13 +39,13 @@ in
       interior.modules.services.navidrome.enable = true;
 
       mounts = {
-        ${serviceConfig.dataDir} = {
+        ${serviceConfig.dataFolder} = {
           directory = config.guests.navidrome.dataPath;
           owner = config.registry."stable-uid".${config.networking.hostName}.navidrome;
           group = "storage";
           mode = "2770";
         };
-        ${serviceConfig.libraryDir} = {
+        ${serviceConfig.musicFolder} = {
           directory = config.guests.navidrome.libraryPath;
           owner = "root";
           group = "storage";
diff --git a/configs/nixos/modules/services/navidrome.nix b/configs/nixos/modules/services/navidrome.nix
index a4dcb7b..78265ce 100644
--- a/configs/nixos/modules/services/navidrome.nix
+++ b/configs/nixos/modules/services/navidrome.nix
@@ -10,18 +10,18 @@ in
   options.modules.services.navidrome = {
     enable = lib.mkEnableOption "Navidrome";
 
-    dataDir = lib.mkOption {
+    dataFolder = lib.mkOption {
       type = lib.types.str;
       default = "/var/lib/navidrome";
       readOnly = true;
-      description = "Guest path where Navidrome stores its data folder.";
+      description = "Guest path for Navidrome's `DataFolder` setting.";
     };
 
-    libraryDir = lib.mkOption {
+    musicFolder = lib.mkOption {
       type = lib.types.str;
       default = "/music";
       readOnly = true;
-      description = "Guest path where Navidrome reads its library folder.";
+      description = "Guest path for Navidrome's `MusicFolder` setting.";
     };
   };
 
@@ -35,7 +35,7 @@ in
         isSystemUser = true;
         uid = config.registry."stable-uid".${config.networking.hostName}.navidrome;
         group = "storage";
-        home = cfg.dataDir;
+        home = cfg.dataFolder;
       };
 
       services.navidrome = {
@@ -46,8 +46,8 @@ in
         settings = {
           Address = "0.0.0.0";
           Port = 4533;
-          DataFolder = cfg.dataDir;
-          MusicFolder = cfg.libraryDir;
+          DataFolder = cfg.dataFolder;
+          MusicFolder = cfg.musicFolder;
           EnableSharing = true;
         };
       };