diff --git a/src/Plugin/Compiler.php b/src/Plugin/Compiler.php
index 589b8c3..1944b4b 100644
--- a/src/Plugin/Compiler.php
+++ b/src/Plugin/Compiler.php
@@ -114,7 +114,9 @@ static function (ServiceMethodDescriptor $method): File\MethodDescriptor {
             }
 
             if ($options->emitMetadata && !$index->empty()) {
-                $descriptorName = Naming::descriptorName($source);
+                // A user message/enum may already occupy "DescriptorRegistry" in
+                // this namespace — that is not their fault, so rename ours instead.
+                $descriptorName = Naming::descriptorName(self::topLevelClassNames($proto));
 
                 yield $generator->generateDescriptorMetadataRegistry(
                     $index,
@@ -156,6 +158,27 @@ private function doGenerateMessages(ClassLikeGenerator $generator, MessageDescri
         }
     }
 
+    /**
+     * The class names generated directly in the file's namespace — the top-level
+     * messages and enums the descriptor registry must not clash with.
+     *
+     * @return array<string, true>
+     */
+    private static function topLevelClassNames(FileDescriptor $proto): array
+    {
+        $names = [];
+
+        foreach ($proto->messages as $message) {
+            $names[Naming::pascalCase($message->name)] = true;
+        }
+
+        foreach ($proto->enums as $enum) {
+            $names[Naming::pascalCase($enum->name)] = true;
+        }
+
+        return $names;
+    }
+
     /**
      * @return non-empty-string
      * @throws CodeCannotBeGenerated
diff --git a/src/Plugin/Generator/ProtoGenerator.php b/src/Plugin/Generator/ProtoGenerator.php
index 4b2ec9a..425cf10 100644
--- a/src/Plugin/Generator/ProtoGenerator.php
+++ b/src/Plugin/Generator/ProtoGenerator.php
@@ -308,7 +308,7 @@ private function generateMessage(PhpNamespace $namespace, string $className, Par
                                 '',
                                 $this->namespacer->namespace,
                                 $message->path,
-                                \sprintf("{$oneOfName}%s::class", Naming::pascalCase($variant->name)),
+                                \sprintf('%s::class', self::oneofVariantName($oneOfName, $variant)),
                             ]),
                         ),
                         $variants,
@@ -358,7 +358,7 @@ private function generateOneof(
             ->addComment('@api')
             ->addComment('@phpstan-sealed (')
             ->addComment(implode(" |\n", array_map(
-                static fn(Parser\FieldDescriptor $variant) => \sprintf('  %s', self::oneofVariantName($oneof->name, $variant->name)),
+                static fn(Parser\FieldDescriptor $variant) => \sprintf('  %s', self::oneofVariantName($oneof->name, $variant)),
                 $variants,
             )))
             ->addComment(')');
@@ -381,7 +381,7 @@ private function generateOneofVariant(
         Parser\FieldDescriptor $variant,
     ): iterable {
         $interfaceName = Naming::pascalCase($oneof->name);
-        $className = self::oneofVariantName($oneof->name, $variant->name);
+        $className = self::oneofVariantName($oneof->name, $variant);
 
         $descriptor = new Parser\MessageDescriptor(
             name: $className,
@@ -449,8 +449,14 @@ private function parseDefaultValue(
         };
     }
 
-    private static function oneofVariantName(string $oneof, string $variant): string
+    private static function oneofVariantName(string $oneof, Parser\FieldDescriptor $variant): string
     {
-        return Naming::pascalCase("{$oneof} {$variant}");
+        if ($variant->jsonName !== null) {
+            $name = \sprintf('%s%s', Naming::pascalCase($oneof), ucfirst($variant->jsonName));
+        } else {
+            $name = Naming::pascalCase("{$oneof} {$variant->name}");
+        }
+
+        return Naming::secure($name);
     }
 }
diff --git a/src/Plugin/Naming.php b/src/Plugin/Naming.php
index 7f96c7c..aa70293 100644
--- a/src/Plugin/Naming.php
+++ b/src/Plugin/Naming.php
@@ -102,14 +102,29 @@ enum Naming
         'class' => 1,
     ];
 
-    public static function descriptorName(string $file): string
+    /**
+     * The descriptor registry is normally `DescriptorRegistry`, but a user
+     * message or enum may already own that class name in the same namespace.
+     * That is not the user's fault, so we step aside with a numeric suffix — a
+     * digit survives the PascalCase/path normalisation an underscore would not.
+     *
+     * @param array<string, mixed> $taken class names already used in the namespace
+     */
+    public static function descriptorName(array $taken = []): string
     {
-        $info = pathinfo($file);
-        $dir = $info['dirname'] ?? '.';
-        $filename = $info['filename'];
-        $name = Naming::pascalCase(self::words(($dir !== '.' ? "{$dir} " : '') . $filename));
+        $base = 'DescriptorRegistry';
+
+        if (!isset($taken[$base])) {
+            return $base;
+        }
+
+        $suffix = 2;
 
-        return "{$name}DescriptorRegistry";
+        while (isset($taken[$base . $suffix])) {
+            ++$suffix;
+        }
+
+        return $base . $suffix;
     }
 
     public static function camelCase(string $name): string
@@ -168,11 +183,6 @@ public static function path(string $path): string
         ));
     }
 
