diff --git a/metropolis/proto/api/debug.proto b/metropolis/proto/api/debug.proto
index 2483360..5648ae7 100644
--- a/metropolis/proto/api/debug.proto
+++ b/metropolis/proto/api/debug.proto
@@ -15,12 +15,12 @@
 // limitations under the License.
 
 syntax = "proto3";
-package smalltown.core.proto.api;
+package metropolis.proto.api;
 option go_package = "git.monogon.dev/source/nexantic.git/metropolis/proto/api";
 
 import "metropolis/proto/api/enrolment.proto";
 
-// NodeDebugService exposes debug and testing endpoints that allow introspection into a running Smalltown instance.
+// NodeDebugService exposes debug and testing endpoints that allow introspection into a running Metropolis node.
 // It is not authenticated and will be disabled in production. It is currently consumed by metropolis/cli/dbg and
 // by tests.
 service NodeDebugService {
@@ -33,11 +33,11 @@
     // For more information about this API, see //metropolis/node/core/logtree. But, in summary:
     //   - All logging is performed to a DN (distinguished name), which is a dot-delimited string like foo.bar.baz.
     //   - Log entries can be either raw (coming from unstructured logging from an external service, like a running
-    //     process) or leveled (emitted by Smalltown code with a source line, timestamp, and severity).
+    //     process) or leveled (emitted by Metropolis code with a source line, timestamp, and severity).
     //   - The DNs form a tree of logging nodes - and when requesting logs, a given subtree of DNs can be requested,
     //     instead of just a given DN.
     //   - All supervised processes live at `root.<supervisor DN>`. For more example paths, see the console logs of
-    //     a running Smalltown instance, or request all logs (at DN "").
+    //     a running Metropolis node, or request all logs (at DN "").
     //
     // TODO(q3k): move method and its related messages to the non-debug node endpoint once we have one.
     rpc GetLogs(GetLogsRequest) returns (stream GetLogsResponse);
diff --git a/metropolis/proto/api/enrolment.proto b/metropolis/proto/api/enrolment.proto
index c07e4ea..3c9b862 100644
--- a/metropolis/proto/api/enrolment.proto
+++ b/metropolis/proto/api/enrolment.proto
@@ -15,11 +15,12 @@
 // limitations under the License.
 
 syntax = "proto3";
-package smalltown.core.proto.api;
+package metropolis.proto.api;
 option go_package = "git.monogon.dev/source/nexantic.git/metropolis/proto/api";
 
-// EnrolmentConfig is the single boot configuration file contained in the Smalltown ESP. It configures
-// the way the node will start up (what cluster it will join/enroll into/create).
+// EnrolmentConfig is the single Metropolis node boot configuration file
+// contained in the ESP. It configures the way the node will start up (what
+// cluster it will join/enroll into/create).
 message EnrolmentConfig {
     // Debug/temporary cluster enrolment method. If set, the node will attempt to enroll into the
     // cluster that this ticket was generated for. Otherwise, a new cluster will be created.
diff --git a/metropolis/proto/common/common.proto b/metropolis/proto/common/common.proto
index def91e8..4defcbe 100644
--- a/metropolis/proto/common/common.proto
+++ b/metropolis/proto/common/common.proto
@@ -15,7 +15,7 @@
 // limitations under the License.
 
 syntax = "proto3";
-package smalltown.core.proto.common;
+package metropolis.proto.common;
 option go_package = "git.monogon.dev/source/nexantic.git/metropolis/proto/common";
 
 enum TrustBackend {
diff --git a/metropolis/proto/internal/internal.proto b/metropolis/proto/internal/internal.proto
index c5aa259..e82fe96 100644
--- a/metropolis/proto/internal/internal.proto
+++ b/metropolis/proto/internal/internal.proto
@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option go_package = "git.monogon.dev/source/nexantic.git/metropolis/proto/internal";
-package smalltown.core.proto.internal;
+package metropolis.proto.internal;
 
 // Node describes a single node's state in etcd
 message Node {