cmd/protoc-gen-go: update deprecation warning

Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/internal/testprotos/benchmarks/benchmarks.pb.go b/internal/testprotos/benchmarks/benchmarks.pb.go
index 220ab24..9c08d4d 100644
--- a/internal/testprotos/benchmarks/benchmarks.pb.go
+++ b/internal/testprotos/benchmarks/benchmarks.pb.go
@@ -70,7 +70,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use BenchmarkDataset.ProtoReflect.Type instead.
+// Deprecated: Use BenchmarkDataset.ProtoReflect.Descriptor instead.
 func (*BenchmarkDataset) Descriptor() ([]byte, []int) {
 	return file_benchmarks_proto_rawDescGZIP(), []int{0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
index c470106..bfcd724 100644
--- a/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.go
@@ -86,7 +86,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_rawDescGZIP(), []int{0}
 }
@@ -451,7 +451,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1SubMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto2_benchmark_message1_proto2_proto_rawDescGZIP(), []int{1}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go b/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
index 440a0a3..eb173a9 100644
--- a/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.go
@@ -86,7 +86,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_rawDescGZIP(), []int{0}
 }
@@ -426,7 +426,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage1SubMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage1SubMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message1_proto3_benchmark_message1_proto3_proto_rawDescGZIP(), []int{1}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
index ececca4..efa14bb 100644
--- a/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message2/benchmark_message2.pb.go
@@ -75,7 +75,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{0}
 }
@@ -345,7 +345,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2GroupedMessage.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2GroupedMessage.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2GroupedMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{1}
 }
@@ -475,7 +475,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage2_Group1.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage2_Group1.ProtoReflect.Descriptor instead.
 func (*GoogleMessage2_Group1) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message2_benchmark_message2_proto_rawDescGZIP(), []int{0, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
index 54c2c45..bdc5d89 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3.pb.go
@@ -61,7 +61,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage3.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage3.ProtoReflect.Descriptor instead.
 func (*GoogleMessage3) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{0}
 }
@@ -203,7 +203,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1327.ProtoReflect.Type instead.
+// Deprecated: Use Message1327.ProtoReflect.Descriptor instead.
 func (*Message1327) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{1}
 }
@@ -274,7 +274,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672.ProtoReflect.Type instead.
+// Deprecated: Use Message3672.ProtoReflect.Descriptor instead.
 func (*Message3672) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2}
 }
@@ -384,7 +384,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3804.ProtoReflect.Type instead.
+// Deprecated: Use Message3804.ProtoReflect.Descriptor instead.
 func (*Message3804) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{3}
 }
@@ -467,7 +467,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6849.ProtoReflect.Type instead.
+// Deprecated: Use Message6849.ProtoReflect.Descriptor instead.
 func (*Message6849) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{4}
 }
@@ -508,7 +508,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6866.ProtoReflect.Type instead.
+// Deprecated: Use Message6866.ProtoReflect.Descriptor instead.
 func (*Message6866) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{5}
 }
@@ -549,7 +549,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6870.ProtoReflect.Type instead.
+// Deprecated: Use Message6870.ProtoReflect.Descriptor instead.
 func (*Message6870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{6}
 }
@@ -634,7 +634,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7651.ProtoReflect.Type instead.
+// Deprecated: Use Message7651.ProtoReflect.Descriptor instead.
 func (*Message7651) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{7}
 }
@@ -988,7 +988,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7864.ProtoReflect.Type instead.
+// Deprecated: Use Message7864.ProtoReflect.Descriptor instead.
 func (*Message7864) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{8}
 }
@@ -1083,7 +1083,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7929.ProtoReflect.Type instead.
+// Deprecated: Use Message7929.ProtoReflect.Descriptor instead.
 func (*Message7929) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{9}
 }
@@ -1273,7 +1273,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8508.ProtoReflect.Type instead.
+// Deprecated: Use Message8508.ProtoReflect.Descriptor instead.
 func (*Message8508) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{10}
 }
@@ -1427,7 +1427,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9122.ProtoReflect.Type instead.
+// Deprecated: Use Message9122.ProtoReflect.Descriptor instead.
 func (*Message9122) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{11}
 }
@@ -1475,7 +1475,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10177.ProtoReflect.Type instead.
+// Deprecated: Use Message10177.ProtoReflect.Descriptor instead.
 func (*Message10177) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{12}
 }
@@ -1518,7 +1518,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10278.ProtoReflect.Type instead.
+// Deprecated: Use Message10278.ProtoReflect.Descriptor instead.
 func (*Message10278) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{13}
 }
@@ -1573,7 +1573,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10323.ProtoReflect.Type instead.
+// Deprecated: Use Message10323.ProtoReflect.Descriptor instead.
 func (*Message10323) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{14}
 }
@@ -1615,7 +1615,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10324.ProtoReflect.Type instead.
+// Deprecated: Use Message10324.ProtoReflect.Descriptor instead.
 func (*Message10324) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{15}
 }
@@ -1663,7 +1663,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11990.ProtoReflect.Type instead.
+// Deprecated: Use Message11990.ProtoReflect.Descriptor instead.
 func (*Message11990) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{16}
 }
@@ -1706,7 +1706,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12691.ProtoReflect.Type instead.
+// Deprecated: Use Message12691.ProtoReflect.Descriptor instead.
 func (*Message12691) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{17}
 }
@@ -1780,7 +1780,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12870.ProtoReflect.Type instead.
+// Deprecated: Use Message12870.ProtoReflect.Descriptor instead.
 func (*Message12870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{18}
 }
@@ -1955,7 +1955,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13154.ProtoReflect.Type instead.
+// Deprecated: Use Message13154.ProtoReflect.Descriptor instead.
 func (*Message13154) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{19}
 }
@@ -2035,7 +2035,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16507.ProtoReflect.Type instead.
+// Deprecated: Use Message16507.ProtoReflect.Descriptor instead.
 func (*Message16507) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{20}
 }
@@ -2044,7 +2044,7 @@
 	{Start: 21, End: 21},
 }
 
-// Deprecated: Use Message16507.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16507.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16507) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16507
 }
@@ -2302,7 +2302,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16564.ProtoReflect.Type instead.
+// Deprecated: Use Message16564.ProtoReflect.Descriptor instead.
 func (*Message16564) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{21}
 }
@@ -2344,7 +2344,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16661.ProtoReflect.Type instead.
+// Deprecated: Use Message16661.ProtoReflect.Descriptor instead.
 func (*Message16661) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{22}
 }
@@ -2395,7 +2395,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16746.ProtoReflect.Type instead.
+// Deprecated: Use Message16746.ProtoReflect.Descriptor instead.
 func (*Message16746) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{23}
 }
@@ -2458,7 +2458,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17786.ProtoReflect.Type instead.
+// Deprecated: Use Message17786.ProtoReflect.Descriptor instead.
 func (*Message17786) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{24}
 }
@@ -2506,7 +2506,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message22857.ProtoReflect.Type instead.
+// Deprecated: Use Message22857.ProtoReflect.Descriptor instead.
 func (*Message22857) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{25}
 }
@@ -2548,7 +2548,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24404.ProtoReflect.Type instead.
+// Deprecated: Use Message24404.ProtoReflect.Descriptor instead.
 func (*Message24404) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{26}
 }
@@ -2597,7 +2597,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27300.ProtoReflect.Type instead.
+// Deprecated: Use Message27300.ProtoReflect.Descriptor instead.
 func (*Message27300) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{27}
 }
@@ -2667,7 +2667,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27453.ProtoReflect.Type instead.
+// Deprecated: Use Message27453.ProtoReflect.Descriptor instead.
 func (*Message27453) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{28}
 }
@@ -2863,7 +2863,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672_Message3673.ProtoReflect.Type instead.
+// Deprecated: Use Message3672_Message3673.ProtoReflect.Descriptor instead.
 func (*Message3672_Message3673) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -2912,7 +2912,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3672_Message3674.ProtoReflect.Type instead.
+// Deprecated: Use Message3672_Message3674.ProtoReflect.Descriptor instead.
 func (*Message3672_Message3674) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{2, 1}
 }
@@ -2985,7 +2985,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17786_Message17787.ProtoReflect.Type instead.
+// Deprecated: Use Message17786_Message17787.ProtoReflect.Descriptor instead.
 func (*Message17786_Message17787) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{24, 0}
 }
@@ -3231,7 +3231,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24404_Message24405.ProtoReflect.Type instead.
+// Deprecated: Use Message24404_Message24405.ProtoReflect.Descriptor instead.
 func (*Message24404_Message24405) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_proto_rawDescGZIP(), []int{26, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
index edf87f5..391604c 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_1.pb.go
@@ -47,7 +47,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34390.ProtoReflect.Type instead.
+// Deprecated: Use Message34390.ProtoReflect.Descriptor instead.
 func (*Message34390) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{0}
 }
@@ -89,7 +89,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34624.ProtoReflect.Type instead.
+// Deprecated: Use Message34624.ProtoReflect.Descriptor instead.
 func (*Message34624) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{1}
 }
@@ -150,7 +150,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34791.ProtoReflect.Type instead.
+// Deprecated: Use Message34791.ProtoReflect.Descriptor instead.
 func (*Message34791) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{2}
 }
@@ -287,7 +287,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35483.ProtoReflect.Type instead.
+// Deprecated: Use Message35483.ProtoReflect.Descriptor instead.
 func (*Message35483) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{3}
 }
@@ -370,7 +370,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35807.ProtoReflect.Type instead.
+// Deprecated: Use Message35807.ProtoReflect.Descriptor instead.
 func (*Message35807) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{4}
 }
@@ -461,7 +461,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37487.ProtoReflect.Type instead.
+// Deprecated: Use Message37487.ProtoReflect.Descriptor instead.
 func (*Message37487) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{5}
 }
@@ -513,7 +513,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13062.ProtoReflect.Type instead.
+// Deprecated: Use Message13062.ProtoReflect.Descriptor instead.
 func (*Message13062) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{6}
 }
@@ -582,7 +582,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message952.ProtoReflect.Type instead.
+// Deprecated: Use Message952.ProtoReflect.Descriptor instead.
 func (*Message952) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{7}
 }
@@ -685,7 +685,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876.ProtoReflect.Type instead.
+// Deprecated: Use Message36876.ProtoReflect.Descriptor instead.
 func (*Message36876) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8}
 }
@@ -1159,7 +1159,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1328.ProtoReflect.Type instead.
+// Deprecated: Use Message1328.ProtoReflect.Descriptor instead.
 func (*Message1328) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{9}
 }
@@ -1192,7 +1192,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6850.ProtoReflect.Type instead.
+// Deprecated: Use Message6850.ProtoReflect.Descriptor instead.
 func (*Message6850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{10}
 }
@@ -1258,7 +1258,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6863.ProtoReflect.Type instead.
+// Deprecated: Use Message6863.ProtoReflect.Descriptor instead.
 func (*Message6863) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{11}
 }
@@ -1522,7 +1522,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6871.ProtoReflect.Type instead.
+// Deprecated: Use Message6871.ProtoReflect.Descriptor instead.
 func (*Message6871) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{12}
 }
@@ -1557,7 +1557,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7547.ProtoReflect.Type instead.
+// Deprecated: Use Message7547.ProtoReflect.Descriptor instead.
 func (*Message7547) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{13}
 }
@@ -1616,7 +1616,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7648.ProtoReflect.Type instead.
+// Deprecated: Use Message7648.ProtoReflect.Descriptor instead.
 func (*Message7648) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{14}
 }
@@ -1733,7 +1733,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7865.ProtoReflect.Type instead.
+// Deprecated: Use Message7865.ProtoReflect.Descriptor instead.
 func (*Message7865) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{15}
 }
@@ -1768,7 +1768,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7928.ProtoReflect.Type instead.
+// Deprecated: Use Message7928.ProtoReflect.Descriptor instead.
 func (*Message7928) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{16}
 }
@@ -1818,7 +1818,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7919.ProtoReflect.Type instead.
+// Deprecated: Use Message7919.ProtoReflect.Descriptor instead.
 func (*Message7919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{17}
 }
@@ -1874,7 +1874,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7920.ProtoReflect.Type instead.
+// Deprecated: Use Message7920.ProtoReflect.Descriptor instead.
 func (*Message7920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{18}
 }
@@ -1925,7 +1925,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7921.ProtoReflect.Type instead.
+// Deprecated: Use Message7921.ProtoReflect.Descriptor instead.
 func (*Message7921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{19}
 }
@@ -1991,7 +1991,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8511.ProtoReflect.Type instead.
+// Deprecated: Use Message8511.ProtoReflect.Descriptor instead.
 func (*Message8511) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{20}
 }
@@ -2065,7 +2065,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8512.ProtoReflect.Type instead.
+// Deprecated: Use Message8512.ProtoReflect.Descriptor instead.
 func (*Message8512) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{21}
 }
@@ -2144,7 +2144,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8513.ProtoReflect.Type instead.
+// Deprecated: Use Message8513.ProtoReflect.Descriptor instead.
 func (*Message8513) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{22}
 }
@@ -2210,7 +2210,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8514.ProtoReflect.Type instead.
+// Deprecated: Use Message8514.ProtoReflect.Descriptor instead.
 func (*Message8514) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{23}
 }