-    private static function words(string $name): string
-    {
-        return trim((string) preg_replace('/[^a-zA-Z0-9]+/', ' ', $name));
-    }
-
     public static function secure(string $name): string
     {
         return isset(self::CLASS_NAMES_RESERVED_WORDS[strtolower($name)]) ? "{$name}_" : $name;
diff --git a/tests/NamingTest.php b/tests/NamingTest.php
index 419aa19..164de2b 100644
--- a/tests/NamingTest.php
+++ b/tests/NamingTest.php
@@ -12,15 +12,17 @@
 #[CoversClass(Naming::class)]
 final class NamingTest extends TestCase
 {
-    #[TestWith(['pg_query.proto', 'PgQueryDescriptorRegistry'])]
-    #[TestWith(['protos/queue.proto', 'ProtosQueueDescriptorRegistry'])]
-    #[TestWith(['.build/libpg_query/protobuf/pg_query.proto', 'BuildLibpgQueryProtobufPgQueryDescriptorRegistry'])]
-    #[TestWith(['./api/v1/main.proto', 'ApiV1MainDescriptorRegistry'])]
-    #[TestWith(['pg-query.proto', 'PgQueryDescriptorRegistry'])]
-    #[TestWith(['api/v1.beta/main.proto', 'ApiV1BetaMainDescriptorRegistry'])]
-    public function testDescriptorName(string $actual, string $expected): void
+    public function testDescriptorName(): void
     {
-        self::assertSame($expected, Naming::descriptorName($actual));
+        self::assertSame('DescriptorRegistry', Naming::descriptorName());
+        self::assertSame('DescriptorRegistry', Naming::descriptorName(['SomeMessage' => true]));
+
+        // A user type already occupies the name — ours steps aside.
+        self::assertSame('DescriptorRegistry2', Naming::descriptorName(['DescriptorRegistry' => true]));
+        self::assertSame('DescriptorRegistry3', Naming::descriptorName([
+            'DescriptorRegistry' => true,
+            'DescriptorRegistry2' => true,
+        ]));
     }
 
     #[TestWith(['foo', 'foo'])]
diff --git a/tests/fixtures/pgquery/pgquery.proto b/tests/fixtures/pgquery/pgquery.proto
new file mode 100644
index 0000000..891806f
--- /dev/null
+++ b/tests/fixtures/pgquery/pgquery.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package pg_query;
+
+message Node {
+    oneof node {
+        RTEPermissionInfo rtepermission_info = 99 [json_name="RTEPermissionInfo"];
+    }
+}
+
+message RTEPermissionInfo
+{
+    bool inh = 2 [json_name="inh"];
+}
diff --git a/tests/fixtures/registry_collision/registry_collision.proto b/tests/fixtures/registry_collision/registry_collision.proto
new file mode 100644
index 0000000..2901fe3
--- /dev/null
+++ b/tests/fixtures/registry_collision/registry_collision.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package registry.collision;
+
+// A user message that already occupies the class name the descriptor registry
+// would otherwise take. Generation must succeed by renaming ours, not error.
+message DescriptorRegistry {
+    string value = 1;
+}
diff --git a/tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DepDescriptorRegistry.php b/tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DescriptorRegistry.php
similarity index 92%
rename from tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DepDescriptorRegistry.php
rename to tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DescriptorRegistry.php
index c15be3a..bfd0304 100644
--- a/tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DepDescriptorRegistry.php
+++ b/tests/snapshots/dependency_php_namespace/Test/Deps/Custom/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class DepDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'CglkZXAucHJvdG8SCmRlcC5wa2cudjEiDAoKRGVwTWVzc2FnZUIVSAHKAhBUZXN0XERlcHNcQ3VzdG9tSkgKBhIEAAAFFQoICgEMEgMAABIKCAoBAhIDAgATCggKAQgSAwMALAoJCgIIKRIDAwAsCgkKAgQAEgMFABUKCgoDBAABEgMFCBJiBnByb3RvMw==';
 
diff --git a/tests/snapshots/dependency_php_namespace/Test/Main/V1/MainDescriptorRegistry.php b/tests/snapshots/dependency_php_namespace/Test/Main/V1/DescriptorRegistry.php
similarity index 93%
rename from tests/snapshots/dependency_php_namespace/Test/Main/V1/MainDescriptorRegistry.php
rename to tests/snapshots/dependency_php_namespace/Test/Main/V1/DescriptorRegistry.php
index ddfefa7..7869c6b 100644
--- a/tests/snapshots/dependency_php_namespace/Test/Main/V1/MainDescriptorRegistry.php
+++ b/tests/snapshots/dependency_php_namespace/Test/Main/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class MainDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'CgptYWluLnByb3RvEgx0ZXN0Lm1haW4udjEaCWRlcC5wcm90byI3CgtNYWluTWVzc2FnZRIoCgNkZXAYASABKAsyFi5kZXAucGtnLnYxLkRlcE1lc3NhZ2VSA2RlcEp2CgYSBAAACAEKCAoBDBIDAAASCggKAQISAwIAFQoJCgIDABIDBAATCgoKAgQAEgQGAAgBCgoKAwQAARIDBggTCgsKBAQAAgASAwcCIAoMCgUEAAIABhIDBwIXCgwKBQQAAgABEgMHGBsKDAoFBAACAAMSAwceH2IGcHJvdG8z';
 
diff --git a/tests/snapshots/dependency_php_namespace/Test/autoload.metadata.php b/tests/snapshots/dependency_php_namespace/Test/autoload.metadata.php
index 07dd5b4..5baef85 100644
--- a/tests/snapshots/dependency_php_namespace/Test/autoload.metadata.php
+++ b/tests/snapshots/dependency_php_namespace/Test/autoload.metadata.php
@@ -10,6 +10,6 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Deps\Custom\DepDescriptorRegistry()),
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Main\V1\MainDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Deps\Custom\DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Main\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/deprecated/Test/Api/V1/DeprecatedDescriptorRegistry.php b/tests/snapshots/deprecated/Test/Api/V1/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/deprecated/Test/Api/V1/DeprecatedDescriptorRegistry.php
rename to tests/snapshots/deprecated/Test/Api/V1/DescriptorRegistry.php
index e035133..c471767 100644
--- a/tests/snapshots/deprecated/Test/Api/V1/DeprecatedDescriptorRegistry.php
+++ b/tests/snapshots/deprecated/Test/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class DeprecatedDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChBkZXByZWNhdGVkLnByb3RvEgt0ZXN0LmFwaS52MSJSCgdSZXF1ZXN0EhYKBG5hbWUYASABKAlSBG5hbWVCAhgBGisKDU5lc3RlZFJlcXVlc3QSFgoEbmFtZRgBIAEoCVIEbmFtZUICGAE6AhgBOgIYASo1CgRUeXBlEhgKEFRZUEVfVU5TUEVDSUZJRUQQABoCCAESDwoLVFlQRV9QUk9UTzMQARoCGAEySwoLRWNob1NlcnZpY2USNwoERWNobxIULnRlc3QuYXBpLnYxLlJlcXVlc3QaFC50ZXN0LmFwaS52MS5SZXF1ZXN0IgOIAgEaA4gCAUq+BgoGEgQAACUBCggKAQwSAwAAEgoICgECEgMCABQKIQoCBQASBAUACwEaFSBUeXBlIGlzIGRlcHJlY2F0ZWQuCgoKCgMFAAESAwUFCQoKCgMFAAMSAwYEHQoLCgQFAAMDEgMGBB0KIgoEBQACABIDCQQtGhUgQ2FzZSBpcyBkZXByZWNhdGVkLgoKDAoFBQACAAESAwkEFAoMCgUFAAIAAhIDCRcYCgwKBQUAAgADEgMJGSwKDQoGBQACAAMBEgMJGisKCwoEBQACARIDCgQUCgwKBQUAAgEBEgMKBA8KDAoFBQACAQISAwoSEwokCgIEABIEDgAbARoYIFJlcXVlc3QgaXMgZGVwcmVjYXRlZC4KCgoKAwQAARIDDggPCgoKAwQABxIDDwQdCgsKBAQABwMSAw8EHQojCgQEAAIAEgMSBCgaFiBGaWVsZCBpcyBkZXByZWNhdGVkLgoKDAoFBAACAAUSAxIECgoMCgUEAAIAARIDEgsPCgwKBQQAAgADEgMSEhMKDAoFBAACAAgSAxIUJwoNCgYEAAIACAMSAxIVJgoyCgQEAAMAEgQVBBoFGiQgTmVzdGVkIG1lc3NhZ2UgaXMgYWxzbyBkZXByZWNhdGVkLgoKDAoFBAADAAESAxUMGQoMCgUEAAMABxIDFgghCg0KBgQAAwAHAxIDFgghCjAKBgQAAwACABIDGQgsGiEgTmVzdGVkIGZpZWxkIGlzIGRlcHJlY2F0ZWQgdG9vLgoKDgoHBAADAAIABRIDGQgOCg4KBwQAAwACAAESAxkPEwoOCgcEAAMAAgADEgMZFhcKDgoHBAADAAIACBIDGRgrCg8KCAQAAwACAAgDEgMZGSoKJAoCBgASBB4AJQEaGCBTZXJ2aWNlIGlzIGRlcHJlY2F0ZWQuCgoKCgMGAAESAx4IEwoKCgMGAAMSAx8EHQoLCgQGAAMhEgMfBB0KJwoEBgACABIEIgQkBRoZIFJwYyBpcyBhbHNvIGRlcHJlY2F0ZWQuCgoMCgUGAAIAARIDIggMCgwKBQYAAgACEgMiDRQKDAoFBgACAAMSAyIfJgoMCgUGAAIABBIDIwghCg0KBgYAAgAEIRIDIwghYgZwcm90bzM=';
 
diff --git a/tests/snapshots/deprecated/Test/Api/V1/autoload.metadata.php b/tests/snapshots/deprecated/Test/Api/V1/autoload.metadata.php
index a055970..78c23ef 100644
--- a/tests/snapshots/deprecated/Test/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/deprecated/Test/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Api\V1\DeprecatedDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Test\Api\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/editions/Proto/Api/V1/EditionsDescriptorRegistry.php b/tests/snapshots/editions/Proto/Api/V1/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/editions/Proto/Api/V1/EditionsDescriptorRegistry.php
rename to tests/snapshots/editions/Proto/Api/V1/DescriptorRegistry.php
index bbbed3b..8feb0ca 100644
--- a/tests/snapshots/editions/Proto/Api/V1/EditionsDescriptorRegistry.php
+++ b/tests/snapshots/editions/Proto/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class EditionsDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = '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';
 
diff --git a/tests/snapshots/editions/Proto/Api/V1/autoload.metadata.php b/tests/snapshots/editions/Proto/Api/V1/autoload.metadata.php
index 1b97afb..785445c 100644
--- a/tests/snapshots/editions/Proto/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/editions/Proto/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\EditionsDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/grpc/Thesis/Auth/ProtosAuthDescriptorRegistry.php b/tests/snapshots/grpc/Thesis/Auth/DescriptorRegistry.php
similarity index 94%
rename from tests/snapshots/grpc/Thesis/Auth/ProtosAuthDescriptorRegistry.php
rename to tests/snapshots/grpc/Thesis/Auth/DescriptorRegistry.php
index ae36bbb..a4e867d 100644
--- a/tests/snapshots/grpc/Thesis/Auth/ProtosAuthDescriptorRegistry.php
+++ b/tests/snapshots/grpc/Thesis/Auth/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class ProtosAuthDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChFwcm90b3MvYXV0aC5wcm90bxILVGhlc2lzLkF1dGgiPgoMTG9naW5SZXF1ZXN0EhIKBHVzZXIYAiABKAlSBHVzZXISGgoIcGFzc3dvcmQYAyABKAlSCHBhc3N3b3JkIiUKDUxvZ2luUmVzcG9uc2USFAoFdG9rZW4YASABKAlSBXRva2VuSvEBCgYSBAAACwEKCAoBDBIDAAASCggKAQISAwIAFAoKCgIEABIEBAAHAQoKCgMEAAESAwQIFAoLCgQEAAIAEgMFBBQKDAoFBAACAAUSAwUECgoMCgUEAAIAARIDBQsPCgwKBQQAAgADEgMFEhMKCwoEBAACARIDBgQYCgwKBQQAAgEFEgMGBAoKDAoFBAACAQESAwYLEwoMCgUEAAIBAxIDBhYXCgoKAgQBEgQJAAsBCgoKAwQBARIDCQgVCgsKBAQBAgASAwoEFQoMCgUEAQIABRIDCgQKCgwKBQQBAgABEgMKCxAKDAoFBAECAAMSAwoTFGIGcHJvdG8z';
 
diff --git a/tests/snapshots/grpc/Thesis/Auth/V1/AuthV1DescriptorRegistry.php b/tests/snapshots/grpc/Thesis/Auth/V1/DescriptorRegistry.php
similarity index 94%
rename from tests/snapshots/grpc/Thesis/Auth/V1/AuthV1DescriptorRegistry.php
rename to tests/snapshots/grpc/Thesis/Auth/V1/DescriptorRegistry.php
index 59986ac..a677d6c 100644
--- a/tests/snapshots/grpc/Thesis/Auth/V1/AuthV1DescriptorRegistry.php
+++ b/tests/snapshots/grpc/Thesis/Auth/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class AuthV1DescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'Cg1hdXRoX3YxLnByb3RvEg5UaGVzaXMuQXV0aC5WMRoRcHJvdG9zL2F1dGgucHJvdG8yTQoLQXV0aFNlcnZpY2USPgoFTG9naW4SGS5UaGVzaXMuQXV0aC5Mb2dpblJlcXVlc3QaGi5UaGVzaXMuQXV0aC5Mb2dpblJlc3BvbnNlSnYKBhIEAAAIAQoICgEMEgMAABIKCAoBAhIDAgAXCgkKAgMAEgMEABsKCgoCBgASBAYACAEKCgoDBgABEgMGCBMKCwoEBgACABIDBwQ+CgwKBQYAAgABEgMHCA0KDAoFBgACAAISAwcOHwoMCgUGAAIAAxIDByo8YgZwcm90bzM=';
 
diff --git a/tests/snapshots/grpc/Thesis/Queue/ProtosQueueDescriptorRegistry.php b/tests/snapshots/grpc/Thesis/Queue/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/grpc/Thesis/Queue/ProtosQueueDescriptorRegistry.php
rename to tests/snapshots/grpc/Thesis/Queue/DescriptorRegistry.php
index 05ae4c2..07cce24 100644
--- a/tests/snapshots/grpc/Thesis/Queue/ProtosQueueDescriptorRegistry.php
+++ b/tests/snapshots/grpc/Thesis/Queue/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class ProtosQueueDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChJwcm90b3MvcXVldWUucHJvdG8SDFRoZXNpcy5RdWV1ZSIyCgtQdXNoUmVxdWVzdBojCgdNZXNzYWdlEhgKB2NvbnRlbnQYASABKAlSB2NvbnRlbnQiVAoLUHVsbFJlcXVlc3QSEAoDcW9zGAEgASgFUgNxb3MaMwoHTWVzc2FnZRIYCgdjb250ZW50GAEgASgJUgdjb250ZW50Eg4KAmlkGAIgASgJUgJpZCI3CglIZWFydGJlYXQaFAoKRnJvbVNlcnZlchoGCgRQaW5nGhQKCkZyb21DbGllbnQaBgoEUGluZ0qGBAoGEgQAABsBCggKAQwSAwAAEgoICgECEgMCABUKCgoCBAASBAQACAEKCgoDBAABEgMECBMKDAoEBAADABIEBQQHBQoMCgUEAAMAARIDBQwTCg0KBgQAAwACABIDBggbCg4KBwQAAwACAAUSAwYIDgoOCgcEAAMAAgABEgMGDxYKDgoHBAADAAIAAxIDBhkaCgoKAgQBEgQKABEBCgoKAwQBARIDCggTCgwKBAQBAwASBAsEDgUKDAoFBAEDAAESAwsMEwoNCgYEAQMAAgASAwwIGwoOCgcEAQMAAgAFEgMMCA4KDgoHBAEDAAIAARIDDA8WCg4KBwQBAwACAAMSAwwZGgoNCgYEAQMAAgESAw0IFgoOCgcEAQMAAgEFEgMNCA4KDgoHBAEDAAIBARIDDQ8RCg4KBwQBAwACAQMSAw0UFQoLCgQEAQIAEgMQBBIKDAoFBAECAAUSAxAECQoMCgUEAQIAARIDEAoNCgwKBQQBAgADEgMQEBEKCgoCBAISBBMAGwEKCgoDBAIBEgMTCBEKDAoEBAIDABIEFAQWBQoMCgUEAgMAARIDFAwWCg0KBgQCAwADABIDFQgXCg4KBwQCAwADAAESAxUQFAoMCgQEAgMBEgQYBBoFCgwKBQQCAwEBEgMYDBYKDQoGBAIDAQMAEgMZCBcKDgoHBAIDAQMAARIDGRAUYgZwcm90bzM=';
 
diff --git a/tests/snapshots/grpc/Thesis/Queue/V1/QueueV1DescriptorRegistry.php b/tests/snapshots/grpc/Thesis/Queue/V1/DescriptorRegistry.php
similarity index 96%
rename from tests/snapshots/grpc/Thesis/Queue/V1/QueueV1DescriptorRegistry.php
rename to tests/snapshots/grpc/Thesis/Queue/V1/DescriptorRegistry.php
index caeec47..260203d 100644
--- a/tests/snapshots/grpc/Thesis/Queue/V1/QueueV1DescriptorRegistry.php
+++ b/tests/snapshots/grpc/Thesis/Queue/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class QueueV1DescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'Cg5xdWV1ZV92MS5wcm90bxIPVGhlc2lzLlF1ZXVlLlYxGhJwcm90b3MvcXVldWUucHJvdG8aG2dvb2dsZS9wcm90b2J1Zi9lbXB0eS5wcm90bzL+AQoMUXVldWVTZXJ2aWNlEkMKBFB1c2gSIS5UaGVzaXMuUXVldWUuUHVzaFJlcXVlc3QuTWVzc2FnZRoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSgBEkYKBFB1bGwSGS5UaGVzaXMuUXVldWUuUHVsbFJlcXVlc3QaIS5UaGVzaXMuUXVldWUuUHVsbFJlcXVlc3QuTWVzc2FnZTABEmEKCUhlYXJ0YmVhdBInLlRoZXNpcy5RdWV1ZS5IZWFydGJlYXQuRnJvbUNsaWVudC5QaW5nGicuVGhlc2lzLlF1ZXVlLkhlYXJ0YmVhdC5Gcm9tU2VydmVyLlBpbmcoATABSqcCCgYSBAAACwEKCAoBDBIDAAASCggKAQISAwIAGAoJCgIDABIDBAAcCgkKAgMBEgMFACUKCgoCBgASBAcACwEKCgoDBgABEgMHCBQKCwoEBgACABIDCARJCgwKBQYAAgABEgMICAwKDAoFBgACAAUSAwgNEwoMCgUGAAIAAhIDCBQnCgwKBQYAAgADEgMIMkcKCwoEBgACARIDCQQ/CgwKBQYAAgEBEgMJCAwKDAoFBgACAQISAwkNGAoMCgUGAAIBBhIDCSMpCgwKBQYAAgEDEgMJKj0KCwoEBgACAhIDCgRgCgwKBQYAAgIBEgMKCBEKDAoFBgACAgUSAwoTGQoMCgUGAAICAhIDChozCgwKBQYAAgIGEgMKPkQKDAoFBgACAgMSAwpFXmIGcHJvdG8z';
 
diff --git a/tests/snapshots/grpc/Thesis/autoload.metadata.php b/tests/snapshots/grpc/Thesis/autoload.metadata.php
index f05c147..dd34858 100644
--- a/tests/snapshots/grpc/Thesis/autoload.metadata.php
+++ b/tests/snapshots/grpc/Thesis/autoload.metadata.php
@@ -10,8 +10,8 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Auth\V1\AuthV1DescriptorRegistry()),
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Auth\ProtosAuthDescriptorRegistry()),
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Queue\ProtosQueueDescriptorRegistry()),
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Queue\V1\QueueV1DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Auth\V1\DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Auth\DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Queue\DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Queue\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/naming/Naming/NamingDescriptorRegistry.php b/tests/snapshots/naming/Naming/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/naming/Naming/NamingDescriptorRegistry.php
rename to tests/snapshots/naming/Naming/DescriptorRegistry.php
index 8223ec4..f0eebc8 100644
--- a/tests/snapshots/naming/Naming/NamingDescriptorRegistry.php
+++ b/tests/snapshots/naming/Naming/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class NamingDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'CgxuYW1pbmcucHJvdG8SBm5hbWluZyKPAwoGTmFtaW5nEhcKB3VzZXJfaWQYASABKAlSBnVzZXJJZBIoChBodHRwX3N0YXR1c19jb2RlGAIgASgJUg5odHRwU3RhdHVzQ29kZRIOCgJJRBgDIAEoBFICSUQSEAoDVFRMGAQgASgEUgNUVEwSEAoDVVJMGAUgASgJUgNVUkwSFwoHdXNlcl9JRBgGIAEoCVIGdXNlcklEEhsKCWxlYXNlX1RUTBgHIAEoCVIIbGVhc2VUVEwSGwoJSURfcHJlZml4GAggASgJUghJRFByZWZpeBIiCgxhbHJlYWR5Q2FtZWwYCSABKAlSDGFscmVhZHlDYW1lbBIYCgdsZWFzZUlEGAogASgJUgdsZWFzZUlEEh4KCkhUVFBTdGF0dXMYCyABKAlSCkhUVFBTdGF0dXMSDAoBYRgMIAEoCVIBYRIXCgdmaWVsZF8yGA0gASgJUgZmaWVsZDISGwoJdHJhaWxpbmdfGA4gASgJUgh0cmFpbGluZxIZCghfbGVhZGluZxgPIAEoCVIHTGVhZGluZ0rtBgoGEgQAABgBCggKAQwSAwAAEgoICgECEgMCAA8KCgoCBAASBAQAGAEKCgoDBAABEgMECA4KCwoEBAACABIDBQQXCgwKBQQAAgAFEgMFBAoKDAoFBAACAAESAwULEgoMCgUEAAIAAxIDBRUWCgsKBAQAAgESAwYEIAoMCgUEAAIBBRIDBgQKCgwKBQQAAgEBEgMGCxsKDAoFBAACAQMSAwYeHwoLCgQEAAICEgMIBBIKDAoFBAACAgUSAwgECgoMCgUEAAICARIDCAsNCgwKBQQAAgIDEgMIEBEKCwoEBAACAxIDCQQTCgwKBQQAAgMFEgMJBAoKDAoFBAACAwESAwkLDgoMCgUEAAIDAxIDCRESCgsKBAQAAgQSAwoEEwoMCgUEAAIEBRIDCgQKCgwKBQQAAgQBEgMKCw4KDAoFBAACBAMSAwoREgoLCgQEAAIFEgMMBBcKDAoFBAACBQUSAwwECgoMCgUEAAIFARIDDAsSCgwKBQQAAgUDEgMMFRYKCwoEBAACBhIDDQQZCgwKBQQAAgYFEgMNBAoKDAoFBAACBgESAw0LFAoMCgUEAAIGAxIDDRcYCgsKBAQAAgcSAw4EGQoMCgUEAAIHBRIDDgQKCgwKBQQAAgcBEgMOCxQKDAoFBAACBwMSAw4XGAoLCgQEAAIIEgMQBBwKDAoFBAACCAUSAxAECgoMCgUEAAIIARIDEAsXCgwKBQQAAggDEgMQGhsKCwoEBAACCRIDEQQYCgwKBQQAAgkFEgMRBAoKDAoFBAACCQESAxELEgoMCgUEAAIJAxIDERUXCgsKBAQAAgoSAxIEGwoMCgUEAAIKBRIDEgQKCgwKBQQAAgoBEgMSCxUKDAoFBAACCgMSAxIYGgoLCgQEAAILEgMUBBIKDAoFBAACCwUSAxQECgoMCgUEAAILARIDFAsMCgwKBQQAAgsDEgMUDxEKCwoEBAACDBIDFQQYCgwKBQQAAgwFEgMVBAoKDAoFBAACDAESAxULEgoMCgUEAAIMAxIDFRUXCgsKBAQAAg0SAxYEGgoMCgUEAAINBRIDFgQKCgwKBQQAAg0BEgMWCxQKDAoFBAACDQMSAxYXGQoLCgQEAAIOEgMXBBkKDAoFBAACDgUSAxcECgoMCgUEAAIOARIDFwsTCgwKBQQAAg4DEgMXFhhiBnByb3RvMw==';
 
