diff --git a/metropolis/cli/metroctl/core/rpc.go b/metropolis/cli/metroctl/core/rpc.go
index 1c4fa4f..b469544 100644
--- a/metropolis/cli/metroctl/core/rpc.go
+++ b/metropolis/cli/metroctl/core/rpc.go
@@ -75,7 +75,7 @@
 	creds := rpc.NewAuthenticatedCredentials(tlsc, rpc.WantRemoteCluster(ca), rpc.WantRemoteNode(nodeId))
 	dialOpts = append(dialOpts, grpc.WithTransportCredentials(creds))
 
-	endpoint := net.JoinHostPort(nodeAddr, node.NodeManagement.PortString())
+	endpoint := net.JoinHostPort(nodeAddr, node.NodeManagementPort.PortString())
 	return grpc.Dial(endpoint, dialOpts...)
 }
 
diff --git a/metropolis/node/core/mgmt/mgmt.go b/metropolis/node/core/mgmt/mgmt.go
index 0c7cb54..e9c3f91 100644
--- a/metropolis/node/core/mgmt/mgmt.go
+++ b/metropolis/node/core/mgmt/mgmt.go
@@ -51,7 +51,7 @@
 	}
 	logger := supervisor.MustSubLogger(ctx, "rpc")
 	opts := sec.GRPCOptions(logger)
-	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", node.NodeManagement))
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", node.NodeManagementPort))
 	if err != nil {
 		return fmt.Errorf("failed to listen on node management socket socket: %w", err)
 	}
diff --git a/metropolis/node/ports.go b/metropolis/node/ports.go
index f5f845a..793a68c 100644
--- a/metropolis/node/ports.go
+++ b/metropolis/node/ports.go
@@ -36,9 +36,9 @@
 	// WireGuardPort is the UDP port on which the Wireguard Kubernetes network
 	// overlay listens for incoming peer traffic.
 	WireGuardPort Port = 7838
-	// NodeManagement is the TCP port on which the node-local management service
+	// NodeManagementPort is the TCP port on which the node-local management service
 	// serves gRPC traffic for NodeManagement.
-	NodeManagement Port = 7839
+	NodeManagementPort Port = 7839
 	// MetricsPort is the TCP port on which the Metrics Service exports
 	// Prometheus-compatible metrics for this node, secured using TLS and the
 	// Cluster/Node certificates.
@@ -83,7 +83,7 @@
 	ConsensusPort,
 	DebugServicePort,
 	WireGuardPort,
-	NodeManagement,
+	NodeManagementPort,
 	MetricsPort,
 	MetricsNodeListenerPort,
 	MetricsEtcdListenerPort,
@@ -103,7 +103,7 @@
 		return "debug"
 	case WireGuardPort:
 		return "wireguard"
-	case NodeManagement:
+	case NodeManagementPort:
 		return "node-mgmt"
 	case KubernetesAPIPort:
 		return "kubernetes-api"