@@ -2281,7 +2281,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8515.ProtoReflect.Type instead.
+// Deprecated: Use Message8515.ProtoReflect.Descriptor instead.
 func (*Message8515) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{24}
 }
@@ -2342,7 +2342,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10320.ProtoReflect.Type instead.
+// Deprecated: Use Message10320.ProtoReflect.Descriptor instead.
 func (*Message10320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{25}
 }
@@ -2427,7 +2427,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10321.ProtoReflect.Type instead.
+// Deprecated: Use Message10321.ProtoReflect.Descriptor instead.
 func (*Message10321) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{26}
 }
@@ -2484,7 +2484,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10322.ProtoReflect.Type instead.
+// Deprecated: Use Message10322.ProtoReflect.Descriptor instead.
 func (*Message10322) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{27}
 }
@@ -2542,7 +2542,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11988.ProtoReflect.Type instead.
+// Deprecated: Use Message11988.ProtoReflect.Descriptor instead.
 func (*Message11988) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{28}
 }
@@ -2607,7 +2607,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12668.ProtoReflect.Type instead.
+// Deprecated: Use Message12668.ProtoReflect.Descriptor instead.
 func (*Message12668) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{29}
 }
@@ -2675,7 +2675,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12825.ProtoReflect.Type instead.
+// Deprecated: Use Message12825.ProtoReflect.Descriptor instead.
 func (*Message12825) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{30}
 }
@@ -2760,7 +2760,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16478.ProtoReflect.Type instead.
+// Deprecated: Use Message16478.ProtoReflect.Descriptor instead.
 func (*Message16478) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{31}
 }
@@ -2817,7 +2817,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16552.ProtoReflect.Type instead.
+// Deprecated: Use Message16552.ProtoReflect.Descriptor instead.
 func (*Message16552) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{32}
 }
@@ -2874,7 +2874,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16660.ProtoReflect.Type instead.
+// Deprecated: Use Message16660.ProtoReflect.Descriptor instead.
 func (*Message16660) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{33}
 }
@@ -2953,7 +2953,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16727.ProtoReflect.Type instead.
+// Deprecated: Use Message16727.ProtoReflect.Descriptor instead.
 func (*Message16727) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{34}
 }
@@ -2962,7 +2962,7 @@
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message16727.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16727.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16727) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16727
 }
@@ -3165,7 +3165,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16725.ProtoReflect.Type instead.
+// Deprecated: Use Message16725.ProtoReflect.Descriptor instead.
 func (*Message16725) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{35}
 }
@@ -3234,7 +3234,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17726.ProtoReflect.Type instead.
+// Deprecated: Use Message17726.ProtoReflect.Descriptor instead.
 func (*Message17726) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{36}
 }
@@ -3423,7 +3423,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17782.ProtoReflect.Type instead.
+// Deprecated: Use Message17782.ProtoReflect.Descriptor instead.
 func (*Message17782) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{37}
 }
@@ -3476,7 +3476,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783.ProtoReflect.Type instead.
+// Deprecated: Use Message17783.ProtoReflect.Descriptor instead.
 func (*Message17783) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38}
 }
@@ -3631,7 +3631,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16945.ProtoReflect.Type instead.
+// Deprecated: Use Message16945.ProtoReflect.Descriptor instead.
 func (*Message16945) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{39}
 }
@@ -4336,7 +4336,7 @@
 	{Start: 1085, End: 1085},
 }
 
-// Deprecated: Use Message16945.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message16945.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message16945) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message16945
 }
@@ -4924,7 +4924,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34791_Message34792.ProtoReflect.Type instead.
+// Deprecated: Use Message34791_Message34792.ProtoReflect.Descriptor instead.
 func (*Message34791_Message34792) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -4976,7 +4976,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36877.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36877.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36877) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -5044,7 +5044,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36878.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36878.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36878) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 1}
 }
@@ -5079,7 +5079,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36879.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36879.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36879) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 2}
 }
@@ -5126,7 +5126,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36880.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36880.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36880) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 3}
 }
@@ -5159,7 +5159,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36881.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36881.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36881) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 4}
 }
@@ -5192,7 +5192,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36882.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36882.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36882) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 5}
 }
@@ -5225,7 +5225,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36883.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36883.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36883) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 6}
 }
@@ -5258,7 +5258,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36884.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36884.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36884) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 7}
 }
@@ -5291,7 +5291,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36885.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36885.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36885) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 8}
 }
@@ -5324,7 +5324,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36886.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36886.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 9}
 }
@@ -5357,7 +5357,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36887.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36887.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 10}
 }
@@ -5396,7 +5396,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36888.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36888.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36888) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 11}
 }
@@ -5496,7 +5496,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36889.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36889.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36889) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 12}
 }
@@ -5704,7 +5704,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36910.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36910.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36910) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 13}
 }
@@ -5741,7 +5741,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36911.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36911.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36911) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 14}
 }
@@ -5804,7 +5804,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36876_Message36912.ProtoReflect.Type instead.
+// Deprecated: Use Message36876_Message36912.ProtoReflect.Descriptor instead.
 func (*Message36876_Message36912) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{8, 15}
 }
@@ -5857,7 +5857,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783_Message17784.ProtoReflect.Type instead.
+// Deprecated: Use Message17783_Message17784.ProtoReflect.Descriptor instead.
 func (*Message17783_Message17784) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38, 0}
 }
@@ -5938,7 +5938,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17783_Message17785.ProtoReflect.Type instead.
+// Deprecated: Use Message17783_Message17785.ProtoReflect.Descriptor instead.
 func (*Message17783_Message17785) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_1_proto_rawDescGZIP(), []int{38, 1}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
index abdf3d1..7164135 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_2.pb.go
@@ -51,7 +51,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message22853.ProtoReflect.Type instead.
+// Deprecated: Use Message22853.ProtoReflect.Descriptor instead.
 func (*Message22853) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{0}
 }
@@ -144,7 +144,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24345.ProtoReflect.Type instead.
+// Deprecated: Use Message24345.ProtoReflect.Descriptor instead.
 func (*Message24345) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{1}
 }
@@ -354,7 +354,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24403.ProtoReflect.Type instead.
+// Deprecated: Use Message24403.ProtoReflect.Descriptor instead.
 func (*Message24403) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{2}
 }
@@ -426,7 +426,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24391.ProtoReflect.Type instead.
+// Deprecated: Use Message24391.ProtoReflect.Descriptor instead.
 func (*Message24391) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{3}
 }
@@ -634,7 +634,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27454.ProtoReflect.Type instead.
+// Deprecated: Use Message27454.ProtoReflect.Descriptor instead.
 func (*Message27454) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{4}
 }
@@ -672,7 +672,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27357.ProtoReflect.Type instead.
+// Deprecated: Use Message27357.ProtoReflect.Descriptor instead.
 func (*Message27357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{5}
 }
@@ -744,7 +744,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27360.ProtoReflect.Type instead.
+// Deprecated: Use Message27360.ProtoReflect.Descriptor instead.
 func (*Message27360) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{6}
 }
@@ -810,7 +810,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34387.ProtoReflect.Type instead.
+// Deprecated: Use Message34387.ProtoReflect.Descriptor instead.
 func (*Message34387) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{7}
 }
@@ -896,7 +896,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34621.ProtoReflect.Type instead.
+// Deprecated: Use Message34621.ProtoReflect.Descriptor instead.
 func (*Message34621) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{8}
 }
@@ -1069,7 +1069,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35476.ProtoReflect.Type instead.
+// Deprecated: Use Message35476.ProtoReflect.Descriptor instead.
 func (*Message35476) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{9}
 }
@@ -1207,7 +1207,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message949.ProtoReflect.Type instead.
+// Deprecated: Use Message949.ProtoReflect.Descriptor instead.
 func (*Message949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{10}
 }
@@ -1291,7 +1291,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36869.ProtoReflect.Type instead.
+// Deprecated: Use Message36869.ProtoReflect.Descriptor instead.
 func (*Message36869) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{11}
 }
@@ -1343,7 +1343,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33968.ProtoReflect.Type instead.
+// Deprecated: Use Message33968.ProtoReflect.Descriptor instead.
 func (*Message33968) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{12}
 }
@@ -1427,7 +1427,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6644.ProtoReflect.Type instead.
+// Deprecated: Use Message6644.ProtoReflect.Descriptor instead.
 func (*Message6644) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{13}
 }
@@ -1573,7 +1573,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831.ProtoReflect.Type instead.
+// Deprecated: Use Message18831.ProtoReflect.Descriptor instead.
 func (*Message18831) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14}
 }
@@ -1615,7 +1615,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13090.ProtoReflect.Type instead.
+// Deprecated: Use Message13090.ProtoReflect.Descriptor instead.
 func (*Message13090) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{15}
 }
@@ -1667,7 +1667,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11874.ProtoReflect.Type instead.
+// Deprecated: Use Message11874.ProtoReflect.Descriptor instead.
 func (*Message11874) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{16}
 }
@@ -1678,7 +1678,7 @@
 	{Start: 5, End: 5},
 }
 
-// Deprecated: Use Message11874.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message11874.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message11874) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message11874
 }
@@ -1740,7 +1740,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4144.ProtoReflect.Type instead.
+// Deprecated: Use Message4144.ProtoReflect.Descriptor instead.
 func (*Message4144) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{17}
 }
@@ -1791,7 +1791,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573.ProtoReflect.Type instead.
+// Deprecated: Use Message35573.ProtoReflect.Descriptor instead.
 func (*Message35573) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18}
 }
@@ -1913,7 +1913,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36858.ProtoReflect.Type instead.
+// Deprecated: Use Message36858.ProtoReflect.Descriptor instead.
 func (*Message36858) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{19}
 }
@@ -2051,7 +2051,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13174.ProtoReflect.Type instead.
+// Deprecated: Use Message13174.ProtoReflect.Descriptor instead.
 func (*Message13174) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{20}
 }
@@ -2336,7 +2336,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18283.ProtoReflect.Type instead.
+// Deprecated: Use Message18283.ProtoReflect.Descriptor instead.
 func (*Message18283) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{21}
 }
@@ -2348,7 +2348,7 @@
 	{Start: 165, End: 165},
 }
 
-// Deprecated: Use Message18283.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message18283.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message18283) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message18283
 }
@@ -3112,7 +3112,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13169.ProtoReflect.Type instead.
+// Deprecated: Use Message13169.ProtoReflect.Descriptor instead.
 func (*Message13169) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{22}
 }
@@ -3167,7 +3167,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message19255.ProtoReflect.Type instead.
+// Deprecated: Use Message19255.ProtoReflect.Descriptor instead.
 func (*Message19255) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{23}
 }
@@ -3210,7 +3210,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35542.ProtoReflect.Type instead.
+// Deprecated: Use Message35542.ProtoReflect.Descriptor instead.
 func (*Message35542) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{24}
 }
@@ -3276,7 +3276,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3901.ProtoReflect.Type instead.
+// Deprecated: Use Message3901.ProtoReflect.Descriptor instead.
 func (*Message3901) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{25}
 }
@@ -3393,7 +3393,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33968_Message33969.ProtoReflect.Type instead.
+// Deprecated: Use Message33968_Message33969.ProtoReflect.Descriptor instead.
 func (*Message33968_Message33969) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{12, 0}
 }
@@ -3433,7 +3433,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831_Message18832.ProtoReflect.Type instead.
+// Deprecated: Use Message18831_Message18832.ProtoReflect.Descriptor instead.
 func (*Message18831_Message18832) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14, 0}
 }
@@ -3520,7 +3520,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18831_Message18832_Message18833.ProtoReflect.Type instead.
+// Deprecated: Use Message18831_Message18832_Message18833.ProtoReflect.Descriptor instead.
 func (*Message18831_Message18832_Message18833) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{14, 0, 0}
 }
@@ -3594,7 +3594,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4144_Message4145.ProtoReflect.Type instead.
+// Deprecated: Use Message4144_Message4145.ProtoReflect.Descriptor instead.
 func (*Message4144_Message4145) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{17, 0}
 }
@@ -3669,7 +3669,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35574.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35574.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35574) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 0}
 }
@@ -3740,7 +3740,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35575.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35575.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35575) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 1}
 }
@@ -4064,7 +4064,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35573_Message35575_Message35576.ProtoReflect.Type instead.
+// Deprecated: Use Message35573_Message35575_Message35576.ProtoReflect.Descriptor instead.
 func (*Message35573_Message35575_Message35576) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{18, 1, 0}
 }
@@ -4274,7 +4274,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message36858_Message36859.ProtoReflect.Type instead.
+// Deprecated: Use Message36858_Message36859.ProtoReflect.Descriptor instead.
 func (*Message36858_Message36859) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_2_proto_rawDescGZIP(), []int{19, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
index 9de4c35..5ce4ba5 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_3.pb.go
@@ -57,7 +57,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546.ProtoReflect.Type instead.
+// Deprecated: Use Message35546.ProtoReflect.Descriptor instead.
 func (*Message35546) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0}
 }
@@ -205,7 +205,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356.ProtoReflect.Type instead.
+// Deprecated: Use Message2356.ProtoReflect.Descriptor instead.
 func (*Message2356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1}
 }
@@ -497,7 +497,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029.ProtoReflect.Type instead.
+// Deprecated: Use Message7029.ProtoReflect.Descriptor instead.
 func (*Message7029) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2}
 }