diff --git a/tests/snapshots/naming/Naming/autoload.metadata.php b/tests/snapshots/naming/Naming/autoload.metadata.php
index b779000..635cbbc 100644
--- a/tests/snapshots/naming/Naming/autoload.metadata.php
+++ b/tests/snapshots/naming/Naming/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Naming\NamingDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Naming\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/no_package/Tmp/NoPkg/TestDescriptorRegistry.php b/tests/snapshots/no_package/Tmp/NoPkg/DescriptorRegistry.php
similarity index 93%
rename from tests/snapshots/no_package/Tmp/NoPkg/TestDescriptorRegistry.php
rename to tests/snapshots/no_package/Tmp/NoPkg/DescriptorRegistry.php
index a66924a..9b0db13 100644
--- a/tests/snapshots/no_package/Tmp/NoPkg/TestDescriptorRegistry.php
+++ b/tests/snapshots/no_package/Tmp/NoPkg/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class TestDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'Cgp0ZXN0LnByb3RvIhUKAUESEAoBYhgBIAEoCzICLkJSAWIiEQoBQhIMCgF2GAEgASgJUgF2Qg5IAcoCCVRtcFxOb1BrZ0rFAQoGEgQAAAoBCggKAQwSAwAAEgoICgEIEgMCACQKCQoCCCkSAwIAJAoKCgIEABIEBAAGAQoKCgMEAAESAwQICQoLCgQEAAIAEgMFAgoKDAoFBAACAAYSAwUCAwoMCgUEAAIAARIDBQQFCgwKBQQAAgADEgMFCAkKCgoCBAESBAgACgEKCgoDBAEBEgMICAkKCwoEBAECABIDCQIPCgwKBQQBAgAFEgMJAggKDAoFBAECAAESAwkJCgoMCgUEAQIAAxIDCQ0OYgZwcm90bzM=';
 
