diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 0c114ccf11b9ddb963d5e2e6297b6a7c83792aba..fdc0cde55be4f1b644c212ce20f6c3e44af8e3df 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -13,16 +13,16 @@ import ../../lib/make-grid.nix {
 
     # TBD: derive these automatically:
     hostsMap = {
-      "172.23.23.1"  = [ "monitoring1" "monitoring1.monitoringvpn" ];
-      "172.23.23.11" = [ "payments1" "payments1.monitoringvpn" ];
+      "172.23.23.1"  = [ "monitoring" "monitoring.monitoringvpn" ];
+      "172.23.23.11" = [ "payments" "payments.monitoringvpn" ];
       "172.23.23.12" = [ "storage1" "storage1.monitoringvpn" ];
       "172.23.23.13" = [ "storage2" "storage2.monitoringvpn" ];
     };
     vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ];
-    nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ];
+    nodeExporterTargets = [ "monitoring" "payments" "storage1" "storage2" ];
 
   in {
-    "payments1" = import ../../lib/make-issuer.nix (cfg // rec {
+    "payments" = import ../../lib/make-issuer.nix (cfg // rec {
       publicIPv4 = "192.168.67.21";
       monitoringvpnIPv4 = "172.23.23.11";
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
@@ -49,7 +49,7 @@ import ../../lib/make-grid.nix {
       inherit sshUsers;
     });
 
-    "monitoring1" = import ../../lib/make-monitoring.nix (cfg // rec {
+    "monitoring" = import ../../lib/make-monitoring.nix (cfg // rec {
       publicIPv4 = "192.168.67.24";
       monitoringvpnIPv4 = "172.23.23.1";
       inherit vpnClientIPs;