@@ -825,7 +825,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35538.ProtoReflect.Type instead.
+// Deprecated: Use Message35538.ProtoReflect.Descriptor instead.
 func (*Message35538) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{3}
 }
@@ -877,7 +877,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18921.ProtoReflect.Type instead.
+// Deprecated: Use Message18921.ProtoReflect.Descriptor instead.
 func (*Message18921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{4}
 }
@@ -995,7 +995,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35540.ProtoReflect.Type instead.
+// Deprecated: Use Message35540.ProtoReflect.Descriptor instead.
 func (*Message35540) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{5}
 }
@@ -1036,7 +1036,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886.ProtoReflect.Type instead.
+// Deprecated: Use Message3886.ProtoReflect.Descriptor instead.
 func (*Message3886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{6}
 }
@@ -1084,7 +1084,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6743.ProtoReflect.Type instead.
+// Deprecated: Use Message6743.ProtoReflect.Descriptor instead.
 func (*Message6743) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{7}
 }
@@ -1183,7 +1183,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6773.ProtoReflect.Type instead.
+// Deprecated: Use Message6773.ProtoReflect.Descriptor instead.
 func (*Message6773) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{8}
 }
@@ -1313,7 +1313,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8224.ProtoReflect.Type instead.
+// Deprecated: Use Message8224.ProtoReflect.Descriptor instead.
 func (*Message8224) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{9}
 }
@@ -1544,7 +1544,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8392.ProtoReflect.Type instead.
+// Deprecated: Use Message8392.ProtoReflect.Descriptor instead.
 func (*Message8392) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{10}
 }
@@ -1664,7 +1664,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8130.ProtoReflect.Type instead.
+// Deprecated: Use Message8130.ProtoReflect.Descriptor instead.
 func (*Message8130) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{11}
 }
@@ -1873,7 +1873,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8478.ProtoReflect.Type instead.
+// Deprecated: Use Message8478.ProtoReflect.Descriptor instead.
 func (*Message8478) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{12}
 }
@@ -1971,7 +1971,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8479.ProtoReflect.Type instead.
+// Deprecated: Use Message8479.ProtoReflect.Descriptor instead.
 func (*Message8479) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{13}
 }
@@ -2074,7 +2074,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10319.ProtoReflect.Type instead.
+// Deprecated: Use Message10319.ProtoReflect.Descriptor instead.
 func (*Message10319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{14}
 }
@@ -2160,7 +2160,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4016.ProtoReflect.Type instead.
+// Deprecated: Use Message4016.ProtoReflect.Descriptor instead.
 func (*Message4016) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{15}
 }
@@ -2225,7 +2225,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12669.ProtoReflect.Type instead.
+// Deprecated: Use Message12669.ProtoReflect.Descriptor instead.
 func (*Message12669) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{16}
 }
@@ -2292,7 +2292,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12819.ProtoReflect.Type instead.
+// Deprecated: Use Message12819.ProtoReflect.Descriptor instead.
 func (*Message12819) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{17}
 }
@@ -2375,7 +2375,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12820.ProtoReflect.Type instead.
+// Deprecated: Use Message12820.ProtoReflect.Descriptor instead.
 func (*Message12820) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{18}
 }
@@ -2469,7 +2469,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12821.ProtoReflect.Type instead.
+// Deprecated: Use Message12821.ProtoReflect.Descriptor instead.
 func (*Message12821) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{19}
 }
@@ -2542,7 +2542,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12818.ProtoReflect.Type instead.
+// Deprecated: Use Message12818.ProtoReflect.Descriptor instead.
 func (*Message12818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{20}
 }
@@ -2616,7 +2616,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16479.ProtoReflect.Type instead.
+// Deprecated: Use Message16479.ProtoReflect.Descriptor instead.
 func (*Message16479) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{21}
 }
@@ -2696,7 +2696,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16722.ProtoReflect.Type instead.
+// Deprecated: Use Message16722.ProtoReflect.Descriptor instead.
 func (*Message16722) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{22}
 }
@@ -2777,7 +2777,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16724.ProtoReflect.Type instead.
+// Deprecated: Use Message16724.ProtoReflect.Descriptor instead.
 func (*Message16724) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{23}
 }
@@ -2901,7 +2901,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message17728.ProtoReflect.Type instead.
+// Deprecated: Use Message17728.ProtoReflect.Descriptor instead.
 func (*Message17728) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{24}
 }
@@ -2949,7 +2949,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24356.ProtoReflect.Type instead.
+// Deprecated: Use Message24356.ProtoReflect.Descriptor instead.
 func (*Message24356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{25}
 }
@@ -3101,7 +3101,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24376.ProtoReflect.Type instead.
+// Deprecated: Use Message24376.ProtoReflect.Descriptor instead.
 func (*Message24376) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{26}
 }
@@ -3247,7 +3247,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24366.ProtoReflect.Type instead.
+// Deprecated: Use Message24366.ProtoReflect.Descriptor instead.
 func (*Message24366) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{27}
 }
@@ -3387,7 +3387,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546_Message35547.ProtoReflect.Type instead.
+// Deprecated: Use Message35546_Message35547.ProtoReflect.Descriptor instead.
 func (*Message35546_Message35547) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0, 0}
 }
@@ -3436,7 +3436,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35546_Message35548.ProtoReflect.Type instead.
+// Deprecated: Use Message35546_Message35548.ProtoReflect.Descriptor instead.
 func (*Message35546_Message35548) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{0, 1}
 }
@@ -3495,7 +3495,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2357.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2357.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 0}
 }
@@ -3612,7 +3612,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2358.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2358.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 1}
 }
@@ -3653,7 +3653,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2359.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2359.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2359) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{1, 2}
 }
@@ -3745,7 +3745,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029_Message7030.ProtoReflect.Type instead.
+// Deprecated: Use Message7029_Message7030.ProtoReflect.Descriptor instead.
 func (*Message7029_Message7030) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2, 0}
 }
@@ -3805,7 +3805,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7029_Message7031.ProtoReflect.Type instead.
+// Deprecated: Use Message7029_Message7031.ProtoReflect.Descriptor instead.
 func (*Message7029_Message7031) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{2, 1}
 }
@@ -3903,7 +3903,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18921_Message18922.ProtoReflect.Type instead.
+// Deprecated: Use Message18921_Message18922.ProtoReflect.Descriptor instead.
 func (*Message18921_Message18922) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{4, 0}
 }
@@ -4101,7 +4101,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886_Message3887.ProtoReflect.Type instead.
+// Deprecated: Use Message3886_Message3887.ProtoReflect.Descriptor instead.
 func (*Message3886_Message3887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_3_proto_rawDescGZIP(), []int{6, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
index 652affd..c27f805 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_4.pb.go
@@ -46,7 +46,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24346.ProtoReflect.Type instead.
+// Deprecated: Use Message24346.ProtoReflect.Descriptor instead.
 func (*Message24346) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{0}
 }
@@ -80,7 +80,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24401.ProtoReflect.Type instead.
+// Deprecated: Use Message24401.ProtoReflect.Descriptor instead.
 func (*Message24401) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{1}
 }
@@ -121,7 +121,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24402.ProtoReflect.Type instead.
+// Deprecated: Use Message24402.ProtoReflect.Descriptor instead.
 func (*Message24402) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{2}
 }
@@ -179,7 +179,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24379.ProtoReflect.Type instead.
+// Deprecated: Use Message24379.ProtoReflect.Descriptor instead.
 func (*Message24379) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{3}
 }
@@ -340,7 +340,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message27358.ProtoReflect.Type instead.
+// Deprecated: Use Message27358.ProtoReflect.Descriptor instead.
 func (*Message27358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{4}
 }
@@ -397,7 +397,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34381.ProtoReflect.Type instead.
+// Deprecated: Use Message34381.ProtoReflect.Descriptor instead.
 func (*Message34381) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{5}
 }
@@ -507,7 +507,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message34619.ProtoReflect.Type instead.
+// Deprecated: Use Message34619.ProtoReflect.Descriptor instead.
 func (*Message34619) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{6}
 }
@@ -623,7 +623,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message730.ProtoReflect.Type instead.
+// Deprecated: Use Message730.ProtoReflect.Descriptor instead.
 func (*Message730) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{7}
 }
@@ -635,7 +635,7 @@
 	{Start: 15, End: 15},
 }
 
-// Deprecated: Use Message730.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message730.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message730) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message730
 }
@@ -903,7 +903,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33958.ProtoReflect.Type instead.
+// Deprecated: Use Message33958.ProtoReflect.Descriptor instead.
 func (*Message33958) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{8}
 }
@@ -969,7 +969,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6637.ProtoReflect.Type instead.
+// Deprecated: Use Message6637.ProtoReflect.Descriptor instead.
 func (*Message6637) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{9}
 }
@@ -1055,7 +1055,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6643.ProtoReflect.Type instead.
+// Deprecated: Use Message6643.ProtoReflect.Descriptor instead.
 func (*Message6643) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{10}
 }
@@ -1233,7 +1233,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6126.ProtoReflect.Type instead.
+// Deprecated: Use Message6126.ProtoReflect.Descriptor instead.
 func (*Message6126) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{11}
 }
@@ -1409,7 +1409,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083.ProtoReflect.Type instead.
+// Deprecated: Use Message13083.ProtoReflect.Descriptor instead.
 func (*Message13083) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12}
 }
@@ -1515,7 +1515,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13088.ProtoReflect.Type instead.
+// Deprecated: Use Message13088.ProtoReflect.Descriptor instead.
 func (*Message13088) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{13}
 }
@@ -1578,7 +1578,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10391.ProtoReflect.Type instead.
+// Deprecated: Use Message10391.ProtoReflect.Descriptor instead.
 func (*Message10391) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{14}
 }
@@ -1687,7 +1687,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11873.ProtoReflect.Type instead.
+// Deprecated: Use Message11873.ProtoReflect.Descriptor instead.
 func (*Message11873) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{15}
 }
@@ -1697,7 +1697,7 @@
 	{Start: 10, End: 10},
 }
 
-// Deprecated: Use Message11873.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message11873.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message11873) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message11873
 }
@@ -1818,7 +1818,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message35506.ProtoReflect.Type instead.
+// Deprecated: Use Message35506.ProtoReflect.Descriptor instead.
 func (*Message35506) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{16}
 }
@@ -1880,7 +1880,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13151.ProtoReflect.Type instead.
+// Deprecated: Use Message13151.ProtoReflect.Descriptor instead.
 func (*Message13151) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{17}
 }
@@ -1921,7 +1921,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18253.ProtoReflect.Type instead.
+// Deprecated: Use Message18253.ProtoReflect.Descriptor instead.
 func (*Message18253) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{18}
 }
@@ -1962,7 +1962,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16685.ProtoReflect.Type instead.
+// Deprecated: Use Message16685.ProtoReflect.Descriptor instead.
 func (*Message16685) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{19}
 }
@@ -2012,7 +2012,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816.ProtoReflect.Type instead.
+// Deprecated: Use Message16816.ProtoReflect.Descriptor instead.
 func (*Message16816) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20}
 }
@@ -2126,7 +2126,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13168.ProtoReflect.Type instead.
+// Deprecated: Use Message13168.ProtoReflect.Descriptor instead.
 func (*Message13168) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{21}
 }
@@ -2249,7 +2249,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13167.ProtoReflect.Type instead.
+// Deprecated: Use Message13167.ProtoReflect.Descriptor instead.
 func (*Message13167) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{22}
 }
@@ -2375,7 +2375,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1374.ProtoReflect.Type instead.
+// Deprecated: Use Message1374.ProtoReflect.Descriptor instead.
 func (*Message1374) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{23}
 }
@@ -2422,7 +2422,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18943.ProtoReflect.Type instead.
+// Deprecated: Use Message18943.ProtoReflect.Descriptor instead.
 func (*Message18943) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{24}
 }
@@ -2455,7 +2455,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18944.ProtoReflect.Type instead.
+// Deprecated: Use Message18944.ProtoReflect.Descriptor instead.
 func (*Message18944) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{25}
 }
@@ -2519,7 +2519,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18856.ProtoReflect.Type instead.
+// Deprecated: Use Message18856.ProtoReflect.Descriptor instead.
 func (*Message18856) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{26}
 }
@@ -2775,7 +2775,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3850.ProtoReflect.Type instead.
+// Deprecated: Use Message3850.ProtoReflect.Descriptor instead.
 func (*Message3850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{27}
 }
@@ -2854,7 +2854,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6721.ProtoReflect.Type instead.
+// Deprecated: Use Message6721.ProtoReflect.Descriptor instead.
 func (*Message6721) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{28}
 }
@@ -2916,7 +2916,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6742.ProtoReflect.Type instead.
+// Deprecated: Use Message6742.ProtoReflect.Descriptor instead.
 func (*Message6742) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{29}
 }
@@ -2958,7 +2958,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6726.ProtoReflect.Type instead.
+// Deprecated: Use Message6726.ProtoReflect.Descriptor instead.
 func (*Message6726) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{30}
 }
@@ -3008,7 +3008,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6733.ProtoReflect.Type instead.
+// Deprecated: Use Message6733.ProtoReflect.Descriptor instead.
 func (*Message6733) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{31}
 }
@@ -3064,7 +3064,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6723.ProtoReflect.Type instead.
+// Deprecated: Use Message6723.ProtoReflect.Descriptor instead.
 func (*Message6723) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{32}
 }