diff --git a/tests/snapshots/no_package/Tmp/NoPkg/autoload.metadata.php b/tests/snapshots/no_package/Tmp/NoPkg/autoload.metadata.php
index 1cf2ff6..2d95305 100644
--- a/tests/snapshots/no_package/Tmp/NoPkg/autoload.metadata.php
+++ b/tests/snapshots/no_package/Tmp/NoPkg/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Tmp\NoPkg\TestDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Tmp\NoPkg\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/pgquery/PgQuery/DescriptorRegistry.php b/tests/snapshots/pgquery/PgQuery/DescriptorRegistry.php
new file mode 100644
index 0000000..ed662fa
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/DescriptorRegistry.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: pgquery.proto
+ */
+
+declare(strict_types=1);
+
+namespace PgQuery;
+
+use Override;
+use Thesis\Protobuf\Registry;
+use Thesis\Protobuf\Registry\File;
+
+/**
+ * @api
+ */
+final readonly class DescriptorRegistry implements Registry\Registrar
+{
+    private const string DESCRIPTOR_BUFFER = 'Cg1wZ3F1ZXJ5LnByb3RvEghwZ19xdWVyeSJcCgROb2RlEkwKEnJ0ZXBlcm1pc3Npb25faW5mbxhjIAEoCzIbLnBnX3F1ZXJ5LlJURVBlcm1pc3Npb25JbmZvSABSEVJURVBlcm1pc3Npb25JbmZvQgYKBG5vZGUiJQoRUlRFUGVybWlzc2lvbkluZm8SEAoDaW5oGAIgASgIUgNpbmhKqgIKBhIEAAANAQoICgEMEgMAABIKCAoBAhIDAgARCgoKAgQAEgQEAAgBCgoKAwQAARIDBAgMCgwKBAQACAASBAUEBwUKDAoFBAAIAAESAwUKDgoLCgQEAAIAEgMGCFIKDAoFBAACAAYSAwYIGQoMCgUEAAIAARIDBhosCgwKBQQAAgADEgMGLzEKDAoFBAACAAgSAwYyUQoMCgUEAAIAChIDBjNQCgwKBQQAAgAKEgMGPVAKCgoCBAESBAoADQEKCgoDBAEBEgMKCBkKCwoEBAECABIDDAQjCgwKBQQBAgAFEgMMBAgKDAoFBAECAAESAwwJDAoMCgUEAQIAAxIDDA8QCgwKBQQBAgAIEgMMESIKDAoFBAECAAoSAwwSIQoMCgUEAQIAChIDDBwhYgZwcm90bzM=';
+
+    #[Override]
+    public function register(Registry\Pool $pool): void
+    {
+        $pool->add(Registry\Descriptor::base64(self::DESCRIPTOR_BUFFER), new File(
+            name: 'pgquery.proto',
+            messages: [
+                new File\MessageDescriptor('pg_query.Node', \PgQuery\Node::class),
+                new File\MessageDescriptor('pg_query.RTEPermissionInfo', \PgQuery\RTEPermissionInfo::class),
+            ],
+        ));
+    }
+}
diff --git a/tests/snapshots/pgquery/PgQuery/Node.php b/tests/snapshots/pgquery/PgQuery/Node.php
new file mode 100644
index 0000000..a29da6d
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/Node.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: pgquery.proto
+ */
+
+declare(strict_types=1);
+
+namespace PgQuery;
+
+use Thesis\Protobuf\Reflection;
+
+/**
+ * @api
+ */
+final readonly class Node
+{
+    public function __construct(
+        #[Reflection\OneOf([\PgQuery\Node\NodeRTEPermissionInfo::class])]
+        public ?\PgQuery\Node\Node $node = null,
+    ) {}
+}
diff --git a/tests/snapshots/pgquery/PgQuery/Node/Node.php b/tests/snapshots/pgquery/PgQuery/Node/Node.php
new file mode 100644
index 0000000..c66310d
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/Node/Node.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: pgquery.proto
+ */
+
+declare(strict_types=1);
+
+namespace PgQuery\Node;
+
+/**
+ * @api
+ * @phpstan-sealed (
+ *   NodeRTEPermissionInfo
+ * )
+ */
+interface Node {}
diff --git a/tests/snapshots/pgquery/PgQuery/Node/NodeRTEPermissionInfo.php b/tests/snapshots/pgquery/PgQuery/Node/NodeRTEPermissionInfo.php
new file mode 100644
index 0000000..ea39ec2
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/Node/NodeRTEPermissionInfo.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: pgquery.proto
+ */
+
+declare(strict_types=1);
+
+namespace PgQuery\Node;
+
+use Thesis\Protobuf\Reflection;
+
+/**
+ * @api
+ */
+final readonly class NodeRTEPermissionInfo implements \PgQuery\Node\Node
+{
+    public function __construct(
+        #[Reflection\Field(99, new Reflection\ObjectT(\PgQuery\RTEPermissionInfo::class))]
+        public ?\PgQuery\RTEPermissionInfo $RTEPermissionInfo = null,
+    ) {}
+}
diff --git a/tests/snapshots/pgquery/PgQuery/RTEPermissionInfo.php b/tests/snapshots/pgquery/PgQuery/RTEPermissionInfo.php
new file mode 100644
index 0000000..7327d98
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/RTEPermissionInfo.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: pgquery.proto
+ */
+
+declare(strict_types=1);
+
+namespace PgQuery;
+
+use Thesis\Protobuf\Reflection;
+
+/**
+ * @api
+ */
+final readonly class RTEPermissionInfo
+{
+    public function __construct(
+        #[Reflection\Field(2, Reflection\BoolT::T)]
+        public bool $inh = false,
+    ) {}
+}
diff --git a/tests/snapshots/pgquery/PgQuery/autoload.metadata.php b/tests/snapshots/pgquery/PgQuery/autoload.metadata.php
new file mode 100644
index 0000000..d8bf9d7
--- /dev/null
+++ b/tests/snapshots/pgquery/PgQuery/autoload.metadata.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ */
+
+declare(strict_types=1);
+
+\Thesis\Protobuf\Registry\Pool::get()->register(
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \PgQuery\DescriptorRegistry()),
+);
diff --git a/tests/snapshots/php_namespace/Thesis/Api/V1/PhpNamespaceDescriptorRegistry.php b/tests/snapshots/php_namespace/Thesis/Api/V1/DescriptorRegistry.php
similarity index 92%
rename from tests/snapshots/php_namespace/Thesis/Api/V1/PhpNamespaceDescriptorRegistry.php
rename to tests/snapshots/php_namespace/Thesis/Api/V1/DescriptorRegistry.php
index 1788ad9..bcb14fa 100644
--- a/tests/snapshots/php_namespace/Thesis/Api/V1/PhpNamespaceDescriptorRegistry.php
+++ b/tests/snapshots/php_namespace/Thesis/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class PhpNamespaceDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChNwaHBfbmFtZXNwYWNlLnByb3RvEgt0ZXN0LmFwaS52MSINCgtUZXN0UmVxdWVzdEIYSAHCAgNLZWvKAg1UaGVzaXNcQXBpXFYxSl0KBhIEAAAHFgoICgEMEgMAABIKCAoBCBIDAgApCgkKAggpEgMCACkKCAoBCBIDAwAgCgkKAggoEgMDACAKCAoBAhIDBQAUCgkKAgQAEgMHABYKCgoDBAABEgMHCBNiBnByb3RvMw==';
 
