diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json
index 52809842c8877b2e9c5c87a9239d37c61f1b8896..871ef84bfc5f7842ec9f59d7cb02b31382a86b9e 100644
--- a/morph/grid/local/config.json
+++ b/morph/grid/local/config.json
@@ -2,7 +2,7 @@
 , "publicStoragePort": 8898
 , "publicKeyPath": "./public-keys"
 , "privateKeyPath": "./private-keys"
-, "monitoringvpnEndpoint": "192.168.56.24:51820"
+, "monitoringvpnPublicEndpoint": "192.168.56.24:51820"
 , "passValue": 1000000
 , "issuerDomains": ["payments.localdev"]
 , "monitoringDomains": ["monitoring.localdev"]
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index da8a83812ceba910280bfc61210487b2f217113f..3f15b34a6ba98af75c83ad487bc64d5c17d61e8b 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -1,8 +1,6 @@
 let
-  pkgs = import <nixpkgs> { };
-
   gridlib = import ../../lib;
-  grid-config = pkgs.lib.trivial.importJSON ./config.json;
+  grid-config = gridlib.pkgs.lib.trivial.importJSON ./config.json;
 
   ssh-users = let
     ssh-users-file = ./public-keys/users.nix;
@@ -59,7 +57,7 @@ let
     grid = {
       publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
       privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
-      inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+      inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
     };
     # Configure deployment management authorization for all systems in the grid.
     services.private-storage.deployment = {
diff --git a/morph/grid/production/config.json b/morph/grid/production/config.json
index 8cdeaab993fd894783953e7c8f51cd9ea3bed96d..15d2ca2e54489b6960c9a5a7c83830c18a68d8b2 100644
--- a/morph/grid/production/config.json
+++ b/morph/grid/production/config.json
@@ -2,7 +2,7 @@
 , "publicStoragePort": 8898
 , "privateKeyPath": "./private-keys"
 , "publicKeyPath": "./public-keys"
-, "monitoringvpnEndpoint": "monitoring.private.storage:51820"
+, "monitoringvpnPublicEndpoint": "monitoring.private.storage:51820"
 , "passValue": 1000000
 , "issuerDomains": [
     "payments.private.storage"
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index ab45d4ba7f67e71383d28120bd925ac3a05f04ef..fbff6026674399308f031b3b427df3e6eeb1c54f 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -21,7 +21,7 @@ let
     grid = {
       publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
       privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
-      inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+      inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
     };
     # Configure deployment management authorization for all systems in the grid.
     services.private-storage.deployment = {
diff --git a/morph/grid/testing/config.json b/morph/grid/testing/config.json
index ba48a27deea9d35150b1834727b659e4972bd2e5..87ea03eb61fba8cd491b6a8ed7cb482b1797fdbf 100644
--- a/morph/grid/testing/config.json
+++ b/morph/grid/testing/config.json
@@ -2,7 +2,7 @@
 , "publicStoragePort": 8898
 , "privateKeyPath": "./private-keys"
 , "publicKeyPath": "./public-keys"
-, "monitoringvpnEndpoint": "monitoring.privatestorage-staging.com:51820"
+, "monitoringvpnPublicEndpoint": "monitoring.privatestorage-staging.com:51820"
 , "passValue": 1000000
 , "issuerDomains": [
     "payments.privatestorage-staging.com"
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 19839ae83fa16c31adf0fcd9e3727a8304f8dd6c..f9e1a366fe0a2fb945c4626191c689d197b10350 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -21,7 +21,7 @@ let
     grid = {
       publicKeyPath = toString ./. + "/${grid-config.publicKeyPath}";
       privateKeyPath = toString ./. + "/${grid-config.privateKeyPath}";
-      inherit (grid-config) monitoringvpnEndpoint letsEncryptAdminEmail;
+      inherit (grid-config) monitoringvpnPublicEndpoint letsEncryptAdminEmail;
     };
     # Configure deployment management authorization for all systems in the grid.
     services.private-storage.deployment = {
diff --git a/morph/lib/base.nix b/morph/lib/base.nix
index aafbf4f4e62b064284e42b5a05905495380736dc..6fb5fccda4f19d4f39af543a8ca23b491205ab8d 100644
--- a/morph/lib/base.nix
+++ b/morph/lib/base.nix
@@ -24,7 +24,7 @@
         The IPv4 address of this node on the monitoring VPN.
       '';
     };
-    monitoringvpnEndpoint = lib.mkOption {
+    monitoringvpnPublicEndpoint = lib.mkOption {
       type = lib.types.str;
       description = ''
         The domain name and port of the monitoring VPN endpoint.
diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix
index 69b0527cd74e0752ded6ffbe7513db126f0613f5..a5a39ed44112f3ba023be93a50fd7c1ef7384aac 100644
--- a/morph/lib/issuer.nix
+++ b/morph/lib/issuer.nix
@@ -2,7 +2,7 @@
 # "issuer"-type system.
 { lib, config, ...}:
 let
-  inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnEndpoint monitoringvpnIPv4;
+  inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnPublicEndpoint monitoringvpnIPv4;
   inherit (config.grid.issuer) issuerDomains allowedChargeOrigins;
 in {
   imports = [
@@ -82,7 +82,7 @@ in {
     services.private-storage.monitoring.vpn.client = {
       enable = true;
       ip = monitoringvpnIPv4;
-      endpoint = monitoringvpnEndpoint;
+      endpoint = monitoringvpnPublicEndpoint;
       endpointPublicKeyFile = "${publicKeyPath}/monitoringvpn/server.pub";
     };
 
diff --git a/morph/lib/storage.nix b/morph/lib/storage.nix
index 71e3c22371ad042c4ddbc5d8cd87db5cb05923af..f1b445f2ec358b945ef64f968caa91cda995f06e 100644
--- a/morph/lib/storage.nix
+++ b/morph/lib/storage.nix
@@ -2,7 +2,7 @@
 # "storage"-type system.
 { lib, config, ...} :
 let
-  inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnIPv4 monitoringvpnEndpoint;
+  inherit (config.grid) publicKeyPath privateKeyPath monitoringvpnIPv4 monitoringvpnPublicEndpoint;
 in {
   # Any extra NixOS modules to load on this server.
   imports = [
@@ -81,7 +81,7 @@ in {
     services.private-storage.monitoring.vpn.client = {
       enable = true;
       ip = monitoringvpnIPv4;
-      endpoint = monitoringvpnEndpoint;
+      endpoint = monitoringvpnPublicEndpoint;
       endpointPublicKeyFile = "${publicKeyPath}/monitoringvpn/server.pub";
     };
   };