@@ -3113,7 +3113,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6725.ProtoReflect.Type instead.
+// Deprecated: Use Message6725.ProtoReflect.Descriptor instead.
 func (*Message6725) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{33}
 }
@@ -3161,7 +3161,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6734.ProtoReflect.Type instead.
+// Deprecated: Use Message6734.ProtoReflect.Descriptor instead.
 func (*Message6734) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{34}
 }
@@ -3204,7 +3204,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8184.ProtoReflect.Type instead.
+// Deprecated: Use Message8184.ProtoReflect.Descriptor instead.
 func (*Message8184) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{35}
 }
@@ -3261,7 +3261,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8477.ProtoReflect.Type instead.
+// Deprecated: Use Message8477.ProtoReflect.Descriptor instead.
 func (*Message8477) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{36}
 }
@@ -3319,7 +3319,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8454.ProtoReflect.Type instead.
+// Deprecated: Use Message8454.ProtoReflect.Descriptor instead.
 func (*Message8454) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{37}
 }
@@ -3383,7 +3383,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8476.ProtoReflect.Type instead.
+// Deprecated: Use Message8476.ProtoReflect.Descriptor instead.
 func (*Message8476) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{38}
 }
@@ -3441,7 +3441,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8455.ProtoReflect.Type instead.
+// Deprecated: Use Message8455.ProtoReflect.Descriptor instead.
 func (*Message8455) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{39}
 }
@@ -3504,7 +3504,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8475.ProtoReflect.Type instead.
+// Deprecated: Use Message8475.ProtoReflect.Descriptor instead.
 func (*Message8475) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{40}
 }
@@ -3551,7 +3551,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12559.ProtoReflect.Type instead.
+// Deprecated: Use Message12559.ProtoReflect.Descriptor instead.
 func (*Message12559) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{41}
 }
@@ -3587,7 +3587,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12817.ProtoReflect.Type instead.
+// Deprecated: Use Message12817.ProtoReflect.Descriptor instead.
 func (*Message12817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{42}
 }
@@ -3650,7 +3650,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16480.ProtoReflect.Type instead.
+// Deprecated: Use Message16480.ProtoReflect.Descriptor instead.
 func (*Message16480) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{43}
 }
@@ -3775,7 +3775,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24317.ProtoReflect.Type instead.
+// Deprecated: Use Message24317.ProtoReflect.Descriptor instead.
 func (*Message24317) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{44}
 }
@@ -4017,7 +4017,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message33958_Message33959.ProtoReflect.Type instead.
+// Deprecated: Use Message33958_Message33959.ProtoReflect.Descriptor instead.
 func (*Message33958_Message33959) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -4096,7 +4096,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13084.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13084.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13084) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 0}
 }
@@ -4157,7 +4157,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13085.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13085.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13085) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 1}
 }
@@ -4190,7 +4190,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13086.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13086.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13086) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 2}
 }
@@ -4223,7 +4223,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13083_Message13087.ProtoReflect.Type instead.
+// Deprecated: Use Message13083_Message13087.ProtoReflect.Descriptor instead.
 func (*Message13083_Message13087) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{12, 3}
 }
@@ -4258,7 +4258,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13088_Message13089.ProtoReflect.Type instead.
+// Deprecated: Use Message13088_Message13089.ProtoReflect.Descriptor instead.
 func (*Message13088_Message13089) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{13, 0}
 }
@@ -4307,7 +4307,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message18253_Message18254.ProtoReflect.Type instead.
+// Deprecated: Use Message18253_Message18254.ProtoReflect.Descriptor instead.
 func (*Message18253_Message18254) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{18, 0}
 }
@@ -4354,7 +4354,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816_Message16817.ProtoReflect.Type instead.
+// Deprecated: Use Message16816_Message16817.ProtoReflect.Descriptor instead.
 func (*Message16816_Message16817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20, 0}
 }
@@ -4387,7 +4387,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16816_Message16818.ProtoReflect.Type instead.
+// Deprecated: Use Message16816_Message16818.ProtoReflect.Descriptor instead.
 func (*Message16816_Message16818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_4_proto_rawDescGZIP(), []int{20, 1}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
index 484eb6e..01edb05 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_5.pb.go
@@ -46,7 +46,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24377.ProtoReflect.Type instead.
+// Deprecated: Use Message24377.ProtoReflect.Descriptor instead.
 func (*Message24377) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{0}
 }
@@ -79,7 +79,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24378.ProtoReflect.Type instead.
+// Deprecated: Use Message24378.ProtoReflect.Descriptor instead.
 func (*Message24378) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{1}
 }
@@ -117,7 +117,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24400.ProtoReflect.Type instead.
+// Deprecated: Use Message24400.ProtoReflect.Descriptor instead.
 func (*Message24400) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{2}
 }
@@ -185,7 +185,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24380.ProtoReflect.Type instead.
+// Deprecated: Use Message24380.ProtoReflect.Descriptor instead.
 func (*Message24380) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{3}
 }
@@ -218,7 +218,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24381.ProtoReflect.Type instead.
+// Deprecated: Use Message24381.ProtoReflect.Descriptor instead.
 func (*Message24381) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{4}
 }
@@ -255,7 +255,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message719.ProtoReflect.Type instead.
+// Deprecated: Use Message719.ProtoReflect.Descriptor instead.
 func (*Message719) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{5}
 }
@@ -326,7 +326,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message728.ProtoReflect.Type instead.
+// Deprecated: Use Message728.ProtoReflect.Descriptor instead.
 func (*Message728) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{6}
 }
@@ -337,7 +337,7 @@
 	{Start: 12, End: 12},
 }
 
-// Deprecated: Use Message728.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message728.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message728) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message728
 }
@@ -440,7 +440,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message704.ProtoReflect.Type instead.
+// Deprecated: Use Message704.ProtoReflect.Descriptor instead.
 func (*Message704) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{7}
 }
@@ -559,7 +559,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message697.ProtoReflect.Type instead.
+// Deprecated: Use Message697.ProtoReflect.Descriptor instead.
 func (*Message697) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{8}
 }
@@ -569,7 +569,7 @@
 	{Start: 26, End: 26},
 }
 
-// Deprecated: Use Message697.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message697.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message697) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message697
 }
@@ -855,7 +855,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor instead.
 func (*Message0) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{9}
 }
@@ -864,7 +864,7 @@
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message0) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message0
 }
@@ -899,7 +899,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6578.ProtoReflect.Type instead.
+// Deprecated: Use Message6578.ProtoReflect.Descriptor instead.
 func (*Message6578) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{10}
 }
@@ -949,7 +949,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6024.ProtoReflect.Type instead.
+// Deprecated: Use Message6024.ProtoReflect.Descriptor instead.
 func (*Message6024) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{11}
 }
@@ -1005,7 +1005,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6052.ProtoReflect.Type instead.
+// Deprecated: Use Message6052.ProtoReflect.Descriptor instead.
 func (*Message6052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{12}
 }
@@ -1054,7 +1054,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6054.ProtoReflect.Type instead.
+// Deprecated: Use Message6054.ProtoReflect.Descriptor instead.
 func (*Message6054) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{13}
 }
@@ -1104,7 +1104,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10573.ProtoReflect.Type instead.
+// Deprecated: Use Message10573.ProtoReflect.Descriptor instead.
 func (*Message10573) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{14}
 }
@@ -1113,7 +1113,7 @@
 	{Start: 10000, End: 536870911},
 }
 
-// Deprecated: Use Message10573.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message10573.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message10573) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message10573
 }
@@ -1162,7 +1162,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10824.ProtoReflect.Type instead.
+// Deprecated: Use Message10824.ProtoReflect.Descriptor instead.
 func (*Message10824) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{15}
 }
@@ -1215,7 +1215,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10582.ProtoReflect.Type instead.
+// Deprecated: Use Message10582.ProtoReflect.Descriptor instead.
 func (*Message10582) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{16}
 }
@@ -1361,7 +1361,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10155.ProtoReflect.Type instead.
+// Deprecated: Use Message10155.ProtoReflect.Descriptor instead.
 func (*Message10155) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{17}
 }
@@ -1371,7 +1371,7 @@
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message10155.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message10155.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message10155) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message10155
 }
@@ -1899,7 +1899,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11866.ProtoReflect.Type instead.
+// Deprecated: Use Message11866.ProtoReflect.Descriptor instead.
 func (*Message11866) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{18}
 }
@@ -1976,7 +1976,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10469.ProtoReflect.Type instead.
+// Deprecated: Use Message10469.ProtoReflect.Descriptor instead.
 func (*Message10469) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{19}
 }
@@ -2074,7 +2074,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10818.ProtoReflect.Type instead.
+// Deprecated: Use Message10818.ProtoReflect.Descriptor instead.
 func (*Message10818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{20}
 }
@@ -2144,7 +2144,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10773.ProtoReflect.Type instead.
+// Deprecated: Use Message10773.ProtoReflect.Descriptor instead.
 func (*Message10773) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{21}
 }
@@ -2342,7 +2342,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13145.ProtoReflect.Type instead.
+// Deprecated: Use Message13145.ProtoReflect.Descriptor instead.
 func (*Message13145) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{22}
 }
@@ -2351,7 +2351,7 @@
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message13145.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message13145.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message13145) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message13145
 }
@@ -2405,7 +2405,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message16686.ProtoReflect.Type instead.
+// Deprecated: Use Message16686.ProtoReflect.Descriptor instead.
 func (*Message16686) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{23}
 }
@@ -2440,7 +2440,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12796.ProtoReflect.Type instead.
+// Deprecated: Use Message12796.ProtoReflect.Descriptor instead.
 func (*Message12796) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{24}
 }
@@ -2487,7 +2487,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6722.ProtoReflect.Type instead.
+// Deprecated: Use Message6722.ProtoReflect.Descriptor instead.
 func (*Message6722) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{25}
 }
@@ -2520,7 +2520,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6727.ProtoReflect.Type instead.
+// Deprecated: Use Message6727.ProtoReflect.Descriptor instead.
 func (*Message6727) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{26}
 }
@@ -2553,7 +2553,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6724.ProtoReflect.Type instead.
+// Deprecated: Use Message6724.ProtoReflect.Descriptor instead.
 func (*Message6724) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{27}
 }
@@ -2586,7 +2586,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6735.ProtoReflect.Type instead.
+// Deprecated: Use Message6735.ProtoReflect.Descriptor instead.
 func (*Message6735) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{28}
 }
@@ -2621,7 +2621,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8183.ProtoReflect.Type instead.
+// Deprecated: Use Message8183.ProtoReflect.Descriptor instead.
 func (*Message8183) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{29}
 }
@@ -2680,7 +2680,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8301.ProtoReflect.Type instead.
+// Deprecated: Use Message8301.ProtoReflect.Descriptor instead.
 func (*Message8301) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{30}
 }
@@ -2689,7 +2689,7 @@
 	{Start: 64, End: 536870911},
 }
 
-// Deprecated: Use Message8301.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message8301.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message8301) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message8301
 }
@@ -2799,7 +2799,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8456.ProtoReflect.Type instead.
+// Deprecated: Use Message8456.ProtoReflect.Descriptor instead.
 func (*Message8456) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{31}
 }
@@ -2854,7 +2854,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8302.ProtoReflect.Type instead.
+// Deprecated: Use Message8302.ProtoReflect.Descriptor instead.
 func (*Message8302) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{32}
 }
@@ -2863,7 +2863,7 @@
 	{Start: 64, End: 536870911},
 }
 
-// Deprecated: Use Message8302.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message8302.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message8302) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message8302
 }
@@ -3043,7 +3043,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8457.ProtoReflect.Type instead.
+// Deprecated: Use Message8457.ProtoReflect.Descriptor instead.
 func (*Message8457) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{33}
 }
@@ -3083,7 +3083,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8449.ProtoReflect.Type instead.
+// Deprecated: Use Message8449.ProtoReflect.Descriptor instead.
 func (*Message8449) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{34}
 }
@@ -3168,7 +3168,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13358.ProtoReflect.Type instead.
+// Deprecated: Use Message13358.ProtoReflect.Descriptor instead.
 func (*Message13358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{35}
 }
@@ -3226,7 +3226,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13912.ProtoReflect.Type instead.
+// Deprecated: Use Message13912.ProtoReflect.Descriptor instead.
 func (*Message13912) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{36}
 }
@@ -3290,7 +3290,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24316.ProtoReflect.Type instead.
+// Deprecated: Use Message24316.ProtoReflect.Descriptor instead.
 func (*Message24316) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{37}
 }
@@ -3350,7 +3350,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24312.ProtoReflect.Type instead.
+// Deprecated: Use Message24312.ProtoReflect.Descriptor instead.
 func (*Message24312) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{38}
 }
@@ -3435,7 +3435,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24313.ProtoReflect.Type instead.
+// Deprecated: Use Message24313.ProtoReflect.Descriptor instead.
 func (*Message24313) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{39}
 }
@@ -3541,7 +3541,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message24315.ProtoReflect.Type instead.
+// Deprecated: Use Message24315.ProtoReflect.Descriptor instead.
 func (*Message24315) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{40}
 }
@@ -3599,7 +3599,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message716.ProtoReflect.Type instead.
+// Deprecated: Use Message716.ProtoReflect.Descriptor instead.
 func (*Message716) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{41}
 }