diff --git a/tests/snapshots/php_namespace/Thesis/Api/V1/autoload.metadata.php b/tests/snapshots/php_namespace/Thesis/Api/V1/autoload.metadata.php
index ae58e61..d00014b 100644
--- a/tests/snapshots/php_namespace/Thesis/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/php_namespace/Thesis/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Api\V1\PhpNamespaceDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Thesis\Api\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/proto2/Proto/Api/V1/Proto2DescriptorRegistry.php b/tests/snapshots/proto2/Proto/Api/V1/DescriptorRegistry.php
similarity index 99%
rename from tests/snapshots/proto2/Proto/Api/V1/Proto2DescriptorRegistry.php
rename to tests/snapshots/proto2/Proto/Api/V1/DescriptorRegistry.php
index 52a43c4..400afa0 100644
--- a/tests/snapshots/proto2/Proto/Api/V1/Proto2DescriptorRegistry.php
+++ b/tests/snapshots/proto2/Proto/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class Proto2DescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'Cgxwcm90bzIucHJvdG8SDHByb3RvLmFwaS52MRofZ29vZ2xlL3Byb3RvYnVmL3RpbWVzdGFtcC5wcm90bxoeZ29vZ2xlL3Byb3RvYnVmL2R1cmF0aW9uLnByb3RvGhxnb29nbGUvcHJvdG9idWYvc3RydWN0LnByb3RvGhtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8aGWdvb2dsZS9wcm90b2J1Zi9hbnkucHJvdG8i4SQKC1Rlc3RSZXF1ZXN0EjgKBGtpbmQYASACKA4yHi5wcm90by5hcGkudjEuVGVzdFJlcXVlc3QuS2luZDoEVk9JRFIEa2luZBIjCg1ib29sX3JlcXVpcmVkGAogAigIUgxib29sUmVxdWlyZWQSJQoOaW50MzJfcmVxdWlyZWQYCyACKAVSDWludDMyUmVxdWlyZWQSJQoOaW50NjRfcmVxdWlyZWQYDCACKANSDWludDY0UmVxdWlyZWQSKQoQZml4ZWQzMl9yZXF1aXJlZBgNIAIoB1IPZml4ZWQzMlJlcXVpcmVkEikKEGZpeGVkNjRfcmVxdWlyZWQYDiACKAZSD2ZpeGVkNjRSZXF1aXJlZBInCg91aW50MzJfcmVxdWlyZWQYDyACKA1SDnVpbnQzMlJlcXVpcmVkEicKD3VpbnQ2NF9yZXF1aXJlZBgQIAIoBFIOdWludDY0UmVxdWlyZWQSJQoOZ2xvYXRfcmVxdWlyZWQYESACKAJSDWdsb2F0UmVxdWlyZWQSJwoPZG91YmxlX3JlcXVpcmVkGBIgAigBUg5kb3VibGVSZXF1aXJlZBInCg9zdHJpbmdfcmVxdWlyZWQYEyACKAlSDnN0cmluZ1JlcXVpcmVkEiUKDmJ5dGVzX3JlcXVpcmVkGGUgAigMUg1ieXRlc1JlcXVpcmVkEicKD3NpbnQzMl9yZXF1aXJlZBhmIAIoEVIOc2ludDMyUmVxdWlyZWQSJwoPc2ludDY0X3JlcXVpcmVkGGcgAigSUg5zaW50NjRSZXF1aXJlZBIrChFzZml4ZWQzMl9yZXF1aXJlZBhoIAIoD1IQc2ZpeGVkMzJSZXF1aXJlZBIrChFzZml4ZWQ2NF9yZXF1aXJlZBhpIAIoEFIQc2ZpeGVkNjRSZXF1aXJlZBIjCg1ib29sX29wdGlvbmFsGB4gASgIUgxib29sT3B0aW9uYWwSJQoOaW50MzJfb3B0aW9uYWwYHyABKAVSDWludDMyT3B0aW9uYWwSJQoOaW50NjRfb3B0aW9uYWwYICABKANSDWludDY0T3B0aW9uYWwSKQoQZml4ZWQzMl9vcHRpb25hbBghIAEoB1IPZml4ZWQzMk9wdGlvbmFsEikKEGZpeGVkNjRfb3B0aW9uYWwYIiABKAZSD2ZpeGVkNjRPcHRpb25hbBInCg91aW50MzJfb3B0aW9uYWwYIyABKA1SDnVpbnQzMk9wdGlvbmFsEicKD3VpbnQ2NF9vcHRpb25hbBgkIAEoBFIOdWludDY0T3B0aW9uYWwSJQoOZmxvYXRfb3B0aW9uYWwYJSABKAJSDWZsb2F0T3B0aW9uYWwSJwoPZG91YmxlX29wdGlvbmFsGCYgASgBUg5kb3VibGVPcHRpb25hbBInCg9zdHJpbmdfb3B0aW9uYWwYJyABKAlSDnN0cmluZ09wdGlvbmFsEiYKDmJ5dGVzX29wdGlvbmFsGK0CIAEoDFINYnl0ZXNPcHRpb25hbBIoCg9zaW50MzJfb3B0aW9uYWwYrgIgASgRUg5zaW50MzJPcHRpb25hbBIoCg9zaW50NjRfb3B0aW9uYWwYrwIgASgSUg5zaW50NjRPcHRpb25hbBIsChFzZml4ZWQzMl9vcHRpb25hbBiwAiABKA9SEHNmaXhlZDMyT3B0aW9uYWwSLAoRc2ZpeGVkNjRfb3B0aW9uYWwYsQIgASgQUhBzZml4ZWQ2NE9wdGlvbmFsEiMKDWJvb2xfcmVwZWF0ZWQYFCADKAhSDGJvb2xSZXBlYXRlZBIlCg5pbnQzMl9yZXBlYXRlZBgVIAMoBVINaW50MzJSZXBlYXRlZBIlCg5pbnQ2NF9yZXBlYXRlZBgWIAMoA1INaW50NjRSZXBlYXRlZBIpChBmaXhlZDMyX3JlcGVhdGVkGBcgAygHUg9maXhlZDMyUmVwZWF0ZWQSKQoQZml4ZWQ2NF9yZXBlYXRlZBgYIAMoBlIPZml4ZWQ2NFJlcGVhdGVkEicKD3VpbnQzMl9yZXBlYXRlZBgZIAMoDVIOdWludDMyUmVwZWF0ZWQSJwoPdWludDY0X3JlcGVhdGVkGBogAygEUg51aW50NjRSZXBlYXRlZBIlCg5mbG9hdF9yZXBlYXRlZBgbIAMoAlINZmxvYXRSZXBlYXRlZBInCg9kb3VibGVfcmVwZWF0ZWQYHCADKAFSDmRvdWJsZVJlcGVhdGVkEicKD3N0cmluZ19yZXBlYXRlZBgdIAMoCVIOc3RyaW5nUmVwZWF0ZWQSJgoOYnl0ZXNfcmVwZWF0ZWQYyQEgAygMUg1ieXRlc1JlcGVhdGVkEigKD3NpbnQzMl9yZXBlYXRlZBjKASADKBFSDnNpbnQzMlJlcGVhdGVkEigKD3NpbnQ2NF9yZXBlYXRlZBjLASADKBJSDnNpbnQ2NFJlcGVhdGVkEiwKEXNmaXhlZDMyX3JlcGVhdGVkGMwBIAMoD1IQc2ZpeGVkMzJSZXBlYXRlZBIsChFzZml4ZWQ2NF9yZXBlYXRlZBjNASADKBBSEHNmaXhlZDY0UmVwZWF0ZWQSNAoUYm9vbF9yZXBlYXRlZF9wYWNrZWQYMiADKAhSEmJvb2xSZXBlYXRlZFBhY2tlZEICEAESNgoVaW50MzJfcmVwZWF0ZWRfcGFja2VkGDMgAygFUhNpbnQzMlJlcGVhdGVkUGFja2VkQgIQARI2ChVpbnQ2NF9yZXBlYXRlZF9wYWNrZWQYNCADKANSE2ludDY0UmVwZWF0ZWRQYWNrZWRCAhABEjoKF2ZpeGVkMzJfcmVwZWF0ZWRfcGFja2VkGDUgAygHUhVmaXhlZDMyUmVwZWF0ZWRQYWNrZWRCAhABEjoKF2ZpeGVkNjRfcmVwZWF0ZWRfcGFja2VkGDYgAygGUhVmaXhlZDY0UmVwZWF0ZWRQYWNrZWRCAhABEjgKFnVpbnQzMl9yZXBlYXRlZF9wYWNrZWQYNyADKA1SFHVpbnQzMlJlcGVhdGVkUGFja2VkQgIQARI4ChZ1aW50NjRfcmVwZWF0ZWRfcGFja2VkGDggAygEUhR1aW50NjRSZXBlYXRlZFBhY2tlZEICEAESNgoVZmxvYXRfcmVwZWF0ZWRfcGFja2VkGDkgAygCUhNmbG9hdFJlcGVhdGVkUGFja2VkQgIQARI4ChZkb3VibGVfcmVwZWF0ZWRfcGFja2VkGDogAygBUhRkb3VibGVSZXBlYXRlZFBhY2tlZEICEAESOQoWc2ludDMyX3JlcGVhdGVkX3BhY2tlZBj2AyADKBFSFHNpbnQzMlJlcGVhdGVkUGFja2VkQgIQARI5ChZzaW50NjRfcmVwZWF0ZWRfcGFja2VkGPcDIAMoElIUc2ludDY0UmVwZWF0ZWRQYWNrZWRCAhABEj0KGHNmaXhlZDMyX3JlcGVhdGVkX3BhY2tlZBj4AyADKA9SFnNmaXhlZDMyUmVwZWF0ZWRQYWNrZWRCAhABEj0KGHNmaXhlZDY0X3JlcGVhdGVkX3BhY2tlZBj5AyADKBBSFnNmaXhlZDY0UmVwZWF0ZWRQYWNrZWRCAhABEisKDmJvb2xfZGVmYXVsdGVkGCggASgIOgR0cnVlUg1ib29sRGVmYXVsdGVkEisKD2ludDMyX2RlZmF1bHRlZBgpIAEoBToCMzJSDmludDMyRGVmYXVsdGVkEisKD2ludDY0X2RlZmF1bHRlZBgqIAEoAzoCNjRSDmludDY0RGVmYXVsdGVkEjAKEWZpeGVkMzJfZGVmYXVsdGVkGCsgASgHOgMzMjBSEGZpeGVkMzJEZWZhdWx0ZWQSMAoRZml4ZWQ2NF9kZWZhdWx0ZWQYLCABKAY6AzY0MFIQZml4ZWQ2NERlZmF1bHRlZBIvChB1aW50MzJfZGVmYXVsdGVkGC0gASgNOgQzMjAwUg91aW50MzJEZWZhdWx0ZWQSLwoQdWludDY0X2RlZmF1bHRlZBguIAEoBDoENjQwMFIPdWludDY0RGVmYXVsdGVkEi8KD2Zsb2F0X2RlZmF1bHRlZBgvIAEoAjoGMzE0MTU5Ug5mbG9hdERlZmF1bHRlZBIxChBkb3VibGVfZGVmYXVsdGVkGDAgASgBOgYyNzE4MjhSD2RvdWJsZURlZmF1bHRlZBI7ChBzdHJpbmdfZGVmYXVsdGVkGDEgASgJOhBoZWxsbywgIndvcmxkISIKUg9zdHJpbmdEZWZhdWx0ZWQSMQoPYnl0ZXNfZGVmYXVsdGVkGJEDIAEoDDoHQmlnbm9zZVIOYnl0ZXNEZWZhdWx0ZWQSLwoQc2ludDMyX2RlZmF1bHRlZBiSAyABKBE6Ay0zMlIPc2ludDMyRGVmYXVsdGVkEi8KEHNpbnQ2NF9kZWZhdWx0ZWQYkwMgASgSOgMtNjRSD3NpbnQ2NERlZmF1bHRlZBIzChJzZml4ZWQzMl9kZWZhdWx0ZWQYlAMgASgPOgMtMzJSEXNmaXhlZDMyRGVmYXVsdGVkEjMKEnNmaXhlZDY0X2RlZmF1bHRlZBiVAyABKBA6Ay02NFIRc2ZpeGVkNjREZWZhdWx0ZWQSWwoRbWFwX3N0cmluZ19zdHJpbmcYlgMgAygLMi4ucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk1hcFN0cmluZ1N0cmluZ0VudHJ5Ug9tYXBTdHJpbmdTdHJpbmcSRAoPa25vd25fdGltZXN0YW1wGJcDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSDmtub3duVGltZXN0YW1wEkEKDmtub3duX2R1cmF0aW9uGJgDIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvblINa25vd25EdXJhdGlvbhI7Cgxrbm93bl9zdHJ1Y3QYmQMgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdFILa25vd25TdHJ1Y3QSOAoLa25vd25fZW1wdHkYmgMgASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ugprbm93bkVtcHR5EjIKCWtub3duX2FueRibAyABKAsyFC5nb29nbGUucHJvdG9idWYuQW55Ughrbm93bkFueRI5CgZuZXN0ZWQYnAMgASgLMiAucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZFIGbmVzdGVkEhgKBm51bWJlchgFIAEoBUgAUgZudW1iZXISFAoEbmFtZRgGIAEoCUgAUgRuYW1lEhQKBGRhdGEYByABKAxIAFIEZGF0YRIXCgZ0ZW1wX2MYCCABKAFIAFIFdGVtcEMSNAoDY29sGAkgASgLMiAucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZEgAUgNjb2wSTQoJZGVlcF9lbnVtGAQgASgOMi4ucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZC5EZWVwLkRlZXBFbnVtSABSCGRlZXBFbnVtEkcKC25lc3RlZF9kZWVwGJ0DIAEoCzIlLnByb3RvLmFwaS52MS5UZXN0UmVxdWVzdC5OZXN0ZWQuRGVlcFIKbmVzdGVkRGVlcBIhCgpsYXN0X2ZpZWxkGP////8BIAEoCVIJbGFzdEZpZWxkGkIKFE1hcFN0cmluZ1N0cmluZ0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAEaygIKBk5lc3RlZBISCgRuYW1lGAEgASgJUgRuYW1lEhQKBWdyb3VwGAIgASgJUgVncm91cBI5CgRkZWVwGAMgASgLMiUucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZC5EZWVwUgRkZWVwGtoBCgREZWVwEhIKBG5hbWUYASACKAlSBG5hbWUSFgoFcGhvbmUYAiABKAlIAFIFcGhvbmUSFgoFZW1haWwYAyABKAlIAFIFZW1haWwSSwoJZGVlcF9lbnVtGAQgASgOMi4ucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZC5EZWVwLkRlZXBFbnVtUghkZWVwRW51bSI4CghEZWVwRW51bRIZChVERUVQX0VOVU1fVU5TUEVDSUZJRUQQABIRCg1ERUVQX0VOVU1fRk9PEAFCBwoFdW5pb24iPAoES2luZBIUChBLSU5EX1VOU1BFQ0lGSUVEEAASCAoEVk9JRBABEgoKBlNUUklORxACEggKBEJPT0wQA0IJCgd4X2ZpZWxkIoYCCg5Bbm90aGVyUmVxdWVzdBI4CgZuZXN0ZWQYASABKAsyIC5wcm90by5hcGkudjEuVGVzdFJlcXVlc3QuTmVzdGVkUgZuZXN0ZWQSOQoEZGVlcBgCIAEoCzIlLnByb3RvLmFwaS52MS5UZXN0UmVxdWVzdC5OZXN0ZWQuRGVlcFIEZGVlcBIyCgRraW5kGAMgASgOMh4ucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0LktpbmRSBGtpbmQSSwoJZGVlcF9lbnVtGAQgASgOMi4ucHJvdG8uYXBpLnYxLlRlc3RSZXF1ZXN0Lk5lc3RlZC5EZWVwLkRlZXBFbnVtUghkZWVwRW51bSo0CgNGb28SEwoPRk9PX1VOU1BFQ0lGSUVEEAASCwoHRk9PX0JBUhABEgsKB0ZPT19CQVoQAkrvRAoHEgUAAJUBAQoICgEMEgMAABIKCAoBAhIDAgAVCgkKAgMAEgMEACkKCQoCAwESAwUAKAoJCgIDAhIDBgAmCgkKAgMDEgMHACUKCQoCAwQSAwgAIwobCgIFABIECwAQARoPIEVudW0gY29tbWVudC4KCgoKAwUAARIDCwUIChwKBAUAAgASAw0EGBoPIENhc2UgY29tbWVudC4KCgwKBQUAAgABEgMNBBMKDAoFBQACAAISAw0WFwoLCgQFAAIB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';
 
