diff --git a/docs.nix b/docs.nix
index 9bb64627870dfee01c6858d5699001cae96045c4..4c8b230a7eddb462bf47a4c3ee591e64fb3ce1ff 100644
--- a/docs.nix
+++ b/docs.nix
@@ -1,2 +1,2 @@
-{ pkgs ? import ./stable2105.nix { } }:
+{ pkgs ? import ./nixpkgs-2105.nix { } }:
 pkgs.callPackage ./privatestorageio.nix { }
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index bdf8addc4521398c7063ad96ed6c8258d93aebea..da56a43012b7e53a6d5ced17123eb3d898b24f3e 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -3,7 +3,7 @@
 { lib, pkgs, config, ... }: let
   cfg = config.services.private-storage-issuer;
   # Our own nixpkgs fork:
-  ourpkgs = import ../../pspkgs.nix {};
+  ourpkgs = import ../../nixpkgs-ps.nix {};
 in {
   imports = [
     # Give it a good SSH configuration.
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index 17ef5a0971197d2e03d35e5715019f933d93703b..fa5fea837c544e66ae8811a2e3c468a67a18759e 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -9,7 +9,7 @@ let
   tahoe-base = "/var/db/tahoe-lafs";
 
   # Our own nixpkgs fork:
-  ourpkgs = import ../../pspkgs.nix {};
+  ourpkgs = import ../../nixpkgs-ps.nix {};
 
   # The full path to the directory where the storage server will write
   # incident reports.
diff --git a/nixpkgs-2105.json b/nixpkgs-2105.json
index d441d00995a78a20cc8677a85ced2a675a9502ae..76950db1870cb62d68e655f5ca4be90f3fcbf6be 100644
--- a/nixpkgs-2105.json
+++ b/nixpkgs-2105.json
@@ -1,4 +1,4 @@
-{ "name": "stable2105"
+{ "name": "release2105"
 , "url": "https://releases.nixos.org/nixos/21.05/nixos-21.05.804.5de44c15758/nixexprs.tar.xz"
 , "sha256": "002zvc16hyrbs0icx1qj255c9dqjpdxx4bhhfjndlj3kwn40by0m"
 }
diff --git a/stable2105.nix b/nixpkgs-2105.nix
similarity index 100%
rename from stable2105.nix
rename to nixpkgs-2105.nix
diff --git a/pspkgs.nix b/nixpkgs-ps.nix
similarity index 100%
rename from pspkgs.nix
rename to nixpkgs-ps.nix
diff --git a/shell.nix b/shell.nix
index 7bd00916fe4bef5c13a78dcf3c9a4ae51f359165..a503d818c8e83fd0a9c8c6a36390e28e10b38600 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,13 +1,13 @@
 let
-  # ourpkgs = import ./pspkgs.nix { };
-  stable2105 = import ./stable2105.nix { };
+  # ourpkgs = import ./nixpkgs-ps.nix { };
+  release2105 = import ./nixpkgs-2105.nix { };
 in
-{ pkgs ? stable2105 }:
+{ pkgs ? release2105 }:
 pkgs.mkShell {
   NIX_PATH = "nixpkgs=${pkgs.path}";
   buildInputs = [
     pkgs.morph
-    stable2105.vagrant
+    release2105.vagrant
     pkgs.jp
   ];
 }