@@ -3663,7 +3663,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message718.ProtoReflect.Type instead.
+// Deprecated: Use Message718.ProtoReflect.Descriptor instead.
 func (*Message718) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{42}
 }
@@ -3722,7 +3722,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message703.ProtoReflect.Type instead.
+// Deprecated: Use Message703.ProtoReflect.Descriptor instead.
 func (*Message703) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{43}
 }
@@ -3803,7 +3803,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message715.ProtoReflect.Type instead.
+// Deprecated: Use Message715.ProtoReflect.Descriptor instead.
 func (*Message715) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{44}
 }
@@ -3929,7 +3929,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message700.ProtoReflect.Type instead.
+// Deprecated: Use Message700.ProtoReflect.Descriptor instead.
 func (*Message700) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{45}
 }
@@ -3978,7 +3978,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message699.ProtoReflect.Type instead.
+// Deprecated: Use Message699.ProtoReflect.Descriptor instead.
 func (*Message699) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{46}
 }
@@ -4033,7 +4033,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message698.ProtoReflect.Type instead.
+// Deprecated: Use Message698.ProtoReflect.Descriptor instead.
 func (*Message698) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{47}
 }
@@ -4126,7 +4126,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10155_Message10156.ProtoReflect.Type instead.
+// Deprecated: Use Message10155_Message10156.ProtoReflect.Descriptor instead.
 func (*Message10155_Message10156) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_5_proto_rawDescGZIP(), []int{17, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
index 7c2bd28..4f8884f 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_6.pb.go
@@ -46,7 +46,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10576.ProtoReflect.Type instead.
+// Deprecated: Use Message10576.ProtoReflect.Descriptor instead.
 func (*Message10576) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{0}
 }
@@ -81,7 +81,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10154.ProtoReflect.Type instead.
+// Deprecated: Use Message10154.ProtoReflect.Descriptor instead.
 func (*Message10154) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{1}
 }
@@ -190,7 +190,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8944.ProtoReflect.Type instead.
+// Deprecated: Use Message8944.ProtoReflect.Descriptor instead.
 func (*Message8944) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{2}
 }
@@ -684,7 +684,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9182.ProtoReflect.Type instead.
+// Deprecated: Use Message9182.ProtoReflect.Descriptor instead.
 func (*Message9182) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{3}
 }
@@ -697,7 +697,7 @@
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message9182.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message9182.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message9182) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message9182
 }
@@ -914,7 +914,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9160.ProtoReflect.Type instead.
+// Deprecated: Use Message9160.ProtoReflect.Descriptor instead.
 func (*Message9160) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{4}
 }
@@ -962,7 +962,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9242.ProtoReflect.Type instead.
+// Deprecated: Use Message9242.ProtoReflect.Descriptor instead.
 func (*Message9242) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{5}
 }
@@ -1003,7 +1003,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8890.ProtoReflect.Type instead.
+// Deprecated: Use Message8890.ProtoReflect.Descriptor instead.
 func (*Message8890) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{6}
 }
@@ -1044,7 +1044,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9123.ProtoReflect.Type instead.
+// Deprecated: Use Message9123.ProtoReflect.Descriptor instead.
 func (*Message9123) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{7}
 }
@@ -1088,7 +1088,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9628.ProtoReflect.Type instead.
+// Deprecated: Use Message9628.ProtoReflect.Descriptor instead.
 func (*Message9628) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{8}
 }
@@ -1214,7 +1214,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11014.ProtoReflect.Type instead.
+// Deprecated: Use Message11014.ProtoReflect.Descriptor instead.
 func (*Message11014) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{9}
 }
@@ -1705,7 +1705,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10801.ProtoReflect.Type instead.
+// Deprecated: Use Message10801.ProtoReflect.Descriptor instead.
 func (*Message10801) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{10}
 }
@@ -1760,7 +1760,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10749.ProtoReflect.Type instead.
+// Deprecated: Use Message10749.ProtoReflect.Descriptor instead.
 func (*Message10749) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{11}
 }
@@ -1803,7 +1803,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8298.ProtoReflect.Type instead.
+// Deprecated: Use Message8298.ProtoReflect.Descriptor instead.
 func (*Message8298) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{12}
 }
@@ -1859,7 +1859,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8300.ProtoReflect.Type instead.
+// Deprecated: Use Message8300.ProtoReflect.Descriptor instead.
 func (*Message8300) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{13}
 }
@@ -1911,7 +1911,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8291.ProtoReflect.Type instead.
+// Deprecated: Use Message8291.ProtoReflect.Descriptor instead.
 func (*Message8291) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{14}
 }
@@ -1985,7 +1985,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8296.ProtoReflect.Type instead.
+// Deprecated: Use Message8296.ProtoReflect.Descriptor instead.
 func (*Message8296) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{15}
 }
@@ -2062,7 +2062,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7965.ProtoReflect.Type instead.
+// Deprecated: Use Message7965.ProtoReflect.Descriptor instead.
 func (*Message7965) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{16}
 }
@@ -2111,7 +2111,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8290.ProtoReflect.Type instead.
+// Deprecated: Use Message8290.ProtoReflect.Descriptor instead.
 func (*Message8290) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{17}
 }
@@ -2160,7 +2160,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message717.ProtoReflect.Type instead.
+// Deprecated: Use Message717.ProtoReflect.Descriptor instead.
 func (*Message717) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{18}
 }
@@ -2209,7 +2209,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message713.ProtoReflect.Type instead.
+// Deprecated: Use Message713.ProtoReflect.Descriptor instead.
 func (*Message713) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{19}
 }
@@ -2263,7 +2263,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message705.ProtoReflect.Type instead.
+// Deprecated: Use Message705.ProtoReflect.Descriptor instead.
 func (*Message705) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{20}
 }
@@ -2350,7 +2350,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message709.ProtoReflect.Type instead.
+// Deprecated: Use Message709.ProtoReflect.Descriptor instead.
 func (*Message709) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{21}
 }
@@ -2420,7 +2420,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message702.ProtoReflect.Type instead.
+// Deprecated: Use Message702.ProtoReflect.Descriptor instead.
 func (*Message702) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{22}
 }
@@ -2472,7 +2472,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message714.ProtoReflect.Type instead.
+// Deprecated: Use Message714.ProtoReflect.Descriptor instead.
 func (*Message714) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{23}
 }
@@ -2545,7 +2545,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message710.ProtoReflect.Type instead.
+// Deprecated: Use Message710.ProtoReflect.Descriptor instead.
 func (*Message710) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{24}
 }
@@ -2617,7 +2617,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message706.ProtoReflect.Type instead.
+// Deprecated: Use Message706.ProtoReflect.Descriptor instead.
 func (*Message706) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{25}
 }
@@ -2683,7 +2683,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message707.ProtoReflect.Type instead.
+// Deprecated: Use Message707.ProtoReflect.Descriptor instead.
 func (*Message707) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{26}
 }
@@ -2755,7 +2755,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message711.ProtoReflect.Type instead.
+// Deprecated: Use Message711.ProtoReflect.Descriptor instead.
 func (*Message711) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{27}
 }
@@ -2825,7 +2825,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message712.ProtoReflect.Type instead.
+// Deprecated: Use Message712.ProtoReflect.Descriptor instead.
 func (*Message712) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{28}
 }
@@ -2943,7 +2943,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939.ProtoReflect.Type instead.
+// Deprecated: Use Message8939.ProtoReflect.Descriptor instead.
 func (*Message8939) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29}
 }
@@ -3131,7 +3131,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9181.ProtoReflect.Type instead.
+// Deprecated: Use Message9181.ProtoReflect.Descriptor instead.
 func (*Message9181) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{30}
 }
@@ -3174,7 +3174,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9164.ProtoReflect.Type instead.
+// Deprecated: Use Message9164.ProtoReflect.Descriptor instead.
 func (*Message9164) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{31}
 }
@@ -3230,7 +3230,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9165.ProtoReflect.Type instead.
+// Deprecated: Use Message9165.ProtoReflect.Descriptor instead.
 func (*Message9165) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{32}
 }
@@ -3279,7 +3279,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9166.ProtoReflect.Type instead.
+// Deprecated: Use Message9166.ProtoReflect.Descriptor instead.
 func (*Message9166) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{33}
 }
@@ -3334,7 +3334,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9151.ProtoReflect.Type instead.
+// Deprecated: Use Message9151.ProtoReflect.Descriptor instead.
 func (*Message9151) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{34}
 }
@@ -3427,7 +3427,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8888.ProtoReflect.Type instead.
+// Deprecated: Use Message8888.ProtoReflect.Descriptor instead.
 func (*Message8888) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{35}
 }
@@ -3493,7 +3493,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message9627.ProtoReflect.Type instead.
+// Deprecated: Use Message9627.ProtoReflect.Descriptor instead.
 func (*Message9627) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{36}
 }
@@ -3561,7 +3561,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11020.ProtoReflect.Type instead.
+// Deprecated: Use Message11020.ProtoReflect.Descriptor instead.
 func (*Message11020) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{37}
 }
@@ -3617,7 +3617,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11013.ProtoReflect.Type instead.
+// Deprecated: Use Message11013.ProtoReflect.Descriptor instead.
 func (*Message11013) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{38}
 }
@@ -3811,7 +3811,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8940.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8940.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8940) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 0}
 }
@@ -3850,7 +3850,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8941.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8941.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8941) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 1}
 }
@@ -3931,7 +3931,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8939_Message8943.ProtoReflect.Type instead.
+// Deprecated: Use Message8939_Message8943.ProtoReflect.Descriptor instead.
 func (*Message8939_Message8943) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_6_proto_rawDescGZIP(), []int{29, 2}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
index f2c7189..ed50f1b 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_7.pb.go
@@ -45,7 +45,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11018.ProtoReflect.Type instead.
+// Deprecated: Use Message11018.ProtoReflect.Descriptor instead.
 func (*Message11018) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{0}
 }
@@ -82,7 +82,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10800.ProtoReflect.Type instead.
+// Deprecated: Use Message10800.ProtoReflect.Descriptor instead.
 func (*Message10800) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{1}
 }
@@ -143,7 +143,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10802.ProtoReflect.Type instead.
+// Deprecated: Use Message10802.ProtoReflect.Descriptor instead.
 func (*Message10802) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{2}
 }
@@ -180,7 +180,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10748.ProtoReflect.Type instead.
+// Deprecated: Use Message10748.ProtoReflect.Descriptor instead.
 func (*Message10748) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{3}
 }
@@ -243,7 +243,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7966.ProtoReflect.Type instead.
+// Deprecated: Use Message7966.ProtoReflect.Descriptor instead.
 func (*Message7966) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{4}
 }
@@ -296,7 +296,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message708.ProtoReflect.Type instead.
+// Deprecated: Use Message708.ProtoReflect.Descriptor instead.
 func (*Message708) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{5}
 }
@@ -371,7 +371,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8942.ProtoReflect.Type instead.
+// Deprecated: Use Message8942.ProtoReflect.Descriptor instead.
 func (*Message8942) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{6}
 }
@@ -406,7 +406,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11011.ProtoReflect.Type instead.
+// Deprecated: Use Message11011.ProtoReflect.Descriptor instead.
 func (*Message11011) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{7}
 }
@@ -453,7 +453,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Type instead.
+// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Descriptor instead.
 func (*UnusedEmptyMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{8}
 }
@@ -487,7 +487,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message741.ProtoReflect.Type instead.
+// Deprecated: Use Message741.ProtoReflect.Descriptor instead.
 func (*Message741) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_7_proto_rawDescGZIP(), []int{9}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go
index 2205d99..a7a2762 100644
--- a/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message3/benchmark_message3_8.pb.go
@@ -67,7 +67,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum720.Type instead.
+// Deprecated: Use Enum720.Descriptor instead.
 func (Enum720) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{0}
 }
@@ -667,7 +667,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3476.Type instead.
+// Deprecated: Use Enum3476.Descriptor instead.
 func (Enum3476) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{1}
 }
@@ -751,7 +751,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3805.Type instead.
+// Deprecated: Use Enum3805.Descriptor instead.
 func (Enum3805) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{2}
 }
@@ -859,7 +859,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3783.Type instead.
+// Deprecated: Use Enum3783.Descriptor instead.
 func (Enum3783) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{3}
 }
@@ -961,7 +961,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3851.Type instead.
+// Deprecated: Use Enum3851.Descriptor instead.
 func (Enum3851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{4}
 }
@@ -1015,7 +1015,7 @@
 	return nil
 }
 
-// Deprecated: Use UnusedEnum.Type instead.
+// Deprecated: Use UnusedEnum.Descriptor instead.
 func (UnusedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{5}
 }
@@ -1078,7 +1078,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum4146.Type instead.
+// Deprecated: Use Enum4146.Descriptor instead.
 func (Enum4146) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{6}
 }
@@ -1132,7 +1132,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum4160.Type instead.
+// Deprecated: Use Enum4160.Descriptor instead.
 func (Enum4160) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{7}
 }
@@ -1201,7 +1201,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum4152.Type instead.
+// Deprecated: Use Enum4152.Descriptor instead.
 func (Enum4152) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{8}
 }
@@ -1315,7 +1315,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6025.Type instead.
+// Deprecated: Use Enum6025.Descriptor instead.
 func (Enum6025) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{9}
 }