diff --git a/tests/snapshots/proto2/Proto/Api/V1/autoload.metadata.php b/tests/snapshots/proto2/Proto/Api/V1/autoload.metadata.php
index 60f5cb9..785445c 100644
--- a/tests/snapshots/proto2/Proto/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/proto2/Proto/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\Proto2DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/proto3/Proto/Api/V1/Proto3DescriptorRegistry.php b/tests/snapshots/proto3/Proto/Api/V1/DescriptorRegistry.php
similarity index 96%
rename from tests/snapshots/proto3/Proto/Api/V1/Proto3DescriptorRegistry.php
rename to tests/snapshots/proto3/Proto/Api/V1/DescriptorRegistry.php
index 20f1b7a..dc14a91 100644
--- a/tests/snapshots/proto3/Proto/Api/V1/Proto3DescriptorRegistry.php
+++ b/tests/snapshots/proto3/Proto/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class Proto3DescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'Cgxwcm90bzMucHJvdG8SDHByb3RvLmFwaS52MSLHAgoLVGVzdFJlcXVlc3QSIQoMc3RyaW5nX3ZhbHVlGAEgASgJUgtzdHJpbmdWYWx1ZRI3ChVvcHRpb25hbF9zdHJpbmdfdmFsdWUYAiABKAlIAVITb3B0aW9uYWxTdHJpbmdWYWx1ZYgBARI3Cg1pbXBsaWNpdF9raW5kGAUgASgOMhIucHJvdG8uYXBpLnYxLktpbmRSDGltcGxpY2l0S2luZBI8Cg1vcHRpb25hbF9raW5kGAYgASgOMhIucHJvdG8uYXBpLnYxLktpbmRIAlIMb3B0aW9uYWxLaW5kiAEBEhYKBXBob25lGAMgASgJSABSBXBob25lEhYKBWVtYWlsGAQgASgJSABSBWVtYWlsQgkKB2NvbnRhY3RCGAoWX29wdGlvbmFsX3N0cmluZ192YWx1ZUIQCg5fb3B0aW9uYWxfa2luZCo9CgRLaW5kEhQKEEtJTkRfVU5TUEVDSUZJRUQQABIOCgpLSU5EX0ZJUlNUEAESDwoLS0lORF9TRUNPTkQQAkrJBAoGEgQAABMBCggKAQwSAwAAEgoICgECEgMCABUKCgoCBQASBAQACAEKCgoDBQABEgMEBQkKCwoEBQACABIDBQQZCgwKBQUAAgABEgMFBBQKDAoFBQACAAISAwUXGAoLCgQFAAIBEgMGBBMKDAoFBQACAQESAwYEDgoMCgUFAAIBAhIDBhESCgsKBAUAAgISAwcEFAoMCgUFAAICARIDBwQPCgwKBQUAAgICEgMHEhMKCgoCBAASBAoAEwEKCgoDBAABEgMKCBMKCwoEBAACABIDCwQcCgwKBQQAAgAFEgMLBAoKDAoFBAACAAESAwsLFwoMCgUEAAIAAxIDCxobCgsKBAQAAgESAwwELgoMCgUEAAIBBBIDDAQMCgwKBQQAAgEFEgMMDRMKDAoFBAACAQESAwwUKQoMCgUEAAIBAxIDDCwtCgsKBAQAAgISAw0EGwoMCgUEAAICBhIDDQQICgwKBQQAAgIBEgMNCRYKDAoFBAACAgMSAw0ZGgoLCgQEAAIDEgMOBCQKDAoFBAACAwQSAw4EDAoMCgUEAAIDBhIDDg0RCgwKBQQAAgMBEgMOEh8KDAoFBAACAwMSAw4iIwoMCgQEAAgAEgQPBBIFCgwKBQQACAABEgMPChEKCwoEBAACBBIDEAgZCgwKBQQAAgQFEgMQCA4KDAoFBAACBAESAxAPFAoMCgUEAAIEAxIDEBcYCgsKBAQAAgUSAxEIGQoMCgUEAAIFBRIDEQgOCgwKBQQAAgUBEgMRDxQKDAoFBAACBQMSAxEXGGIGcHJvdG8z';
 
diff --git a/tests/snapshots/proto3/Proto/Api/V1/autoload.metadata.php b/tests/snapshots/proto3/Proto/Api/V1/autoload.metadata.php
index d0708a1..785445c 100644
--- a/tests/snapshots/proto3/Proto/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/proto3/Proto/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\Proto3DescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/Proto3ScalarsDescriptorRegistry.php b/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/proto3_scalars/Proto3/Scalars/V1/Proto3ScalarsDescriptorRegistry.php
rename to tests/snapshots/proto3_scalars/Proto3/Scalars/V1/DescriptorRegistry.php
index dda0435..a3b7454 100644
--- a/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/Proto3ScalarsDescriptorRegistry.php
+++ b/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class Proto3ScalarsDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChRwcm90bzNfc2NhbGFycy5wcm90bxIRcHJvdG8zLnNjYWxhcnMudjEi+wUKB1NjYWxhcnMSJQoOaW50NjRfc2luZ3VsYXIYASABKANSDWludDY0U2luZ3VsYXISJwoPc2ludDY0X3Npbmd1bGFyGAIgASgSUg5zaW50NjRTaW5ndWxhchIrChFzZml4ZWQ2NF9zaW5ndWxhchgDIAEoEFIQc2ZpeGVkNjRTaW5ndWxhchInCg91aW50NjRfc2luZ3VsYXIYBCABKARSDnVpbnQ2NFNpbmd1bGFyEikKEGZpeGVkNjRfc2luZ3VsYXIYBSABKAZSD2ZpeGVkNjRTaW5ndWxhchIqCg5pbnQ2NF9vcHRpb25hbBgLIAEoA0gAUg1pbnQ2NE9wdGlvbmFsiAEBEiwKD3NpbnQ2NF9vcHRpb25hbBgMIAEoEkgBUg5zaW50NjRPcHRpb25hbIgBARIwChFzZml4ZWQ2NF9vcHRpb25hbBgNIAEoEEgCUhBzZml4ZWQ2NE9wdGlvbmFsiAEBEiwKD3VpbnQ2NF9vcHRpb25hbBgOIAEoBEgDUg51aW50NjRPcHRpb25hbIgBARIuChBmaXhlZDY0X29wdGlvbmFsGA8gASgGSARSD2ZpeGVkNjRPcHRpb25hbIgBARIlCg5pbnQ2NF9yZXBlYXRlZBgVIAMoA1INaW50NjRSZXBlYXRlZBInCg9zaW50NjRfcmVwZWF0ZWQYFiADKBJSDnNpbnQ2NFJlcGVhdGVkEisKEXNmaXhlZDY0X3JlcGVhdGVkGBcgAygQUhBzZml4ZWQ2NFJlcGVhdGVkEicKD3VpbnQ2NF9yZXBlYXRlZBgYIAMoBFIOdWludDY0UmVwZWF0ZWQSKQoQZml4ZWQ2NF9yZXBlYXRlZBgZIAMoBlIPZml4ZWQ2NFJlcGVhdGVkQhEKD19pbnQ2NF9vcHRpb25hbEISChBfc2ludDY0X29wdGlvbmFsQhQKEl9zZml4ZWQ2NF9vcHRpb25hbEISChBfdWludDY0X29wdGlvbmFsQhMKEV9maXhlZDY0X29wdGlvbmFsSs4JCgYSBAAAGQEKCAoBDBIDAAASCggKAQISAwIAGgreAQoCBAASBAcAGQEa0QEgRXhlcmNpc2VzIHRoZSBQSFAgdHlwZSBtYXBwaW5nIG9mIDY0LWJpdCBzY2FsYXIgZmllbGRzIHVuZGVyIHByb3RvMzoKIHRoZSBzaWduZWQgdHlwZXMgKGludDY0LCBzaW50NjQsIHNmaXhlZDY0KSBtYXAgdG8gbmF0aXZlIGBpbnRgLCB3aGlsZSB0aGUKIHVuc2lnbmVkIDY0LWJpdCB0eXBlcyAodWludDY0LCBmaXhlZDY0KSBzdGF5IGBcQmNNYXRoXE51bWJlcmAuCgoKCgMEAAESAwcIDwoLCgQEAAIAEgMIBB0KDAoFBAACAAUSAwgECQoMCgUEAAIAARIDCAoYCgwKBQQAAgADEgMIGxwKCwoEBAACARIDCQQfCgwKBQQAAgEFEgMJBAoKDAoFBAACAQESAwkLGgoMCgUEAAIBAxIDCR0eCgsKBAQAAgISAwoEIwoMCgUEAAICBRIDCgQMCgwKBQQAAgIBEgMKDR4KDAoFBAACAgMSAwohIgoLCgQEAAIDEgMLBB8KDAoFBAACAwUSAwsECgoMCgUEAAIDARIDCwsaCgwKBQQAAgMDEgMLHR4KCwoEBAACBBIDDAQhCgwKBQQAAgQFEgMMBAsKDAoFBAACBAESAwwMHAoMCgUEAAIEAxIDDB8gCgsKBAQAAgUSAw4EJwoMCgUEAAIFBBIDDgQMCgwKBQQAAgUFEgMODRIKDAoFBAACBQESAw4TIQoMCgUEAAIFAxIDDiQmCgsKBAQAAgYSAw8EKQoMCgUEAAIGBBIDDwQMCgwKBQQAAgYFEgMPDRMKDAoFBAACBgESAw8UIwoMCgUEAAIGAxIDDyYoCgsKBAQAAgcSAxAELQoMCgUEAAIHBBIDEAQMCgwKBQQAAgcFEgMQDRUKDAoFBAACBwESAxAWJwoMCgUEAAIHAxIDECosCgsKBAQAAggSAxEEKQoMCgUEAAIIBBIDEQQMCgwKBQQAAggFEgMRDRMKDAoFBAACCAESAxEUIwoMCgUEAAIIAxIDESYoCgsKBAQAAgkSAxIEKwoMCgUEAAIJBBIDEgQMCgwKBQQAAgkFEgMSDRQKDAoFBAACCQESAxIVJQoMCgUEAAIJAxIDEigqCgsKBAQAAgoSAxQEJwoMCgUEAAIKBBIDFAQMCgwKBQQAAgoFEgMUDRIKDAoFBAACCgESAxQTIQoMCgUEAAIKAxIDFCQmCgsKBAQAAgsSAxUEKQoMCgUEAAILBBIDFQQMCgwKBQQAAgsFEgMVDRMKDAoFBAACCwESAxUUIwoMCgUEAAILAxIDFSYoCgsKBAQAAgwSAxYELQoMCgUEAAIMBBIDFgQMCgwKBQQAAgwFEgMWDRUKDAoFBAACDAESAxYWJwoMCgUEAAIMAxIDFiosCgsKBAQAAg0SAxcEKQoMCgUEAAINBBIDFwQMCgwKBQQAAg0FEgMXDRMKDAoFBAACDQESAxcUIwoMCgUEAAINAxIDFyYoCgsKBAQAAg4SAxgEKwoMCgUEAAIOBBIDGAQMCgwKBQQAAg4FEgMYDRQKDAoFBAACDgESAxgVJQoMCgUEAAIOAxIDGCgqYgZwcm90bzM=';
 
