diff --git a/DEPLOYMENT-NOTES.rst b/DEPLOYMENT-NOTES.rst
index 5d8bd469f2b4c2c2f6a9768e50a2a8e513ecd778..2a8a5708f32482639c5cae3a7af3314312339542 100644
--- a/DEPLOYMENT-NOTES.rst
+++ b/DEPLOYMENT-NOTES.rst
@@ -19,7 +19,7 @@ Deployment notes
 
   3. Create a labeled filesystem on the partition ::
 
-    mkfs.ext4 -L zkapissuer-database /dev/nvme1n1p1
+    mkfs.ext4 -L zkapissuer-db /dev/nvme1n1p1
 
   4. Deploy the PrivateStorageio update.
 
diff --git a/morph/lib/hardware-vagrant.nix b/morph/lib/hardware-vagrant.nix
index 36ecc5b66bb482b30bc3b0d4126e1caf053f9de0..6c41af4923861e89d144303d129d7babde494363 100644
--- a/morph/lib/hardware-vagrant.nix
+++ b/morph/lib/hardware-vagrant.nix
@@ -42,8 +42,8 @@
       options = ["bind"];
     };
 
-    # XXX This should be handled by the storage module like zkapissuer-database
-    # is handled by the issuer module.
+    # XXX This should be handled by the storage module like the zkap
+    # filesystem above is handled by the issuer module.
     fileSystems."/storage" = { fsType = "tmpfs"; };
 
     fileSystems."/" =
diff --git a/morph/lib/issuer-aws.nix b/morph/lib/issuer-aws.nix
index 85070bd94264f552b76d63bf37ebc5dd19a37873..f9417429018d98d13f72c5fa9b0cb0371ec7f458 100644
--- a/morph/lib/issuer-aws.nix
+++ b/morph/lib/issuer-aws.nix
@@ -23,7 +23,7 @@
   # PaymentServer voucher database.  This makes it easier to manage for
   # tasks like backup/recovery and encryption.
   services.private-storage-issuer.databaseFileSystem = {
-    label = "zkapissuer-database";
+    label = "zkapissuer-db";
   };
 
   # Clean up packages after a while
diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix
index c4515b378cc1439070ac58f686852a31ed1650b6..1216eb32a3b5c9d38ab2447d877413b3f7f659eb 100644
--- a/morph/lib/issuer.nix
+++ b/morph/lib/issuer.nix
@@ -55,6 +55,6 @@ in {
     ristrettoSigningKeyPath = config.deployment.secrets.ristretto-signing-key.destination;
     stripeSecretKeyPath = config.deployment.secrets.stripe-secret-key.destination;
     database = "SQLite3";
-    databasePath = "${config.fileSystems."zkapissuer-database".mountPoint}/vouchers.sqlite3";
+    databasePath = "${config.fileSystems."zkapissuer-db".mountPoint}/vouchers.sqlite3";
   };
 }
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index 82a286229b73ab674fc2aba74a07f27be267554e..468170b874e5b3fcbb5d72b32149233af48d1b42 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -135,7 +135,7 @@ in {
     in lib.mkIf cfg.enable {
     # Make sure the voucher database filesystem is mounted.
     fileSystems = {
-      "zkapissuer-database" = cfg.databaseFileSystem // {
+      "zkapissuer-db" = cfg.databaseFileSystem // {
         mountPoint = "/var/lib/${stateDirectory}";
       };
     };