@@ -1408,7 +1408,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6065.Type instead.
+// Deprecated: Use Enum6065.Descriptor instead.
 func (Enum6065) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{10}
 }
@@ -1480,7 +1480,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6579.Type instead.
+// Deprecated: Use Enum6579.Descriptor instead.
 func (Enum6579) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{11}
 }
@@ -1630,7 +1630,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6588.Type instead.
+// Deprecated: Use Enum6588.Descriptor instead.
 func (Enum6588) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{12}
 }
@@ -1687,7 +1687,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6769.Type instead.
+// Deprecated: Use Enum6769.Descriptor instead.
 func (Enum6769) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{13}
 }
@@ -1756,7 +1756,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6774.Type instead.
+// Deprecated: Use Enum6774.Descriptor instead.
 func (Enum6774) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{14}
 }
@@ -1822,7 +1822,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6782.Type instead.
+// Deprecated: Use Enum6782.Descriptor instead.
 func (Enum6782) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{15}
 }
@@ -1882,7 +1882,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6858.Type instead.
+// Deprecated: Use Enum6858.Descriptor instead.
 func (Enum6858) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{16}
 }
@@ -1948,7 +1948,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6815.Type instead.
+// Deprecated: Use Enum6815.Descriptor instead.
 func (Enum6815) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{17}
 }
@@ -2008,7 +2008,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6822.Type instead.
+// Deprecated: Use Enum6822.Descriptor instead.
 func (Enum6822) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{18}
 }
@@ -2065,7 +2065,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum7654.Type instead.
+// Deprecated: Use Enum7654.Descriptor instead.
 func (Enum7654) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{19}
 }
@@ -2122,7 +2122,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8292.Type instead.
+// Deprecated: Use Enum8292.Descriptor instead.
 func (Enum8292) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{20}
 }
@@ -2179,7 +2179,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8450.Type instead.
+// Deprecated: Use Enum8450.Descriptor instead.
 func (Enum8450) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{21}
 }
@@ -2242,7 +2242,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8900.Type instead.
+// Deprecated: Use Enum8900.Descriptor instead.
 func (Enum8900) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{22}
 }
@@ -2305,7 +2305,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8945.Type instead.
+// Deprecated: Use Enum8945.Descriptor instead.
 func (Enum8945) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{23}
 }
@@ -2377,7 +2377,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8951.Type instead.
+// Deprecated: Use Enum8951.Descriptor instead.
 func (Enum8951) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{24}
 }
@@ -2674,7 +2674,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum9243.Type instead.
+// Deprecated: Use Enum9243.Descriptor instead.
 func (Enum9243) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{25}
 }
@@ -2749,7 +2749,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10157.Type instead.
+// Deprecated: Use Enum10157.Descriptor instead.
 func (Enum10157) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{26}
 }
@@ -2824,7 +2824,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10167.Type instead.
+// Deprecated: Use Enum10167.Descriptor instead.
 func (Enum10167) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{27}
 }
@@ -2920,7 +2920,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum8862.Type instead.
+// Deprecated: Use Enum8862.Descriptor instead.
 func (Enum8862) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{28}
 }
@@ -2995,7 +2995,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10325.Type instead.
+// Deprecated: Use Enum10325.Descriptor instead.
 func (Enum10325) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{29}
 }
@@ -3046,7 +3046,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10335.Type instead.
+// Deprecated: Use Enum10335.Descriptor instead.
 func (Enum10335) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{30}
 }
@@ -3100,7 +3100,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10337.Type instead.
+// Deprecated: Use Enum10337.Descriptor instead.
 func (Enum10337) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{31}
 }
@@ -3202,7 +3202,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10392.Type instead.
+// Deprecated: Use Enum10392.Descriptor instead.
 func (Enum10392) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{32}
 }
@@ -4330,7 +4330,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum11107.Type instead.
+// Deprecated: Use Enum11107.Descriptor instead.
 func (Enum11107) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{33}
 }
@@ -4951,7 +4951,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum11541.Type instead.
+// Deprecated: Use Enum11541.Descriptor instead.
 func (Enum11541) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{34}
 }
@@ -5071,7 +5071,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum11468.Type instead.
+// Deprecated: Use Enum11468.Descriptor instead.
 func (Enum11468) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{35}
 }
@@ -5371,7 +5371,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum11022.Type instead.
+// Deprecated: Use Enum11022.Descriptor instead.
 func (Enum11022) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{36}
 }
@@ -5428,7 +5428,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum12670.Type instead.
+// Deprecated: Use Enum12670.Descriptor instead.
 func (Enum12670) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{37}
 }
@@ -5494,7 +5494,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum12871.Type instead.
+// Deprecated: Use Enum12871.Descriptor instead.
 func (Enum12871) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{38}
 }
@@ -5551,7 +5551,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum13092.Type instead.
+// Deprecated: Use Enum13092.Descriptor instead.
 func (Enum13092) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{39}
 }
@@ -5611,7 +5611,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum13146.Type instead.
+// Deprecated: Use Enum13146.Descriptor instead.
 func (Enum13146) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{40}
 }
@@ -6745,7 +6745,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16042.Type instead.
+// Deprecated: Use Enum16042.Descriptor instead.
 func (Enum16042) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{41}
 }
@@ -6823,7 +6823,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16553.Type instead.
+// Deprecated: Use Enum16553.Descriptor instead.
 func (Enum16553) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{42}
 }
@@ -6880,7 +6880,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16728.Type instead.
+// Deprecated: Use Enum16728.Descriptor instead.
 func (Enum16728) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{43}
 }
@@ -6943,7 +6943,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16732.Type instead.
+// Deprecated: Use Enum16732.Descriptor instead.
 func (Enum16732) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{44}
 }
@@ -7012,7 +7012,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16738.Type instead.
+// Deprecated: Use Enum16738.Descriptor instead.
 func (Enum16738) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{45}
 }
@@ -7129,7 +7129,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16698.Type instead.
+// Deprecated: Use Enum16698.Descriptor instead.
 func (Enum16698) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{46}
 }
@@ -7195,7 +7195,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16819.Type instead.
+// Deprecated: Use Enum16819.Descriptor instead.
 func (Enum16819) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{47}
 }
@@ -7285,7 +7285,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16925.Type instead.
+// Deprecated: Use Enum16925.Descriptor instead.
 func (Enum16925) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{48}
 }
@@ -7339,7 +7339,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum22854.Type instead.
+// Deprecated: Use Enum22854.Descriptor instead.
 func (Enum22854) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{49}
 }
@@ -7399,7 +7399,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum24361.Type instead.
+// Deprecated: Use Enum24361.Descriptor instead.
 func (Enum24361) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{50}
 }
@@ -7543,7 +7543,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum16891.Type instead.
+// Deprecated: Use Enum16891.Descriptor instead.
 func (Enum16891) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{51}
 }
@@ -7606,7 +7606,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum27361.Type instead.
+// Deprecated: Use Enum27361.Descriptor instead.
 func (Enum27361) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{52}
 }
@@ -7675,7 +7675,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum33960.Type instead.
+// Deprecated: Use Enum33960.Descriptor instead.
 func (Enum33960) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{53}
 }
@@ -7726,7 +7726,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum34388.Type instead.
+// Deprecated: Use Enum34388.Descriptor instead.
 func (Enum34388) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{54}
 }
@@ -7789,7 +7789,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum35477.Type instead.
+// Deprecated: Use Enum35477.Descriptor instead.
 func (Enum35477) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{55}
 }
@@ -7867,7 +7867,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum35507.Type instead.
+// Deprecated: Use Enum35507.Descriptor instead.
 func (Enum35507) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{56}
 }
@@ -7939,7 +7939,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum36860.Type instead.
+// Deprecated: Use Enum36860.Descriptor instead.
 func (Enum36860) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{57}
 }
@@ -7993,7 +7993,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum36890.Type instead.
+// Deprecated: Use Enum36890.Descriptor instead.
 func (Enum36890) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message3_benchmark_message3_8_proto_rawDescGZIP(), []int{58}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
index a1d6e83..b6e3611 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4.pb.go
@@ -62,7 +62,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use GoogleMessage4.ProtoReflect.Type instead.
+// Deprecated: Use GoogleMessage4.ProtoReflect.Descriptor instead.
 func (*GoogleMessage4) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{0}
 }
@@ -228,7 +228,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37489.ProtoReflect.Type instead.
+// Deprecated: Use Message37489.ProtoReflect.Descriptor instead.
 func (*Message37489) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{1}
 }
@@ -410,7 +410,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7319.ProtoReflect.Type instead.
+// Deprecated: Use Message7319.ProtoReflect.Descriptor instead.
 func (*Message7319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{2}
 }
@@ -466,7 +466,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12717.ProtoReflect.Type instead.
+// Deprecated: Use Message12717.ProtoReflect.Descriptor instead.
 func (*Message12717) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{3}
 }
@@ -566,7 +566,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37331.ProtoReflect.Type instead.
+// Deprecated: Use Message37331.ProtoReflect.Descriptor instead.
 func (*Message37331) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{4}
 }
@@ -630,7 +630,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8815.ProtoReflect.Type instead.
+// Deprecated: Use Message8815.ProtoReflect.Descriptor instead.
 func (*Message8815) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{5}
 }
@@ -690,7 +690,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7330.ProtoReflect.Type instead.
+// Deprecated: Use Message7330.ProtoReflect.Descriptor instead.
 func (*Message7330) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{6}
 }
@@ -767,7 +767,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12960.ProtoReflect.Type instead.
+// Deprecated: Use Message12960.ProtoReflect.Descriptor instead.
 func (*Message12960) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{7}
 }
@@ -873,7 +873,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message176.ProtoReflect.Type instead.
+// Deprecated: Use Message176.ProtoReflect.Descriptor instead.
 func (*Message176) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{8}
 }
@@ -1322,7 +1322,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8817.ProtoReflect.Type instead.
+// Deprecated: Use Message8817.ProtoReflect.Descriptor instead.
 func (*Message8817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{9}
 }
@@ -1379,7 +1379,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8835.ProtoReflect.Type instead.
+// Deprecated: Use Message8835.ProtoReflect.Descriptor instead.
 func (*Message8835) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{10}
 }
@@ -1436,7 +1436,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37333.ProtoReflect.Type instead.
+// Deprecated: Use Message37333.ProtoReflect.Descriptor instead.
 func (*Message37333) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{11}
 }
@@ -1492,7 +1492,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13000.ProtoReflect.Type instead.
+// Deprecated: Use Message13000.ProtoReflect.Descriptor instead.
 func (*Message13000) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{12}
 }
@@ -1543,7 +1543,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37335.ProtoReflect.Type instead.
+// Deprecated: Use Message37335.ProtoReflect.Descriptor instead.
 func (*Message37335) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{13}
 }
@@ -1607,7 +1607,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8848.ProtoReflect.Type instead.
+// Deprecated: Use Message8848.ProtoReflect.Descriptor instead.
 func (*Message8848) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{14}
 }
@@ -1663,7 +1663,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message13035.ProtoReflect.Type instead.
+// Deprecated: Use Message13035.ProtoReflect.Descriptor instead.
 func (*Message13035) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{15}
 }
@@ -1712,7 +1712,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8856.ProtoReflect.Type instead.
+// Deprecated: Use Message8856.ProtoReflect.Descriptor instead.
 func (*Message8856) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{16}
 }
@@ -1765,7 +1765,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12908.ProtoReflect.Type instead.
+// Deprecated: Use Message12908.ProtoReflect.Descriptor instead.
 func (*Message12908) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{17}
 }
@@ -1843,7 +1843,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12910.ProtoReflect.Type instead.
+// Deprecated: Use Message12910.ProtoReflect.Descriptor instead.
 func (*Message12910) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{18}
 }
@@ -1908,7 +1908,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37327.ProtoReflect.Type instead.
+// Deprecated: Use Message37327.ProtoReflect.Descriptor instead.
 func (*Message37327) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{19}
 }
@@ -2023,7 +2023,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37329.ProtoReflect.Type instead.
+// Deprecated: Use Message37329.ProtoReflect.Descriptor instead.
 func (*Message37329) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{20}
 }
@@ -2096,7 +2096,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2517.ProtoReflect.Type instead.
+// Deprecated: Use Message2517.ProtoReflect.Descriptor instead.
 func (*Message2517) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{21}
 }
@@ -2168,7 +2168,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12748.ProtoReflect.Type instead.
+// Deprecated: Use Message12748.ProtoReflect.Descriptor instead.
 func (*Message12748) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{22}
 }
@@ -2230,7 +2230,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12687.ProtoReflect.Type instead.
+// Deprecated: Use Message12687.ProtoReflect.Descriptor instead.
 func (*Message12687) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{23}
 }
@@ -2273,7 +2273,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11948.ProtoReflect.Type instead.
+// Deprecated: Use Message11948.ProtoReflect.Descriptor instead.
 func (*Message11948) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{24}
 }
@@ -2328,7 +2328,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11976.ProtoReflect.Type instead.
+// Deprecated: Use Message11976.ProtoReflect.Descriptor instead.
 func (*Message11976) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{25}
 }
@@ -2370,7 +2370,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7320.ProtoReflect.Type instead.
+// Deprecated: Use Message7320.ProtoReflect.Descriptor instead.
 func (*Message7320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{26}
 }