diff --git a/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/autoload.metadata.php b/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/autoload.metadata.php
index 704b639..0a3a262 100644
--- a/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/autoload.metadata.php
+++ b/tests/snapshots/proto3_scalars/Proto3/Scalars/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto3\Scalars\V1\Proto3ScalarsDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto3\Scalars\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry.php b/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry.php
new file mode 100644
index 0000000..cc63b2f
--- /dev/null
+++ b/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: registry_collision.proto
+ */
+
+declare(strict_types=1);
+
+namespace Registry\Collision;
+
+use Thesis\Protobuf\Reflection;
+
+/**
+ * @api
+ *
+ * A user message that already occupies the class name the descriptor registry
+ * would otherwise take. Generation must succeed by renaming ours, not error.
+ */
+final readonly class DescriptorRegistry
+{
+    public function __construct(
+        #[Reflection\Field(1, Reflection\StringT::T)]
+        public string $value = '',
+    ) {}
+}
diff --git a/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry2.php b/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry2.php
new file mode 100644
index 0000000..bfa7562
--- /dev/null
+++ b/tests/snapshots/registry_collision/Registry/Collision/DescriptorRegistry2.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ * Source: registry_collision.proto
+ */
+
+declare(strict_types=1);
+
+namespace Registry\Collision;
+
+use Override;
+use Thesis\Protobuf\Registry;
+use Thesis\Protobuf\Registry\File;
+
+/**
+ * @api
+ */
+final readonly class DescriptorRegistry2 implements Registry\Registrar
+{
+    private const string DESCRIPTOR_BUFFER = 'ChhyZWdpc3RyeV9jb2xsaXNpb24ucHJvdG8SEnJlZ2lzdHJ5LmNvbGxpc2lvbiIqChJEZXNjcmlwdG9yUmVnaXN0cnkSFAoFdmFsdWUYASABKAlSBXZhbHVlSogCCgYSBAAACAEKCAoBDBIDAAASCggKAQISAwIAGwqmAQoCBAASBAYACAEamQEgQSB1c2VyIG1lc3NhZ2UgdGhhdCBhbHJlYWR5IG9jY3VwaWVzIHRoZSBjbGFzcyBuYW1lIHRoZSBkZXNjcmlwdG9yIHJlZ2lzdHJ5CiB3b3VsZCBvdGhlcndpc2UgdGFrZS4gR2VuZXJhdGlvbiBtdXN0IHN1Y2NlZWQgYnkgcmVuYW1pbmcgb3Vycywgbm90IGVycm9yLgoKCgoDBAABEgMGCBoKCwoEBAACABIDBwQVCgwKBQQAAgAFEgMHBAoKDAoFBAACAAESAwcLEAoMCgUEAAIAAxIDBxMUYgZwcm90bzM=';
+
+    #[Override]
+    public function register(Registry\Pool $pool): void
+    {
+        $pool->add(Registry\Descriptor::base64(self::DESCRIPTOR_BUFFER), new File(
+            name: 'registry_collision.proto',
+            messages: [
+                new File\MessageDescriptor('registry.collision.DescriptorRegistry', \Registry\Collision\DescriptorRegistry::class),
+            ],
+        ));
+    }
+}
diff --git a/tests/snapshots/registry_collision/Registry/Collision/autoload.metadata.php b/tests/snapshots/registry_collision/Registry/Collision/autoload.metadata.php
new file mode 100644
index 0000000..845ba2d
--- /dev/null
+++ b/tests/snapshots/registry_collision/Registry/Collision/autoload.metadata.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Code generated by thesis/protoc-plugin. DO NOT EDIT.
+ * Versions:
+ *   thesis/protoc-plugin — v0.3.x-dev
+ *   protoc               — v6.32.1
+ */
+
+declare(strict_types=1);
+
+\Thesis\Protobuf\Registry\Pool::get()->register(
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Registry\Collision\DescriptorRegistry2()),
+);
diff --git a/tests/snapshots/required_message/Proto/Required/V1/RequiredMessageDescriptorRegistry.php b/tests/snapshots/required_message/Proto/Required/V1/DescriptorRegistry.php
similarity index 94%
rename from tests/snapshots/required_message/Proto/Required/V1/RequiredMessageDescriptorRegistry.php
rename to tests/snapshots/required_message/Proto/Required/V1/DescriptorRegistry.php
index 72bec8f..10f1d20 100644
--- a/tests/snapshots/required_message/Proto/Required/V1/RequiredMessageDescriptorRegistry.php
+++ b/tests/snapshots/required_message/Proto/Required/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class RequiredMessageDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChZyZXF1aXJlZF9tZXNzYWdlLnByb3RvEhFwcm90by5yZXF1aXJlZC52MSIbCgVJbm5lchISCgRuYW1lGAEgASgJUgRuYW1lIosBCgdSZXF1ZXN0Ej8KDnJlcXVpcmVkX2lubmVyGAEgAigLMhgucHJvdG8ucmVxdWlyZWQudjEuSW5uZXJSDXJlcXVpcmVkSW5uZXISPwoOb3B0aW9uYWxfaW5uZXIYAiABKAsyGC5wcm90by5yZXF1aXJlZC52MS5Jbm5lclINb3B0aW9uYWxJbm5lckqbAgoGEgQAAAsBCggKAQwSAwAAEgoICgECEgMCABoKCgoCBAASBAQABgEKCgoDBAABEgMECA0KCwoEBAACABIDBQQdCgwKBQQAAgAEEgMFBAwKDAoFBAACAAUSAwUNEwoMCgUEAAIAARIDBRQYCgwKBQQAAgADEgMFGxwKCgoCBAESBAgACwEKCgoDBAEBEgMICA8KCwoEBAECABIDCQQmCgwKBQQBAgAEEgMJBAwKDAoFBAECAAYSAwkNEgoMCgUEAQIAARIDCRMhCgwKBQQBAgADEgMJJCUKCwoEBAECARIDCgQmCgwKBQQBAgEEEgMKBAwKDAoFBAECAQYSAwoNEgoMCgUEAQIBARIDChMhCgwKBQQBAgEDEgMKJCU=';
 
diff --git a/tests/snapshots/required_message/Proto/Required/V1/autoload.metadata.php b/tests/snapshots/required_message/Proto/Required/V1/autoload.metadata.php
index 072c544..6cdd6d3 100644
--- a/tests/snapshots/required_message/Proto/Required/V1/autoload.metadata.php
+++ b/tests/snapshots/required_message/Proto/Required/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Required\V1\RequiredMessageDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Required\V1\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/reserved_names/ReservedTypes/ReservedNamesDescriptorRegistry.php b/tests/snapshots/reserved_names/ReservedTypes/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/reserved_names/ReservedTypes/ReservedNamesDescriptorRegistry.php
rename to tests/snapshots/reserved_names/ReservedTypes/DescriptorRegistry.php
index f016881..3c63459 100644
--- a/tests/snapshots/reserved_names/ReservedTypes/ReservedNamesDescriptorRegistry.php
+++ b/tests/snapshots/reserved_names/ReservedTypes/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class ReservedNamesDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChRyZXNlcnZlZF9uYW1lcy5wcm90bxIOcmVzZXJ2ZWRfdHlwZXMiBgoEZXhpdCJECgpJTlNUQU5DRU9GEjYKBWJyZWFrGAEgASgLMiAucmVzZXJ2ZWRfdHlwZXMuQ2xhc3MuQ2FzZS5CcmVha1IFYnJlYWsiZAoFQ2xhc3MSNgoFYnJlYWsYASABKAsyIC5yZXNlcnZlZF90eXBlcy5DbGFzcy5DYXNlLkJyZWFrUgVicmVhaxojCgRDYXNlGhsKBUJyZWFrEhIKBG5hbWUYASABKAlSBG5hbWUqRAoKTm90QWxsb3dlZBIMCghhYnN0cmFjdBAAEgcKA2FuZBABEgkKBWFycmF5EAISCQoFZW1wdHkQAxIJCgVjbGFzcxAEKhMKBnN0cmluZxIJCgVaRVJPMRAAKhIKBVRyYWl0EgkKBVpFUk8yEABKuQUKBhIEAAAeAQoICgEMEgMAABIKCAoBAhIDAgAXCgoKAgUAEgQEAAoBCgoKAwUAARIDBAUPCgsKBAUAAgASAwUEEQoMCgUFAAIAARIDBQQMCgwKBQUAAgACEgMFDxAKCwoEBQACARIDBgQMCgwKBQUAAgEBEgMGBAcKDAoFBQACAQISAwYKCwoLCgQFAAICEgMHBA4KDAoFBQACAgESAwcECQoMCgUFAAICAhIDBwwNCgsKBAUAAgMSAwgEDgoMCgUFAAIDARIDCAQJCgwKBQUAAgMCEgMIDA0KCwoEBQACBBIDCQQOCgwKBQUAAgQBEgMJBAkKDAoFBQACBAISAwkMDQoJCgIFARIDDAAaCgoKAwUBARIDDAULCgsKBAUBAgASAwwOGAoMCgUFAQIAARIDDA4TCgwKBQUBAgACEgMMFhcKCQoCBQISAw4AGQoKCgMFAgESAw4FCgoLCgQFAgIAEgMODRcKDAoFBQICAAESAw4NEgoMCgUFAgIAAhIDDhUWCgkKAgQAEgMQAA8KCgoDBAABEgMQCAwKCgoCBAESBBIAFAEKCgoDBAEBEgMSCBIKCwoEBAECABIDEwQfCgwKBQQBAgAGEgMTBBQKDAoFBAECAAESAxMVGgoMCgUEAQIAAxIDEx0eCgoKAgQCEgQWAB4BCgoKAwQCARIDFggNCgwKBAQCAwASBBcEGwUKDAoFBAIDAAESAxcMEAoOCgYEAgMAAwASBBgIGgkKDgoHBAIDAAMAARIDGBAVCg8KCAQCAwADAAIAEgMZDBwKEAoJBAIDAAMAAgAFEgMZDBIKEAoJBAIDAAMAAgABEgMZExcKEAoJBAIDAAMAAgADEgMZGhsKCwoEBAICABIDHQQZCgwKBQQCAgAGEgMdBA4KDAoFBAICAAESAx0PFAoMCgUEAgIAAxIDHRcYYgZwcm90bzM=';
 