@@ -2421,7 +2421,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3069.ProtoReflect.Type instead.
+// Deprecated: Use Message3069.ProtoReflect.Descriptor instead.
 func (*Message3069) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{27}
 }
@@ -2430,7 +2430,7 @@
 	{Start: 10000, End: 536870911},
 }
 
-// Deprecated: Use Message3069.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message3069.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message3069) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message3069
 }
@@ -2485,7 +2485,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12948.ProtoReflect.Type instead.
+// Deprecated: Use Message12948.ProtoReflect.Descriptor instead.
 func (*Message12948) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{28}
 }
@@ -2532,7 +2532,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8768.ProtoReflect.Type instead.
+// Deprecated: Use Message8768.ProtoReflect.Descriptor instead.
 func (*Message8768) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{29}
 }
@@ -2621,7 +2621,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12979.ProtoReflect.Type instead.
+// Deprecated: Use Message12979.ProtoReflect.Descriptor instead.
 func (*Message12979) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{30}
 }
@@ -2728,7 +2728,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37173.ProtoReflect.Type instead.
+// Deprecated: Use Message37173.ProtoReflect.Descriptor instead.
 func (*Message37173) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{31}
 }
@@ -2944,7 +2944,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12799.ProtoReflect.Type instead.
+// Deprecated: Use Message12799.ProtoReflect.Descriptor instead.
 func (*Message12799) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{32}
 }
@@ -3053,7 +3053,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12870.ProtoReflect.Type instead.
+// Deprecated: Use Message12870.ProtoReflect.Descriptor instead.
 func (*Message12870) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{33}
 }
@@ -3233,7 +3233,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3804.ProtoReflect.Type instead.
+// Deprecated: Use Message3804.ProtoReflect.Descriptor instead.
 func (*Message3804) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{34}
 }
@@ -3318,7 +3318,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12903.ProtoReflect.Type instead.
+// Deprecated: Use Message12903.ProtoReflect.Descriptor instead.
 func (*Message12903) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{35}
 }
@@ -3374,7 +3374,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message37326.ProtoReflect.Type instead.
+// Deprecated: Use Message37326.ProtoReflect.Descriptor instead.
 func (*Message37326) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{36}
 }
@@ -3452,7 +3452,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356.ProtoReflect.Type instead.
+// Deprecated: Use Message2356.ProtoReflect.Descriptor instead.
 func (*Message2356) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37}
 }
@@ -3703,7 +3703,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor instead.
 func (*Message0) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{38}
 }
@@ -3712,7 +3712,7 @@
 	{Start: 4, End: 2147483646},
 }
 
-// Deprecated: Use Message0.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message0.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message0) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message0
 }
@@ -3748,7 +3748,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message971.ProtoReflect.Type instead.
+// Deprecated: Use Message971.ProtoReflect.Descriptor instead.
 func (*Message971) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{39}
 }
@@ -3802,7 +3802,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message176_Message178.ProtoReflect.Type instead.
+// Deprecated: Use Message176_Message178.ProtoReflect.Descriptor instead.
 func (*Message176_Message178) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{8, 0}
 }
@@ -3837,7 +3837,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3069_Message3070.ProtoReflect.Type instead.
+// Deprecated: Use Message3069_Message3070.ProtoReflect.Descriptor instead.
 func (*Message3069_Message3070) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{27, 0}
 }
@@ -3896,7 +3896,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2357.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2357.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2357) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 0}
 }
@@ -4013,7 +4013,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2358.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2358.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2358) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 1}
 }
@@ -4046,7 +4046,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2356_Message2359.ProtoReflect.Type instead.
+// Deprecated: Use Message2356_Message2359.ProtoReflect.Descriptor instead.
 func (*Message2356_Message2359) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_proto_rawDescGZIP(), []int{37, 2}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
index a0395e9..c9f97b3 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_1.pb.go
@@ -47,7 +47,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2463.ProtoReflect.Type instead.
+// Deprecated: Use Message2463.ProtoReflect.Descriptor instead.
 func (*Message2463) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{0}
 }
@@ -89,7 +89,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12686.ProtoReflect.Type instead.
+// Deprecated: Use Message12686.ProtoReflect.Descriptor instead.
 func (*Message12686) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{1}
 }
@@ -136,7 +136,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11949.ProtoReflect.Type instead.
+// Deprecated: Use Message11949.ProtoReflect.Descriptor instead.
 func (*Message11949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{2}
 }
@@ -179,7 +179,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11975.ProtoReflect.Type instead.
+// Deprecated: Use Message11975.ProtoReflect.Descriptor instead.
 func (*Message11975) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{3}
 }
@@ -290,7 +290,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7287.ProtoReflect.Type instead.
+// Deprecated: Use Message7287.ProtoReflect.Descriptor instead.
 func (*Message7287) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{4}
 }
@@ -427,7 +427,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061.ProtoReflect.Type instead.
+// Deprecated: Use Message3061.ProtoReflect.Descriptor instead.
 func (*Message3061) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5}
 }
@@ -796,7 +796,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12949.ProtoReflect.Type instead.
+// Deprecated: Use Message12949.ProtoReflect.Descriptor instead.
 func (*Message12949) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{6}
 }
@@ -879,7 +879,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8572.ProtoReflect.Type instead.
+// Deprecated: Use Message8572.ProtoReflect.Descriptor instead.
 func (*Message8572) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{7}
 }
@@ -1267,7 +1267,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8774.ProtoReflect.Type instead.
+// Deprecated: Use Message8774.ProtoReflect.Descriptor instead.
 func (*Message8774) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{8}
 }
@@ -1346,7 +1346,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12776.ProtoReflect.Type instead.
+// Deprecated: Use Message12776.ProtoReflect.Descriptor instead.
 func (*Message12776) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{9}
 }
@@ -1360,7 +1360,7 @@
 	{Start: 9, End: 9},
 }
 
-// Deprecated: Use Message12776.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message12776.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message12776) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message12776
 }
@@ -1467,7 +1467,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12798.ProtoReflect.Type instead.
+// Deprecated: Use Message12798.ProtoReflect.Descriptor instead.
 func (*Message12798) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{10}
 }
@@ -1531,7 +1531,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12797.ProtoReflect.Type instead.
+// Deprecated: Use Message12797.ProtoReflect.Descriptor instead.
 func (*Message12797) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{11}
 }
@@ -1592,7 +1592,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12825.ProtoReflect.Type instead.
+// Deprecated: Use Message12825.ProtoReflect.Descriptor instead.
 func (*Message12825) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{12}
 }
@@ -1674,7 +1674,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8590.ProtoReflect.Type instead.
+// Deprecated: Use Message8590.ProtoReflect.Descriptor instead.
 func (*Message8590) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{13}
 }
@@ -1707,7 +1707,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8587.ProtoReflect.Type instead.
+// Deprecated: Use Message8587.ProtoReflect.Descriptor instead.
 func (*Message8587) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{14}
 }
@@ -1742,7 +1742,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message1374.ProtoReflect.Type instead.
+// Deprecated: Use Message1374.ProtoReflect.Descriptor instead.
 func (*Message1374) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{15}
 }
@@ -1791,7 +1791,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message2462.ProtoReflect.Type instead.
+// Deprecated: Use Message2462.ProtoReflect.Descriptor instead.
 func (*Message2462) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{16}
 }
@@ -1845,7 +1845,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12685.ProtoReflect.Type instead.
+// Deprecated: Use Message12685.ProtoReflect.Descriptor instead.
 func (*Message12685) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{17}
 }
@@ -1934,7 +1934,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10320.ProtoReflect.Type instead.
+// Deprecated: Use Message10320.ProtoReflect.Descriptor instead.
 func (*Message10320) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{18}
 }
@@ -2019,7 +2019,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11947.ProtoReflect.Type instead.
+// Deprecated: Use Message11947.ProtoReflect.Descriptor instead.
 func (*Message11947) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{19}
 }
@@ -2075,7 +2075,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message11920.ProtoReflect.Type instead.
+// Deprecated: Use Message11920.ProtoReflect.Descriptor instead.
 func (*Message11920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{20}
 }
@@ -2140,7 +2140,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6643.ProtoReflect.Type instead.
+// Deprecated: Use Message6643.ProtoReflect.Descriptor instead.
 func (*Message6643) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{21}
 }
@@ -2319,7 +2319,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6133.ProtoReflect.Type instead.
+// Deprecated: Use Message6133.ProtoReflect.Descriptor instead.
 func (*Message6133) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{22}
 }
@@ -2505,7 +2505,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6109.ProtoReflect.Type instead.
+// Deprecated: Use Message6109.ProtoReflect.Descriptor instead.
 func (*Message6109) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{23}
 }
@@ -2514,7 +2514,7 @@
 	{Start: 1000, End: 536870911},
 }
 
-// Deprecated: Use Message6109.ProtoReflect.Type.ExtensionRanges instead.
+// Deprecated: Use Message6109.ProtoReflect.Descriptor.ExtensionRanges instead.
 func (*Message6109) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
 	return extRange_Message6109
 }
@@ -2633,7 +2633,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3046.ProtoReflect.Type instead.
+// Deprecated: Use Message3046.ProtoReflect.Descriptor instead.
 func (*Message3046) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{24}
 }
@@ -2683,7 +2683,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3060.ProtoReflect.Type instead.
+// Deprecated: Use Message3060.ProtoReflect.Descriptor instead.
 func (*Message3060) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{25}
 }
@@ -2739,7 +2739,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3041.ProtoReflect.Type instead.
+// Deprecated: Use Message3041.ProtoReflect.Descriptor instead.
 func (*Message3041) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{26}
 }
@@ -2791,7 +2791,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3040.ProtoReflect.Type instead.
+// Deprecated: Use Message3040.ProtoReflect.Descriptor instead.
 func (*Message3040) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{27}
 }
@@ -2865,7 +2865,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3050.ProtoReflect.Type instead.
+// Deprecated: Use Message3050.ProtoReflect.Descriptor instead.
 func (*Message3050) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{28}
 }
@@ -2947,7 +2947,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7905.ProtoReflect.Type instead.
+// Deprecated: Use Message7905.ProtoReflect.Descriptor instead.
 func (*Message7905) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{29}
 }
@@ -3030,7 +3030,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886.ProtoReflect.Type instead.
+// Deprecated: Use Message3886.ProtoReflect.Descriptor instead.
 func (*Message3886) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{30}
 }
@@ -3076,7 +3076,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7864.ProtoReflect.Type instead.
+// Deprecated: Use Message7864.ProtoReflect.Descriptor instead.
 func (*Message7864) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{31}
 }
@@ -3152,7 +3152,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3922.ProtoReflect.Type instead.
+// Deprecated: Use Message3922.ProtoReflect.Descriptor instead.
 func (*Message3922) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{32}
 }
@@ -3201,7 +3201,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3052.ProtoReflect.Type instead.
+// Deprecated: Use Message3052.ProtoReflect.Descriptor instead.
 func (*Message3052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{33}
 }
@@ -3297,7 +3297,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message8575.ProtoReflect.Type instead.
+// Deprecated: Use Message8575.ProtoReflect.Descriptor instead.
 func (*Message8575) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{34}
 }
@@ -3346,7 +3346,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7843.ProtoReflect.Type instead.
+// Deprecated: Use Message7843.ProtoReflect.Descriptor instead.
 func (*Message7843) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{35}
 }
@@ -3492,7 +3492,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3919.ProtoReflect.Type instead.
+// Deprecated: Use Message3919.ProtoReflect.Descriptor instead.
 func (*Message3919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{36}
 }
@@ -3552,7 +3552,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7929.ProtoReflect.Type instead.
+// Deprecated: Use Message7929.ProtoReflect.Descriptor instead.
 func (*Message7929) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{37}
 }
@@ -3728,7 +3728,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3062.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3062.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3062) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 0}
 }
@@ -3786,7 +3786,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3063.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3063.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3063) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 1}
 }
@@ -3866,7 +3866,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3064.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3064.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3064) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 2}
 }
@@ -4032,7 +4032,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3065.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3065.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3065) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 3}
 }
@@ -4073,7 +4073,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3061_Message3066.ProtoReflect.Type instead.
+// Deprecated: Use Message3061_Message3066.ProtoReflect.Descriptor instead.
 func (*Message3061_Message3066) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{5, 4}
 }
@@ -4166,7 +4166,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3886_Message3887.ProtoReflect.Type instead.
+// Deprecated: Use Message3886_Message3887.ProtoReflect.Descriptor instead.
 func (*Message3886_Message3887) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_1_proto_rawDescGZIP(), []int{30, 0}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
index 18995dc..0060d2e 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_2.pb.go
@@ -51,7 +51,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12774.ProtoReflect.Type instead.
+// Deprecated: Use Message12774.ProtoReflect.Descriptor instead.
 func (*Message12774) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{0}
 }
@@ -128,7 +128,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12796.ProtoReflect.Type instead.
+// Deprecated: Use Message12796.ProtoReflect.Descriptor instead.
 func (*Message12796) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{1}
 }
@@ -180,7 +180,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12821.ProtoReflect.Type instead.
+// Deprecated: Use Message12821.ProtoReflect.Descriptor instead.
 func (*Message12821) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{2}
 }
@@ -256,7 +256,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12820.ProtoReflect.Type instead.
+// Deprecated: Use Message12820.ProtoReflect.Descriptor instead.
 func (*Message12820) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{3}
 }
@@ -351,7 +351,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12819.ProtoReflect.Type instead.
+// Deprecated: Use Message12819.ProtoReflect.Descriptor instead.
 func (*Message12819) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{4}
 }
@@ -431,7 +431,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12818.ProtoReflect.Type instead.
+// Deprecated: Use Message12818.ProtoReflect.Descriptor instead.
 func (*Message12818) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{5}
 }
@@ -506,7 +506,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message10319.ProtoReflect.Type instead.
+// Deprecated: Use Message10319.ProtoReflect.Descriptor instead.
 func (*Message10319) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{6}
 }
@@ -590,7 +590,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6578.ProtoReflect.Type instead.
+// Deprecated: Use Message6578.ProtoReflect.Descriptor instead.
 func (*Message6578) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{7}
 }
@@ -656,7 +656,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6126.ProtoReflect.Type instead.
+// Deprecated: Use Message6126.ProtoReflect.Descriptor instead.
 func (*Message6126) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{8}
 }
@@ -828,7 +828,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5881.ProtoReflect.Type instead.
+// Deprecated: Use Message5881.ProtoReflect.Descriptor instead.
 func (*Message5881) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{9}
 }
@@ -903,7 +903,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6110.ProtoReflect.Type instead.
+// Deprecated: Use Message6110.ProtoReflect.Descriptor instead.
 func (*Message6110) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{10}
 }
@@ -942,7 +942,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6107.ProtoReflect.Type instead.
+// Deprecated: Use Message6107.ProtoReflect.Descriptor instead.
 func (*Message6107) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{11}
 }
@@ -1019,7 +1019,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6129.ProtoReflect.Type instead.
+// Deprecated: Use Message6129.ProtoReflect.Descriptor instead.
 func (*Message6129) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{12}
 }
@@ -1116,7 +1116,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5908.ProtoReflect.Type instead.
+// Deprecated: Use Message5908.ProtoReflect.Descriptor instead.
 func (*Message5908) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{13}
 }
@@ -1505,7 +1505,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3850.ProtoReflect.Type instead.
+// Deprecated: Use Message3850.ProtoReflect.Descriptor instead.
 func (*Message3850) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{14}
 }
@@ -1580,7 +1580,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7865.ProtoReflect.Type instead.
+// Deprecated: Use Message7865.ProtoReflect.Descriptor instead.
 func (*Message7865) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{15}
 }
@@ -1620,7 +1620,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7511.ProtoReflect.Type instead.
+// Deprecated: Use Message7511.ProtoReflect.Descriptor instead.
 func (*Message7511) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{16}
 }
@@ -1702,7 +1702,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message3920.ProtoReflect.Type instead.
+// Deprecated: Use Message3920.ProtoReflect.Descriptor instead.
 func (*Message3920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{17}
 }
@@ -1737,7 +1737,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7928.ProtoReflect.Type instead.
+// Deprecated: Use Message7928.ProtoReflect.Descriptor instead.
 func (*Message7928) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{18}
 }
@@ -1788,7 +1788,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7921.ProtoReflect.Type instead.
+// Deprecated: Use Message7921.ProtoReflect.Descriptor instead.
 func (*Message7921) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{19}
 }
@@ -1851,7 +1851,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7920.ProtoReflect.Type instead.
+// Deprecated: Use Message7920.ProtoReflect.Descriptor instead.
 func (*Message7920) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{20}
 }
@@ -1901,7 +1901,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message7919.ProtoReflect.Type instead.
+// Deprecated: Use Message7919.ProtoReflect.Descriptor instead.
 func (*Message7919) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{21}
 }
@@ -1958,7 +1958,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message12817.ProtoReflect.Type instead.
+// Deprecated: Use Message12817.ProtoReflect.Descriptor instead.
 func (*Message12817) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{22}
 }
@@ -2014,7 +2014,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6054.ProtoReflect.Type instead.
+// Deprecated: Use Message6054.ProtoReflect.Descriptor instead.
 func (*Message6054) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{23}
 }
@@ -2061,7 +2061,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6127.ProtoReflect.Type instead.
+// Deprecated: Use Message6127.ProtoReflect.Descriptor instead.
 func (*Message6127) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{24}
 }
@@ -2096,7 +2096,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6052.ProtoReflect.Type instead.
+// Deprecated: Use Message6052.ProtoReflect.Descriptor instead.
 func (*Message6052) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{25}
 }
@@ -2146,7 +2146,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6024.ProtoReflect.Type instead.
+// Deprecated: Use Message6024.ProtoReflect.Descriptor instead.
 func (*Message6024) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{26}
 }
@@ -2204,7 +2204,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5861.ProtoReflect.Type instead.
+// Deprecated: Use Message5861.ProtoReflect.Descriptor instead.
 func (*Message5861) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{27}
 }
@@ -2266,7 +2266,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5880.ProtoReflect.Type instead.
+// Deprecated: Use Message5880.ProtoReflect.Descriptor instead.
 func (*Message5880) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{28}
 }
@@ -2312,7 +2312,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5867.ProtoReflect.Type instead.
+// Deprecated: Use Message5867.ProtoReflect.Descriptor instead.
 func (*Message5867) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{29}
 }
@@ -2391,7 +2391,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message4016.ProtoReflect.Type instead.
+// Deprecated: Use Message4016.ProtoReflect.Descriptor instead.
 func (*Message4016) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{30}
 }
@@ -2452,7 +2452,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message6108.ProtoReflect.Type instead.
+// Deprecated: Use Message6108.ProtoReflect.Descriptor instead.
 func (*Message6108) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{31}
 }
@@ -2489,7 +2489,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5907.ProtoReflect.Type instead.
+// Deprecated: Use Message5907.ProtoReflect.Descriptor instead.
 func (*Message5907) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{32}
 }
@@ -2550,7 +2550,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Type instead.
+// Deprecated: Use UnusedEmptyMessage.ProtoReflect.Descriptor instead.
 func (*UnusedEmptyMessage) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{33}
 }
@@ -2585,7 +2585,7 @@
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use Message5903.ProtoReflect.Type instead.
+// Deprecated: Use Message5903.ProtoReflect.Descriptor instead.
 func (*Message5903) Descriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_2_proto_rawDescGZIP(), []int{34}
 }
diff --git a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go
index 36cc75a..d948ce4 100644
--- a/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go
+++ b/internal/testprotos/benchmarks/datasets/google_message4/benchmark_message4_3.pb.go
@@ -67,7 +67,7 @@
 	return nil
 }
 
-// Deprecated: Use UnusedEnum.Type instead.
+// Deprecated: Use UnusedEnum.Descriptor instead.
 func (UnusedEnum) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{0}
 }
@@ -139,7 +139,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum2593.Type instead.
+// Deprecated: Use Enum2593.Descriptor instead.
 func (Enum2593) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{1}
 }
@@ -196,7 +196,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum2834.Type instead.
+// Deprecated: Use Enum2834.Descriptor instead.
 func (Enum2834) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{2}
 }
@@ -289,7 +289,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum2806.Type instead.
+// Deprecated: Use Enum2806.Descriptor instead.
 func (Enum2806) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{3}
 }
@@ -700,7 +700,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum2851.Type instead.
+// Deprecated: Use Enum2851.Descriptor instead.
 func (Enum2851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{4}
 }
@@ -784,7 +784,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum2602.Type instead.
+// Deprecated: Use Enum2602.Descriptor instead.
 func (Enum2602) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{5}
 }
@@ -916,7 +916,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3071.Type instead.
+// Deprecated: Use Enum3071.Descriptor instead.
 func (Enum3071) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{6}
 }
@@ -1000,7 +1000,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3805.Type instead.
+// Deprecated: Use Enum3805.Descriptor instead.
 func (Enum3805) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{7}
 }
@@ -1108,7 +1108,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3783.Type instead.
+// Deprecated: Use Enum3783.Descriptor instead.
 func (Enum3783) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{8}
 }
@@ -1210,7 +1210,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3851.Type instead.
+// Deprecated: Use Enum3851.Descriptor instead.
 func (Enum3851) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{9}
 }
@@ -1267,7 +1267,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5862.Type instead.
+// Deprecated: Use Enum5862.Descriptor instead.
 func (Enum5862) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{10}
 }
@@ -1327,7 +1327,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5868.Type instead.
+// Deprecated: Use Enum5868.Descriptor instead.
 func (Enum5868) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{11}
 }
@@ -1384,7 +1384,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5873.Type instead.
+// Deprecated: Use Enum5873.Descriptor instead.
 func (Enum5873) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{12}
 }
@@ -1438,7 +1438,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5904.Type instead.
+// Deprecated: Use Enum5904.Descriptor instead.
 func (Enum5904) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{13}
 }
@@ -1492,7 +1492,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5909.Type instead.
+// Deprecated: Use Enum5909.Descriptor instead.
 func (Enum5909) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{14}
 }
@@ -1546,7 +1546,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5912.Type instead.
+// Deprecated: Use Enum5912.Descriptor instead.
 func (Enum5912) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{15}
 }
@@ -1606,7 +1606,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5915.Type instead.
+// Deprecated: Use Enum5915.Descriptor instead.
 func (Enum5915) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{16}
 }
@@ -1660,7 +1660,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5920.Type instead.
+// Deprecated: Use Enum5920.Descriptor instead.
 func (Enum5920) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{17}
 }
@@ -1720,7 +1720,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5923.Type instead.
+// Deprecated: Use Enum5923.Descriptor instead.
 func (Enum5923) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{18}
 }
@@ -1774,7 +1774,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5928.Type instead.
+// Deprecated: Use Enum5928.Descriptor instead.
 func (Enum5928) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{19}
 }
@@ -1831,7 +1831,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5931.Type instead.
+// Deprecated: Use Enum5931.Descriptor instead.
 func (Enum5931) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{20}
 }
@@ -1888,7 +1888,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5935.Type instead.
+// Deprecated: Use Enum5935.Descriptor instead.
 func (Enum5935) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{21}
 }
@@ -1954,7 +1954,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5939.Type instead.
+// Deprecated: Use Enum5939.Descriptor instead.
 func (Enum5939) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{22}
 }
@@ -2032,7 +2032,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5946.Type instead.
+// Deprecated: Use Enum5946.Descriptor instead.
 func (Enum5946) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{23}
 }
@@ -2092,7 +2092,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5957.Type instead.
+// Deprecated: Use Enum5957.Descriptor instead.
 func (Enum5957) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{24}
 }
@@ -2146,7 +2146,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum5962.Type instead.
+// Deprecated: Use Enum5962.Descriptor instead.
 func (Enum5962) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{25}
 }
@@ -2260,7 +2260,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6025.Type instead.
+// Deprecated: Use Enum6025.Descriptor instead.
 func (Enum6025) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{26}
 }
@@ -2350,7 +2350,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6111.Type instead.
+// Deprecated: Use Enum6111.Descriptor instead.
 func (Enum6111) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{27}
 }
@@ -2443,7 +2443,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6065.Type instead.
+// Deprecated: Use Enum6065.Descriptor instead.
 func (Enum6065) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{28}
 }
@@ -2497,7 +2497,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6130.Type instead.
+// Deprecated: Use Enum6130.Descriptor instead.
 func (Enum6130) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{29}
 }
@@ -2569,7 +2569,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6579.Type instead.
+// Deprecated: Use Enum6579.Descriptor instead.
 func (Enum6579) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{30}
 }
@@ -2719,7 +2719,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum6588.Type instead.
+// Deprecated: Use Enum6588.Descriptor instead.
 func (Enum6588) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{31}
 }
@@ -2779,7 +2779,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum7288.Type instead.
+// Deprecated: Use Enum7288.Descriptor instead.
 func (Enum7288) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{32}
 }
@@ -2851,7 +2851,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum7512.Type instead.
+// Deprecated: Use Enum7512.Descriptor instead.
 func (Enum7512) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{33}
 }
@@ -2914,7 +2914,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum7922.Type instead.
+// Deprecated: Use Enum7922.Descriptor instead.
 func (Enum7922) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{34}
 }
@@ -3514,7 +3514,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum3476.Type instead.
+// Deprecated: Use Enum3476.Descriptor instead.
 func (Enum3476) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{35}
 }
@@ -3589,7 +3589,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10325.Type instead.
+// Deprecated: Use Enum10325.Descriptor instead.
 func (Enum10325) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{36}
 }
@@ -3640,7 +3640,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10335.Type instead.
+// Deprecated: Use Enum10335.Descriptor instead.
 func (Enum10335) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{37}
 }
@@ -3694,7 +3694,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum10337.Type instead.
+// Deprecated: Use Enum10337.Descriptor instead.
 func (Enum10337) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{38}
 }
@@ -3754,7 +3754,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum11901.Type instead.
+// Deprecated: Use Enum11901.Descriptor instead.
 func (Enum11901) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{39}
 }
@@ -3814,7 +3814,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum12735.Type instead.
+// Deprecated: Use Enum12735.Descriptor instead.
 func (Enum12735) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{40}
 }
@@ -3880,7 +3880,7 @@
 	return nil
 }
 
-// Deprecated: Use Enum12871.Type instead.
+// Deprecated: Use Enum12871.Descriptor instead.
 func (Enum12871) EnumDescriptor() ([]byte, []int) {
 	return file_datasets_google_message4_benchmark_message4_3_proto_rawDescGZIP(), []int{41}
 }