diff --git a/tests/snapshots/reserved_names/ReservedTypes/autoload.metadata.php b/tests/snapshots/reserved_names/ReservedTypes/autoload.metadata.php
index a23442d..1c0ffc2 100644
--- a/tests/snapshots/reserved_names/ReservedTypes/autoload.metadata.php
+++ b/tests/snapshots/reserved_names/ReservedTypes/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \ReservedTypes\ReservedNamesDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \ReservedTypes\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/sealed_interface/PgQuery/UnderscoreCollisionTestDescriptorRegistry.php b/tests/snapshots/sealed_interface/PgQuery/DescriptorRegistry.php
similarity index 97%
rename from tests/snapshots/sealed_interface/PgQuery/UnderscoreCollisionTestDescriptorRegistry.php
rename to tests/snapshots/sealed_interface/PgQuery/DescriptorRegistry.php
index aeaf2a4..1d2da63 100644
--- a/tests/snapshots/sealed_interface/PgQuery/UnderscoreCollisionTestDescriptorRegistry.php
+++ b/tests/snapshots/sealed_interface/PgQuery/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class UnderscoreCollisionTestDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = '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';
 
diff --git a/tests/snapshots/sealed_interface/PgQuery/autoload.metadata.php b/tests/snapshots/sealed_interface/PgQuery/autoload.metadata.php
index ab8bdab..d8bf9d7 100644
--- a/tests/snapshots/sealed_interface/PgQuery/autoload.metadata.php
+++ b/tests/snapshots/sealed_interface/PgQuery/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \PgQuery\UnderscoreCollisionTestDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \PgQuery\DescriptorRegistry()),
 );
diff --git a/tests/snapshots/snake_case/Proto/Api/V1/SnakeCaseDescriptorRegistry.php b/tests/snapshots/snake_case/Proto/Api/V1/DescriptorRegistry.php
similarity index 98%
rename from tests/snapshots/snake_case/Proto/Api/V1/SnakeCaseDescriptorRegistry.php
rename to tests/snapshots/snake_case/Proto/Api/V1/DescriptorRegistry.php
index 8b6cd78..0dec175 100644
--- a/tests/snapshots/snake_case/Proto/Api/V1/SnakeCaseDescriptorRegistry.php
+++ b/tests/snapshots/snake_case/Proto/Api/V1/DescriptorRegistry.php
@@ -19,7 +19,7 @@
 /**
  * @api
  */
-final readonly class SnakeCaseDescriptorRegistry implements Registry\Registrar
+final readonly class DescriptorRegistry implements Registry\Registrar
 {
     private const string DESCRIPTOR_BUFFER = 'ChBzbmFrZV9jYXNlLnByb3RvEgxwcm90by5hcGkudjEi9wQKDFRlc3RfUmVxdWVzdBJBCgZuZXN0ZWQYASABKAsyKS5wcm90by5hcGkudjEuVGVzdF9SZXF1ZXN0Lk5lc3RlZF9NZXNzYWdlUgZuZXN0ZWQSGAoGbnVtYmVyGAIgASgFSABSBm51bWJlchI9CgNjb2wYAyABKAsyKS5wcm90by5hcGkudjEuVGVzdF9SZXF1ZXN0Lk5lc3RlZF9NZXNzYWdlSABSA2NvbBJXCglkZWVwX2VudW0YBCABKA4yOC5wcm90by5hcGkudjEuVGVzdF9SZXF1ZXN0Lk5lc3RlZF9NZXNzYWdlLkRlZXAuRGVlcF9FbnVtSABSCGRlZXBFbnVtEk8KC25lc3RlZF9kZWVwGAUgASgLMi4ucHJvdG8uYXBpLnYxLlRlc3RfUmVxdWVzdC5OZXN0ZWRfTWVzc2FnZS5EZWVwUgpuZXN0ZWREZWVwGpUCCg5OZXN0ZWRfTWVzc2FnZRJCCgRkZWVwGAEgASgLMi4ucHJvdG8uYXBpLnYxLlRlc3RfUmVxdWVzdC5OZXN0ZWRfTWVzc2FnZS5EZWVwUgRkZWVwGr4BCgREZWVwEhYKBXBob25lGAEgASgJSABSBXBob25lEhYKBWVtYWlsGAIgASgJSABSBWVtYWlsElUKCWRlZXBfZW51bRgDIAEoDjI4LnByb3RvLmFwaS52MS5UZXN0X1JlcXVlc3QuTmVzdGVkX01lc3NhZ2UuRGVlcC5EZWVwX0VudW1SCGRlZXBFbnVtIiYKCURlZXBfRW51bRIZChVERUVQX0VOVU1fVU5TUEVDSUZJRUQQAEIHCgV1bmlvbkIJCgd4X2ZpZWxkIqsBCg9Bbm90aGVyX1JlcXVlc3QSQQoGbmVzdGVkGAEgASgLMikucHJvdG8uYXBpLnYxLlRlc3RfUmVxdWVzdC5OZXN0ZWRfTWVzc2FnZVIGbmVzdGVkElUKCWRlZXBfZW51bRgCIAEoDjI4LnByb3RvLmFwaS52MS5UZXN0X1JlcXVlc3QuTmVzdGVkX01lc3NhZ2UuRGVlcC5EZWVwX0VudW1SCGRlZXBFbnVtKhoKA0ZvbxITCg9GT09fVU5TUEVDSUZJRUQQAEr9BwoGEgQAACMBCggKAQwSAwAAEgoICgECEgMCABUKCgoCBQASBAQABgEKCgoDBQABEgMEBQgKCwoEBQACABIDBQQYCgwKBQUAAgABEgMFBBMKDAoFBQACAAISAwUWFwoKCgIEABIECAAeAQoKCgMEAAESAwgIFAoMCgQEAAMAEgQJBBYFCgwKBQQAAwABEgMJDBoKDgoGBAADAAMAEgQKCBQJCg4KBwQAAwADAAESAwoQFAoQCggEAAMAAwAEABIECwwNDQoQCgkEAAMAAwAEAAESAwsRGgoRCgoEAAMAAwAEAAIAEgMMECoKEgoLBAADAAMABAACAAESAwwQJQoSCgsEAAMAAwAEAAIAAhIDDCgpChAKCAQAAwADAAgAEgQPDBINChAKCQQAAwADAAgAARIDDxIXCg8KCAQAAwADAAIAEgMQECEKEAoJBAADAAMAAgAFEgMQEBYKEAoJBAADAAMAAgABEgMQFxwKEAoJBAADAAMAAgADEgMQHyAKDwoIBAADAAMAAgESAxEQIQoQCgkEAAMAAwACAQUSAxEQFgoQCgkEAAMAAwACAQESAxEXHAoQCgkEAAMAAwACAQMSAxEfIAoPCggEAAMAAwACAhIDEwwkChAKCQQAAwADAAICBhIDEwwVChAKCQQAAwADAAICARIDExYfChAKCQQAAwADAAICAxIDEyIjCg0KBgQAAwACABIDFQgWCg4KBwQAAwACAAYSAxUIDAoOCgcEAAMAAgABEgMVDREKDgoHBAADAAIAAxIDFRQVCgsKBAQAAgASAxcEHgoMCgUEAAIABhIDFwQSCgwKBQQAAgABEgMXExkKDAoFBAACAAMSAxccHQoMCgQEAAgAEgQYBBwFCgwKBQQACAABEgMYChEKCwoEBAACARIDGQgZCgwKBQQAAgEFEgMZCA0KDAoFBAACAQESAxkOFAoMCgUEAAIBAxIDGRcYCgsKBAQAAgISAxoIHwoMCgUEAAICBhIDGggWCgwKBQQAAgIBEgMaFxoKDAoFBAACAgMSAxodHgoLCgQEAAIDEgMbCDQKDAoFBAACAwYSAxsIJQoMCgUEAAIDARIDGyYvCgwKBQQAAgMDEgMbMjMKCwoEBAACBBIDHQQoCgwKBQQAAgQGEgMdBBcKDAoFBAACBAESAx0YIwoMCgUEAAIEAxIDHSYnCgoKAgQBEgQgACMBCgoKAwQBARIDIAgXCgsKBAQBAgASAyEEKwoMCgUEAQIABhIDIQQfCgwKBQQBAgABEgMhICYKDAoFBAECAAMSAyEpKgoLCgQEAQIBEgMiBD0KDAoFBAECAQYSAyIELgoMCgUEAQIBARIDIi84CgwKBQQBAgEDEgMiOzxiBnByb3RvMw==';
 
diff --git a/tests/snapshots/snake_case/Proto/Api/V1/autoload.metadata.php b/tests/snapshots/snake_case/Proto/Api/V1/autoload.metadata.php
index ce3e37c..785445c 100644
--- a/tests/snapshots/snake_case/Proto/Api/V1/autoload.metadata.php
+++ b/tests/snapshots/snake_case/Proto/Api/V1/autoload.metadata.php
@@ -10,5 +10,5 @@
 declare(strict_types=1);
 
 \Thesis\Protobuf\Registry\Pool::get()->register(
-    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\SnakeCaseDescriptorRegistry()),
+    new \Thesis\Protobuf\Registry\OnceRegistrar(new \Proto\Api\V1\DescriptorRegistry()),
 );