diff --git a/Protos/Conformance/editions/test_messages_proto2_editions.proto b/Protos/Conformance/editions/test_messages_proto2_editions.proto
index 23988c624..4cfcd2327 100644
--- a/Protos/Conformance/editions/test_messages_proto2_editions.proto
+++ b/Protos/Conformance/editions/test_messages_proto2_editions.proto
@@ -316,6 +316,8 @@ message TestAllTypesProto2 {
   // Reserved for unknown fields test.
   reserved 1000 to 9999;
 
+  MessageSetCorrect message_set_correct = 500;
+
   // message_set test case.
   message MessageSetCorrect {
     option message_set_wire_format = true;
@@ -338,6 +340,17 @@ message TestAllTypesProto2 {
 
     int32 i = 9;
   }
+
+  message ExtensionWithOneof {
+    oneof oneof_field {
+      int32 a = 1;
+      int32 b = 2;
+    }
+
+    extend MessageSetCorrect {
+      ExtensionWithOneof extension_with_oneof = 123456789;
+    }
+  }
 }
 
 message ForeignMessageProto2 {
@@ -640,3 +653,28 @@ message TestAllRequiredTypesProto2 {
     ];
   }
 }
+
+message TestLargeOneof {
+  message A1 {
+  }
+
+  message A2 {
+  }
+
+  message A3 {
+  }
+
+  message A4 {
+  }
+
+  message A5 {
+  }
+
+  oneof large_oneof {
+    A1 a1 = 1;
+    A2 a2 = 2;
+    A3 a3 = 3;
+    A4 a4 = 4;
+    A5 a5 = 5;
+  }
+}
diff --git a/Protos/Conformance/google/protobuf/test_messages_proto2.proto b/Protos/Conformance/google/protobuf/test_messages_proto2.proto
index 73cba558c..a5d261403 100644
--- a/Protos/Conformance/google/protobuf/test_messages_proto2.proto
+++ b/Protos/Conformance/google/protobuf/test_messages_proto2.proto
@@ -219,6 +219,8 @@ message TestAllTypesProto2 {
   // Reserved for unknown fields test.
   reserved 1000 to 9999;
 
+  optional MessageSetCorrect message_set_correct = 500;
+
   // message_set test case.
   message MessageSetCorrect {
     option message_set_wire_format = true;
@@ -239,6 +241,16 @@ message TestAllTypesProto2 {
     }
     optional int32 i = 9;
   }
+
+  message ExtensionWithOneof {
+    oneof oneof_field {
+      int32 a = 1;
+      int32 b = 2;
+    }
+    extend MessageSetCorrect {
+      optional ExtensionWithOneof extension_with_oneof = 123456789;
+    }
+  }
 }
 
 message ForeignMessageProto2 {
@@ -385,3 +397,18 @@ message TestAllRequiredTypesProto2 {
     required int32 i = 9;
   }
 }
+
+message TestLargeOneof {
+  message A1 {}
+  message A2 {}
+  message A3 {}
+  message A4 {}
+  message A5 {}
+  oneof large_oneof {
+    A1 a1 = 1;
+    A2 a2 = 2;
+    A3 a3 = 3;
+    A4 a4 = 4;
+    A5 a5 = 5;
+  }
+}
diff --git a/Protos/SwiftProtobuf/google/protobuf/descriptor.proto b/Protos/SwiftProtobuf/google/protobuf/descriptor.proto
index dd2d0fbf4..ac3de48de 100644
--- a/Protos/SwiftProtobuf/google/protobuf/descriptor.proto
+++ b/Protos/SwiftProtobuf/google/protobuf/descriptor.proto
@@ -1098,6 +1098,29 @@ message FeatureSet {
     edition_defaults = { edition: EDITION_PROTO3, value: "ALLOW" }
   ];
 
+  enum EnforceNamingStyle {
+    ENFORCE_NAMING_STYLE_UNKNOWN = 0;
+    STYLE2024 = 1;
+    STYLE_LEGACY = 2;
+  }
+  optional EnforceNamingStyle enforce_naming_style = 7 [
+    retention = RETENTION_SOURCE,
+    targets = TARGET_TYPE_FILE,
+    targets = TARGET_TYPE_EXTENSION_RANGE,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_FIELD,
+    targets = TARGET_TYPE_ONEOF,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_ENUM_ENTRY,
+    targets = TARGET_TYPE_SERVICE,
+    targets = TARGET_TYPE_METHOD,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = { edition: EDITION_LEGACY, value: "STYLE_LEGACY" },
+    edition_defaults = { edition: EDITION_2024, value: "STYLE2024" }
+  ];
+
   reserved 999;
 
   extensions 1000 to 9994 [
diff --git a/Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto b/Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto
index 4f2426262..dffda3d11 100644
--- a/Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto
+++ b/Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto
@@ -101,924 +101,931 @@ enum GeneratedSwiftReservedEnum {
   clearEditionIntroduced = 94;
   clearEditionRemoved = 95;
   clearEnd = 96;
-  clearEnumType = 97;
-  clearExtendee = 98;
-  clearExtensionValue = 99;
-  clearFeatures = 100;
-  clearFeatureSupport = 101;
-  clearFieldPresence = 102;
-  clearFixedFeatures = 103;
-  clearFullName = 104;
-  clearGoPackage = 105;
-  clearIdempotencyLevel = 106;
-  clearIdentifierValue = 107;
-  clearInputType = 108;
-  clearIsExtension = 109;
-  clearJavaGenerateEqualsAndHash = 110;
-  clearJavaGenericServices = 111;
-  clearJavaMultipleFiles = 112;
-  clearJavaOuterClassname = 113;
-  clearJavaPackage = 114;
-  clearJavaStringCheckUtf8 = 115;
-  clearJsonFormat = 116;
-  clearJsonName = 117;
-  clearJstype = 118;
-  clearLabel = 119;
-  clearLazy = 120;
-  clearLeadingComments = 121;
-  clearMapEntry = 122;
-  clearMaximumEdition = 123;
-  clearMessageEncoding = 124;
-  clearMessageSetWireFormat = 125;
-  clearMinimumEdition = 126;
-  clearName = 127;
-  clearNamePart = 128;
-  clearNegativeIntValue = 129;
-  clearNoStandardDescriptorAccessor = 130;
-  clearNumber = 131;
-  clearObjcClassPrefix = 132;
-  clearOneofIndex = 133;
-  clearOptimizeFor = 134;
-  clearOptions = 135;
-  clearOutputType = 136;
-  clearOverridableFeatures = 137;
-  clearPackage = 138;
-  clearPacked = 139;
-  clearPhpClassPrefix = 140;
-  clearPhpMetadataNamespace = 141;
-  clearPhpNamespace = 142;
-  clearPositiveIntValue = 143;
-  clearProto3Optional = 144;
-  clearPyGenericServices = 145;
-  clearRepeated = 146;
-  clearRepeatedFieldEncoding = 147;
-  clearReserved = 148;
-  clearRetention = 149;
-  clearRubyPackage = 150;
-  clearSemantic = 151;
-  clearServerStreaming = 152;
-  clearSourceCodeInfo = 153;
-  clearSourceContext = 154;
-  clearSourceFile = 155;
-  clearStart = 156;
-  clearStringValue = 157;
-  clearSwiftPrefix = 158;
-  clearSyntax = 159;
-  clearTrailingComments = 160;
-  clearType = 161;
-  clearTypeName = 162;
-  clearUnverifiedLazy = 163;
-  clearUtf8Validation = 164;
-  clearValue = 165;
-  clearVerification = 166;
-  clearWeak = 167;
-  clientStreaming = 168;
-  code = 169;
-  codePoint = 170;
-  codeUnits = 171;
-  Collection = 172;
-  com = 173;
-  comma = 174;
-  consumedBytes = 175;
-  contains = 176;
-  contentsOf = 177;
-  ContiguousBytes = 178;
-  copy = 179;
-  count = 180;
-  countVarintsInBuffer = 181;
-  csharpNamespace = 182;
-  ctype = 183;
-  customCodable = 184;
-  CustomDebugStringConvertible = 185;
-  CustomStringConvertible = 186;
-  d = 187;
-  Data = 188;
-  dataResult = 189;
-  date = 190;
-  daySec = 191;
-  daysSinceEpoch = 192;
-  debugDescription = 193;
-  debugRedact = 194;
-  declaration = 195;
-  decoded = 196;
-  decodedFromJSONNull = 197;
-  decodeExtensionField = 198;
-  decodeExtensionFieldsAsMessageSet = 199;
-  decodeJSON = 200;
-  decodeMapField = 201;
-  decodeMessage = 202;
-  decoder = 203;
-  decodeRepeated = 204;
-  decodeRepeatedBoolField = 205;
-  decodeRepeatedBytesField = 206;
-  decodeRepeatedDoubleField = 207;
-  decodeRepeatedEnumField = 208;
-  decodeRepeatedFixed32Field = 209;
-  decodeRepeatedFixed64Field = 210;
-  decodeRepeatedFloatField = 211;
-  decodeRepeatedGroupField = 212;
-  decodeRepeatedInt32Field = 213;
-  decodeRepeatedInt64Field = 214;
-  decodeRepeatedMessageField = 215;
-  decodeRepeatedSFixed32Field = 216;
-  decodeRepeatedSFixed64Field = 217;
-  decodeRepeatedSInt32Field = 218;
-  decodeRepeatedSInt64Field = 219;
-  decodeRepeatedStringField = 220;
-  decodeRepeatedUInt32Field = 221;
-  decodeRepeatedUInt64Field = 222;
-  decodeSingular = 223;
-  decodeSingularBoolField = 224;
-  decodeSingularBytesField = 225;
-  decodeSingularDoubleField = 226;
-  decodeSingularEnumField = 227;
-  decodeSingularFixed32Field = 228;
-  decodeSingularFixed64Field = 229;
-  decodeSingularFloatField = 230;
-  decodeSingularGroupField = 231;
-  decodeSingularInt32Field = 232;
-  decodeSingularInt64Field = 233;
-  decodeSingularMessageField = 234;
-  decodeSingularSFixed32Field = 235;
-  decodeSingularSFixed64Field = 236;
-  decodeSingularSInt32Field = 237;
-  decodeSingularSInt64Field = 238;
-  decodeSingularStringField = 239;
-  decodeSingularUInt32Field = 240;
-  decodeSingularUInt64Field = 241;
-  decodeTextFormat = 242;
-  defaultAnyTypeURLPrefix = 243;
-  defaults = 244;
-  defaultValue = 245;
-  dependency = 246;
-  deprecated = 247;
-  deprecatedLegacyJsonFieldConflicts = 248;
-  deprecationWarning = 249;
-  description = 250;
-  DescriptorProto = 251;
-  Dictionary = 252;
-  dictionaryLiteral = 253;
-  digit = 254;
-  digit0 = 255;
-  digit1 = 256;
-  digitCount = 257;
-  digits = 258;
-  digitValue = 259;
-  discardableResult = 260;
-  discardUnknownFields = 261;
-  Double = 262;
-  doubleValue = 263;
-  Duration = 264;
-  E = 265;
-  edition = 266;
-  EditionDefault = 267;
-  editionDefaults = 268;
-  editionDeprecated = 269;
-  editionIntroduced = 270;
-  editionRemoved = 271;
-  Element = 272;
-  elements = 273;
-  else = 274;
-  emitExtensionFieldName = 275;
-  emitFieldName = 276;
-  emitFieldNumber = 277;
-  Empty = 278;
-  emptyData = 279;
-  encodeAsBytes = 280;
-  encoded = 281;
-  encodedJSONString = 282;
-  encodedSize = 283;
-  encodeField = 284;
-  encoder = 285;
-  end = 286;
-  endArray = 287;
-  endMessageField = 288;
-  endObject = 289;
-  endRegularField = 290;
-  enum = 291;
-  EnumDescriptorProto = 292;
-  EnumOptions = 293;
-  EnumReservedRange = 294;
-  enumType = 295;
-  enumvalue = 296;
-  EnumValueDescriptorProto = 297;
-  EnumValueOptions = 298;
-  Equatable = 299;
-  Error = 300;
-  ExpressibleByArrayLiteral = 301;
-  ExpressibleByDictionaryLiteral = 302;
-  ext = 303;
-  extDecoder = 304;
-  extendedGraphemeClusterLiteral = 305;
-  ExtendedGraphemeClusterLiteralType = 306;
-  extendee = 307;
-  ExtensibleMessage = 308;
-  extension = 309;
-  ExtensionField = 310;
-  extensionFieldNumber = 311;
-  ExtensionFieldValueSet = 312;
-  ExtensionMap = 313;
-  extensionRange = 314;
-  ExtensionRangeOptions = 315;
-  extensions = 316;
-  extras = 317;
-  F = 318;
-  false = 319;
-  features = 320;
-  FeatureSet = 321;
-  FeatureSetDefaults = 322;
-  FeatureSetEditionDefault = 323;
-  featureSupport = 324;
-  field = 325;
-  fieldData = 326;
-  FieldDescriptorProto = 327;
-  FieldMask = 328;
-  FieldMaskError = 329;
-  fieldName = 330;
-  fieldNameCount = 331;
-  fieldNum = 332;
-  fieldNumber = 333;
-  fieldNumberForProto = 334;
-  FieldOptions = 335;
-  fieldPresence = 336;
-  fields = 337;
-  fieldSize = 338;
-  FieldTag = 339;
-  FieldType = 340;
-  file = 341;
-  FileDescriptorProto = 342;
-  FileDescriptorSet = 343;
-  fileName = 344;
-  FileOptions = 345;
-  filter = 346;
-  final = 347;
-  finiteOnly = 348;
-  first = 349;
-  firstItem = 350;
-  fixedFeatures = 351;
-  Float = 352;
-  floatLiteral = 353;
-  FloatLiteralType = 354;
-  FloatValue = 355;
-  for = 356;
-  forMessageName = 357;
-  formUnion = 358;
-  forReadingFrom = 359;
-  forTypeURL = 360;
-  ForwardParser = 361;
-  forWritingInto = 362;
-  from = 363;
-  fromAscii2 = 364;
-  fromAscii4 = 365;
-  fromByteOffset = 366;
-  fromHexDigit = 367;
-  fullName = 368;
-  func = 369;
-  function = 370;
-  G = 371;
-  GeneratedCodeInfo = 372;
-  get = 373;
-  getExtensionValue = 374;
-  googleapis = 375;
-  Google_Protobuf_Any = 376;
-  Google_Protobuf_Api = 377;
-  Google_Protobuf_BoolValue = 378;
-  Google_Protobuf_BytesValue = 379;
-  Google_Protobuf_DescriptorProto = 380;
-  Google_Protobuf_DoubleValue = 381;
-  Google_Protobuf_Duration = 382;
-  Google_Protobuf_Edition = 383;
-  Google_Protobuf_Empty = 384;
-  Google_Protobuf_Enum = 385;
-  Google_Protobuf_EnumDescriptorProto = 386;
-  Google_Protobuf_EnumOptions = 387;
-  Google_Protobuf_EnumValue = 388;
-  Google_Protobuf_EnumValueDescriptorProto = 389;
-  Google_Protobuf_EnumValueOptions = 390;
-  Google_Protobuf_ExtensionRangeOptions = 391;
-  Google_Protobuf_FeatureSet = 392;
-  Google_Protobuf_FeatureSetDefaults = 393;
-  Google_Protobuf_Field = 394;
-  Google_Protobuf_FieldDescriptorProto = 395;
-  Google_Protobuf_FieldMask = 396;
-  Google_Protobuf_FieldOptions = 397;
-  Google_Protobuf_FileDescriptorProto = 398;
-  Google_Protobuf_FileDescriptorSet = 399;
-  Google_Protobuf_FileOptions = 400;
-  Google_Protobuf_FloatValue = 401;
-  Google_Protobuf_GeneratedCodeInfo = 402;
-  Google_Protobuf_Int32Value = 403;
-  Google_Protobuf_Int64Value = 404;
-  Google_Protobuf_ListValue = 405;
-  Google_Protobuf_MessageOptions = 406;
-  Google_Protobuf_Method = 407;
-  Google_Protobuf_MethodDescriptorProto = 408;
-  Google_Protobuf_MethodOptions = 409;
-  Google_Protobuf_Mixin = 410;
-  Google_Protobuf_NullValue = 411;
-  Google_Protobuf_OneofDescriptorProto = 412;
-  Google_Protobuf_OneofOptions = 413;
-  Google_Protobuf_Option = 414;
-  Google_Protobuf_ServiceDescriptorProto = 415;
-  Google_Protobuf_ServiceOptions = 416;
-  Google_Protobuf_SourceCodeInfo = 417;
-  Google_Protobuf_SourceContext = 418;
-  Google_Protobuf_StringValue = 419;
-  Google_Protobuf_Struct = 420;
-  Google_Protobuf_Syntax = 421;
-  Google_Protobuf_Timestamp = 422;
-  Google_Protobuf_Type = 423;
-  Google_Protobuf_UInt32Value = 424;
-  Google_Protobuf_UInt64Value = 425;
-  Google_Protobuf_UninterpretedOption = 426;
-  Google_Protobuf_Value = 427;
-  goPackage = 428;
-  group = 429;
-  groupFieldNumberStack = 430;
-  groupSize = 431;
-  guard = 432;
-  hadOneofValue = 433;
-  handleConflictingOneOf = 434;
-  hasAggregateValue = 435;
-  hasAllowAlias = 436;
-  hasBegin = 437;
-  hasCcEnableArenas = 438;
-  hasCcGenericServices = 439;
-  hasClientStreaming = 440;
-  hasCsharpNamespace = 441;
-  hasCtype = 442;
-  hasDebugRedact = 443;
-  hasDefaultValue = 444;
-  hasDeprecated = 445;
-  hasDeprecatedLegacyJsonFieldConflicts = 446;
-  hasDeprecationWarning = 447;
-  hasDoubleValue = 448;
-  hasEdition = 449;
-  hasEditionDeprecated = 450;
-  hasEditionIntroduced = 451;
-  hasEditionRemoved = 452;
-  hasEnd = 453;
-  hasEnumType = 454;
-  hasExtendee = 455;
-  hasExtensionValue = 456;
-  hasFeatures = 457;
-  hasFeatureSupport = 458;
-  hasFieldPresence = 459;
-  hasFixedFeatures = 460;
-  hasFullName = 461;
-  hasGoPackage = 462;
-  hash = 463;
-  Hashable = 464;
-  hasher = 465;
-  HashVisitor = 466;
-  hasIdempotencyLevel = 467;
-  hasIdentifierValue = 468;
-  hasInputType = 469;
-  hasIsExtension = 470;
-  hasJavaGenerateEqualsAndHash = 471;
-  hasJavaGenericServices = 472;
-  hasJavaMultipleFiles = 473;
-  hasJavaOuterClassname = 474;
-  hasJavaPackage = 475;
-  hasJavaStringCheckUtf8 = 476;
-  hasJsonFormat = 477;
-  hasJsonName = 478;
-  hasJstype = 479;
-  hasLabel = 480;
-  hasLazy = 481;
-  hasLeadingComments = 482;
-  hasMapEntry = 483;
-  hasMaximumEdition = 484;
-  hasMessageEncoding = 485;
-  hasMessageSetWireFormat = 486;
-  hasMinimumEdition = 487;
-  hasName = 488;
-  hasNamePart = 489;
-  hasNegativeIntValue = 490;
-  hasNoStandardDescriptorAccessor = 491;
-  hasNumber = 492;
-  hasObjcClassPrefix = 493;
-  hasOneofIndex = 494;
-  hasOptimizeFor = 495;
-  hasOptions = 496;
-  hasOutputType = 497;
-  hasOverridableFeatures = 498;
-  hasPackage = 499;
-  hasPacked = 500;
-  hasPhpClassPrefix = 501;
-  hasPhpMetadataNamespace = 502;
-  hasPhpNamespace = 503;
-  hasPositiveIntValue = 504;
-  hasProto3Optional = 505;
-  hasPyGenericServices = 506;
-  hasRepeated = 507;
-  hasRepeatedFieldEncoding = 508;
-  hasReserved = 509;
-  hasRetention = 510;
-  hasRubyPackage = 511;
-  hasSemantic = 512;
-  hasServerStreaming = 513;
-  hasSourceCodeInfo = 514;
-  hasSourceContext = 515;
-  hasSourceFile = 516;
-  hasStart = 517;
-  hasStringValue = 518;
-  hasSwiftPrefix = 519;
-  hasSyntax = 520;
-  hasTrailingComments = 521;
-  hasType = 522;
-  hasTypeName = 523;
-  hasUnverifiedLazy = 524;
-  hasUtf8Validation = 525;
-  hasValue = 526;
-  hasVerification = 527;
-  hasWeak = 528;
-  hour = 529;
-  i = 530;
-  idempotencyLevel = 531;
-  identifierValue = 532;
-  if = 533;
-  ignoreUnknownExtensionFields = 534;
-  ignoreUnknownFields = 535;
-  index = 536;
-  init = 537;
-  inout = 538;
-  inputType = 539;
-  insert = 540;
-  Int = 541;
-  Int32 = 542;
-  Int32Value = 543;
-  Int64 = 544;
-  Int64Value = 545;
-  Int8 = 546;
-  integerLiteral = 547;
-  IntegerLiteralType = 548;
-  intern = 549;
-  Internal = 550;
-  InternalState = 551;
-  intersect = 552;
-  into = 553;
-  ints = 554;
-  isA = 555;
-  isEqual = 556;
-  isEqualTo = 557;
-  isExtension = 558;
-  isInitialized = 559;
-  isNegative = 560;
-  isPathValid = 561;
-  isValid = 562;
-  itemTagsEncodedSize = 563;
-  iterator = 564;
-  javaGenerateEqualsAndHash = 565;
-  javaGenericServices = 566;
-  javaMultipleFiles = 567;
-  javaOuterClassname = 568;
-  javaPackage = 569;
-  javaStringCheckUtf8 = 570;
-  JSONDecoder = 571;
-  JSONDecodingError = 572;
-  JSONDecodingOptions = 573;
-  jsonEncoder = 574;
-  JSONEncodingError = 575;
-  JSONEncodingOptions = 576;
-  JSONEncodingVisitor = 577;
-  jsonFormat = 578;
-  JSONMapEncodingVisitor = 579;
-  jsonName = 580;
-  jsonPath = 581;
-  jsonPaths = 582;
-  JSONScanner = 583;
-  jsonString = 584;
-  jsonText = 585;
-  jsonUTF8Bytes = 586;
-  jsonUTF8Data = 587;
-  jstype = 588;
-  k = 589;
-  kChunkSize = 590;
-  Key = 591;
-  keyField = 592;
-  keyFieldOpt = 593;
-  KeyType = 594;
-  kind = 595;
-  l = 596;
-  label = 597;
-  lazy = 598;
-  leadingComments = 599;
-  leadingDetachedComments = 600;
-  length = 601;
-  lessThan = 602;
-  let = 603;
-  lhs = 604;
-  line = 605;
-  list = 606;
-  listOfMessages = 607;
-  listValue = 608;
-  littleEndian = 609;
-  load = 610;
-  localHasher = 611;
-  location = 612;
-  M = 613;
-  major = 614;
-  makeAsyncIterator = 615;
-  makeIterator = 616;
-  malformedLength = 617;
-  mapEntry = 618;
-  MapKeyType = 619;
-  mapToMessages = 620;
-  MapValueType = 621;
-  mapVisitor = 622;
-  mask = 623;
-  maximumEdition = 624;
-  mdayStart = 625;
-  merge = 626;
-  MergeOptions = 627;
-  message = 628;
-  messageDepthLimit = 629;
-  messageEncoding = 630;
-  MessageExtension = 631;
-  MessageImplementationBase = 632;
-  MessageOptions = 633;
-  MessageSet = 634;
-  messageSetWireFormat = 635;
-  messageSize = 636;
-  messageType = 637;
-  Method = 638;
-  MethodDescriptorProto = 639;
-  MethodOptions = 640;
-  methods = 641;
-  min = 642;
-  minimumEdition = 643;
-  minor = 644;
-  Mixin = 645;
-  mixins = 646;
-  modify = 647;
-  month = 648;
-  msgExtension = 649;
-  mutating = 650;
-  n = 651;
-  name = 652;
-  NameDescription = 653;
-  NameMap = 654;
-  NamePart = 655;
-  names = 656;
-  nanos = 657;
-  negativeIntValue = 658;
-  nestedType = 659;
-  newExtensible = 660;
-  newL = 661;
-  newList = 662;
-  newMessage = 663;
-  newValue = 664;
-  next = 665;
-  nextByte = 666;
-  nextFieldNumber = 667;
-  nextVarInt = 668;
-  nil = 669;
-  nilLiteral = 670;
-  noBytesAvailable = 671;
-  noStandardDescriptorAccessor = 672;
-  nullValue = 673;
-  number = 674;
-  numberValue = 675;
-  objcClassPrefix = 676;
-  of = 677;
-  oneofDecl = 678;
-  OneofDescriptorProto = 679;
-  oneofIndex = 680;
-  OneofOptions = 681;
-  oneofs = 682;
-  OneOf_Kind = 683;
-  optimizeFor = 684;
-  OptimizeMode = 685;
-  Option = 686;
-  OptionalEnumExtensionField = 687;
-  OptionalExtensionField = 688;
-  OptionalGroupExtensionField = 689;
-  OptionalMessageExtensionField = 690;
-  OptionRetention = 691;
-  options = 692;
-  OptionTargetType = 693;
-  other = 694;
-  others = 695;
-  out = 696;
-  outputType = 697;
-  overridableFeatures = 698;
-  p = 699;
-  package = 700;
-  packed = 701;
-  PackedEnumExtensionField = 702;
-  PackedExtensionField = 703;
-  padding = 704;
-  parent = 705;
-  parse = 706;
-  partial = 707;
-  path = 708;
-  PathDecoder = 709;
-  PathDecodingError = 710;
-  paths = 711;
-  PathVisitor = 712;
-  payload = 713;
-  payloadSize = 714;
-  phpClassPrefix = 715;
-  phpMetadataNamespace = 716;
-  phpNamespace = 717;
-  pos = 718;
-  positiveIntValue = 719;
-  prefix = 720;
-  preserveProtoFieldNames = 721;
-  preTraverse = 722;
-  prevPath = 723;
-  printUnknownFields = 724;
-  proto2 = 725;
-  proto3DefaultValue = 726;
-  proto3Optional = 727;
-  ProtobufAPIVersionCheck = 728;
-  ProtobufAPIVersion_2 = 729;
-  ProtobufBool = 730;
-  ProtobufBytes = 731;
-  ProtobufDouble = 732;
-  ProtobufEnumMap = 733;
-  protobufExtension = 734;
-  ProtobufFixed32 = 735;
-  ProtobufFixed64 = 736;
-  ProtobufFloat = 737;
-  ProtobufInt32 = 738;
-  ProtobufInt64 = 739;
-  ProtobufMap = 740;
-  ProtobufMessageMap = 741;
-  ProtobufSFixed32 = 742;
-  ProtobufSFixed64 = 743;
-  ProtobufSInt32 = 744;
-  ProtobufSInt64 = 745;
-  ProtobufString = 746;
-  ProtobufUInt32 = 747;
-  ProtobufUInt64 = 748;
-  protobuf_extensionFieldValues = 749;
-  protobuf_fieldNumber = 750;
-  protobuf_generated_isEqualTo = 751;
-  protobuf_nameMap = 752;
-  protobuf_newField = 753;
-  protobuf_package = 754;
-  protocol = 755;
-  protoFieldName = 756;
-  protoMessageName = 757;
-  ProtoNameProviding = 758;
-  protoPaths = 759;
-  public = 760;
-  publicDependency = 761;
-  putBoolValue = 762;
-  putBytesValue = 763;
-  putDoubleValue = 764;
-  putEnumValue = 765;
-  putFixedUInt32 = 766;
-  putFixedUInt64 = 767;
-  putFloatValue = 768;
-  putInt64 = 769;
-  putStringValue = 770;
-  putUInt64 = 771;
-  putUInt64Hex = 772;
-  putVarInt = 773;
-  putZigZagVarInt = 774;
-  pyGenericServices = 775;
-  R = 776;
-  rawChars = 777;
-  RawRepresentable = 778;
-  RawValue = 779;
-  read4HexDigits = 780;
-  readBytes = 781;
-  register = 782;
-  removingAllFieldsOf = 783;
-  repeated = 784;
-  RepeatedEnumExtensionField = 785;
-  RepeatedExtensionField = 786;
-  repeatedFieldEncoding = 787;
-  RepeatedGroupExtensionField = 788;
-  RepeatedMessageExtensionField = 789;
-  repeating = 790;
-  replaceRepeatedFields = 791;
-  requestStreaming = 792;
-  requestTypeURL = 793;
-  requiredSize = 794;
-  responseStreaming = 795;
-  responseTypeURL = 796;
-  result = 797;
-  retention = 798;
-  rethrows = 799;
-  return = 800;
-  ReturnType = 801;
-  revision = 802;
-  rhs = 803;
-  root = 804;
-  rubyPackage = 805;
-  s = 806;
-  sawBackslash = 807;
-  sawSection4Characters = 808;
-  sawSection5Characters = 809;
-  scan = 810;
-  scanner = 811;
-  seconds = 812;
-  self = 813;
-  semantic = 814;
-  Sendable = 815;
-  separator = 816;
-  serialize = 817;
-  serializedBytes = 818;
-  serializedData = 819;
-  serializedSize = 820;
-  serverStreaming = 821;
-  service = 822;
-  ServiceDescriptorProto = 823;
-  ServiceOptions = 824;
-  set = 825;
-  setExtensionValue = 826;
-  shift = 827;
-  SimpleExtensionMap = 828;
-  size = 829;
-  sizer = 830;
-  source = 831;
-  sourceCodeInfo = 832;
-  sourceContext = 833;
-  sourceEncoding = 834;
-  sourceFile = 835;
-  SourceLocation = 836;
-  span = 837;
-  split = 838;
-  start = 839;
-  startArray = 840;
-  startArrayObject = 841;
-  startField = 842;
-  startIndex = 843;
-  startMessageField = 844;
-  startObject = 845;
-  startRegularField = 846;
-  state = 847;
-  static = 848;
-  StaticString = 849;
-  storage = 850;
-  String = 851;
-  stringLiteral = 852;
-  StringLiteralType = 853;
-  stringResult = 854;
-  stringValue = 855;
-  struct = 856;
-  structValue = 857;
-  subDecoder = 858;
-  subscript = 859;
-  subtract = 860;
-  subVisitor = 861;
-  Swift = 862;
-  swiftPrefix = 863;
-  SwiftProtobufContiguousBytes = 864;
-  SwiftProtobufError = 865;
-  syntax = 866;
-  T = 867;
-  tag = 868;
-  targets = 869;
-  terminator = 870;
-  testDecoder = 871;
-  text = 872;
-  textDecoder = 873;
-  TextFormatDecoder = 874;
-  TextFormatDecodingError = 875;
-  TextFormatDecodingOptions = 876;
-  TextFormatEncodingOptions = 877;
-  TextFormatEncodingVisitor = 878;
-  textFormatString = 879;
-  throwOrIgnore = 880;
-  throws = 881;
-  timeInterval = 882;
-  timeIntervalSince1970 = 883;
-  timeIntervalSinceReferenceDate = 884;
-  Timestamp = 885;
-  tmp = 886;
-  tooLarge = 887;
-  total = 888;
-  totalArrayDepth = 889;
-  totalSize = 890;
-  trailingComments = 891;
-  traverse = 892;
-  trim = 893;
-  true = 894;
-  try = 895;
-  type = 896;
-  typealias = 897;
-  TypeEnum = 898;
-  typeName = 899;
-  typePrefix = 900;
-  typeStart = 901;
-  typeUnknown = 902;
-  typeURL = 903;
-  UInt32 = 904;
-  UInt32Value = 905;
-  UInt64 = 906;
-  UInt64Value = 907;
-  UInt8 = 908;
-  unchecked = 909;
-  unicodeScalarLiteral = 910;
-  UnicodeScalarLiteralType = 911;
-  unicodeScalars = 912;
-  UnicodeScalarView = 913;
-  uninterpretedOption = 914;
-  union = 915;
-  uniqueStorage = 916;
-  unknown = 917;
-  unknownFields = 918;
-  UnknownStorage = 919;
-  unpackTo = 920;
-  UnsafeBufferPointer = 921;
-  UnsafeMutablePointer = 922;
-  UnsafeMutableRawBufferPointer = 923;
-  UnsafeRawBufferPointer = 924;
-  UnsafeRawPointer = 925;
-  unverifiedLazy = 926;
-  updatedOptions = 927;
-  url = 928;
-  useDeterministicOrdering = 929;
-  utf8 = 930;
-  utf8Ptr = 931;
-  utf8ToDouble = 932;
-  utf8Validation = 933;
-  UTF8View = 934;
-  v = 935;
-  value = 936;
-  valueField = 937;
-  values = 938;
-  ValueType = 939;
-  var = 940;
-  verification = 941;
-  VerificationState = 942;
-  Version = 943;
-  versionString = 944;
-  visitExtensionFields = 945;
-  visitExtensionFieldsAsMessageSet = 946;
-  visitMapField = 947;
-  visitor = 948;
-  visitPacked = 949;
-  visitPackedBoolField = 950;
-  visitPackedDoubleField = 951;
-  visitPackedEnumField = 952;
-  visitPackedFixed32Field = 953;
-  visitPackedFixed64Field = 954;
-  visitPackedFloatField = 955;
-  visitPackedInt32Field = 956;
-  visitPackedInt64Field = 957;
-  visitPackedSFixed32Field = 958;
-  visitPackedSFixed64Field = 959;
-  visitPackedSInt32Field = 960;
-  visitPackedSInt64Field = 961;
-  visitPackedUInt32Field = 962;
-  visitPackedUInt64Field = 963;
-  visitRepeated = 964;
-  visitRepeatedBoolField = 965;
-  visitRepeatedBytesField = 966;
-  visitRepeatedDoubleField = 967;
-  visitRepeatedEnumField = 968;
-  visitRepeatedFixed32Field = 969;
-  visitRepeatedFixed64Field = 970;
-  visitRepeatedFloatField = 971;
-  visitRepeatedGroupField = 972;
-  visitRepeatedInt32Field = 973;
-  visitRepeatedInt64Field = 974;
-  visitRepeatedMessageField = 975;
-  visitRepeatedSFixed32Field = 976;
-  visitRepeatedSFixed64Field = 977;
-  visitRepeatedSInt32Field = 978;
-  visitRepeatedSInt64Field = 979;
-  visitRepeatedStringField = 980;
-  visitRepeatedUInt32Field = 981;
-  visitRepeatedUInt64Field = 982;
-  visitSingular = 983;
-  visitSingularBoolField = 984;
-  visitSingularBytesField = 985;
-  visitSingularDoubleField = 986;
-  visitSingularEnumField = 987;
-  visitSingularFixed32Field = 988;
-  visitSingularFixed64Field = 989;
-  visitSingularFloatField = 990;
-  visitSingularGroupField = 991;
-  visitSingularInt32Field = 992;
-  visitSingularInt64Field = 993;
-  visitSingularMessageField = 994;
-  visitSingularSFixed32Field = 995;
-  visitSingularSFixed64Field = 996;
-  visitSingularSInt32Field = 997;
-  visitSingularSInt64Field = 998;
-  visitSingularStringField = 999;
-  visitSingularUInt32Field = 1000;
-  visitSingularUInt64Field = 1001;
-  visitUnknown = 1002;
-  wasDecoded = 1003;
-  weak = 1004;
-  weakDependency = 1005;
-  where = 1006;
-  wireFormat = 1007;
-  with = 1008;
-  withUnsafeBytes = 1009;
-  withUnsafeMutableBytes = 1010;
-  work = 1011;
-  Wrapped = 1012;
-  WrappedType = 1013;
-  wrappedValue = 1014;
-  written = 1015;
-  yday = 1016;
+  clearEnforceNamingStyle = 97;
+  clearEnumType = 98;
+  clearExtendee = 99;
+  clearExtensionValue = 100;
+  clearFeatures = 101;
+  clearFeatureSupport = 102;
+  clearFieldPresence = 103;
+  clearFixedFeatures = 104;
+  clearFullName = 105;
+  clearGoPackage = 106;
+  clearIdempotencyLevel = 107;
+  clearIdentifierValue = 108;
+  clearInputType = 109;
+  clearIsExtension = 110;
+  clearJavaGenerateEqualsAndHash = 111;
+  clearJavaGenericServices = 112;
+  clearJavaMultipleFiles = 113;
+  clearJavaOuterClassname = 114;
+  clearJavaPackage = 115;
+  clearJavaStringCheckUtf8 = 116;
+  clearJsonFormat = 117;
+  clearJsonName = 118;
+  clearJstype = 119;
+  clearLabel = 120;
+  clearLazy = 121;
+  clearLeadingComments = 122;
+  clearMapEntry = 123;
+  clearMaximumEdition = 124;
+  clearMessageEncoding = 125;
+  clearMessageSetWireFormat = 126;
+  clearMinimumEdition = 127;
+  clearName = 128;
+  clearNamePart = 129;
+  clearNegativeIntValue = 130;
+  clearNoStandardDescriptorAccessor = 131;
+  clearNumber = 132;
+  clearObjcClassPrefix = 133;
+  clearOneofIndex = 134;
+  clearOptimizeFor = 135;
+  clearOptions = 136;
+  clearOutputType = 137;
+  clearOverridableFeatures = 138;
+  clearPackage = 139;
+  clearPacked = 140;
+  clearPhpClassPrefix = 141;
+  clearPhpMetadataNamespace = 142;
+  clearPhpNamespace = 143;
+  clearPositiveIntValue = 144;
+  clearProto3Optional = 145;
+  clearPyGenericServices = 146;
+  clearRepeated = 147;
+  clearRepeatedFieldEncoding = 148;
+  clearReserved = 149;
+  clearRetention = 150;
+  clearRubyPackage = 151;
+  clearSemantic = 152;
+  clearServerStreaming = 153;
+  clearSourceCodeInfo = 154;
+  clearSourceContext = 155;
+  clearSourceFile = 156;
+  clearStart = 157;
+  clearStringValue = 158;
+  clearSwiftPrefix = 159;
+  clearSyntax = 160;
+  clearTrailingComments = 161;
+  clearType = 162;
+  clearTypeName = 163;
+  clearUnverifiedLazy = 164;
+  clearUtf8Validation = 165;
+  clearValue = 166;
+  clearVerification = 167;
+  clearWeak = 168;
+  clientStreaming = 169;
+  code = 170;
+  codePoint = 171;
+  codeUnits = 172;
+  Collection = 173;
+  com = 174;
+  comma = 175;
+  consumedBytes = 176;
+  contains = 177;
+  contentsOf = 178;
+  ContiguousBytes = 179;
+  copy = 180;
+  count = 181;
+  countVarintsInBuffer = 182;
+  csharpNamespace = 183;
+  ctype = 184;
+  customCodable = 185;
+  CustomDebugStringConvertible = 186;
+  CustomStringConvertible = 187;
+  d = 188;
+  Data = 189;
+  dataResult = 190;
+  date = 191;
+  daySec = 192;
+  daysSinceEpoch = 193;
+  debugDescription = 194;
+  debugRedact = 195;
+  declaration = 196;
+  decoded = 197;
+  decodedFromJSONNull = 198;
+  decodeExtensionField = 199;
+  decodeExtensionFieldsAsMessageSet = 200;
+  decodeJSON = 201;
+  decodeMapField = 202;
+  decodeMessage = 203;
+  decoder = 204;
+  decodeRepeated = 205;
+  decodeRepeatedBoolField = 206;
+  decodeRepeatedBytesField = 207;
+  decodeRepeatedDoubleField = 208;
+  decodeRepeatedEnumField = 209;
+  decodeRepeatedFixed32Field = 210;
+  decodeRepeatedFixed64Field = 211;
+  decodeRepeatedFloatField = 212;
+  decodeRepeatedGroupField = 213;
+  decodeRepeatedInt32Field = 214;
+  decodeRepeatedInt64Field = 215;
+  decodeRepeatedMessageField = 216;
+  decodeRepeatedSFixed32Field = 217;
+  decodeRepeatedSFixed64Field = 218;
+  decodeRepeatedSInt32Field = 219;
+  decodeRepeatedSInt64Field = 220;
+  decodeRepeatedStringField = 221;
+  decodeRepeatedUInt32Field = 222;
+  decodeRepeatedUInt64Field = 223;
+  decodeSingular = 224;
+  decodeSingularBoolField = 225;
+  decodeSingularBytesField = 226;
+  decodeSingularDoubleField = 227;
+  decodeSingularEnumField = 228;
+  decodeSingularFixed32Field = 229;
+  decodeSingularFixed64Field = 230;
+  decodeSingularFloatField = 231;
+  decodeSingularGroupField = 232;
+  decodeSingularInt32Field = 233;
+  decodeSingularInt64Field = 234;
+  decodeSingularMessageField = 235;
+  decodeSingularSFixed32Field = 236;
+  decodeSingularSFixed64Field = 237;
+  decodeSingularSInt32Field = 238;
+  decodeSingularSInt64Field = 239;
+  decodeSingularStringField = 240;
+  decodeSingularUInt32Field = 241;
+  decodeSingularUInt64Field = 242;
+  decodeTextFormat = 243;
+  defaultAnyTypeURLPrefix = 244;
+  defaults = 245;
+  defaultValue = 246;
+  dependency = 247;
+  deprecated = 248;
+  deprecatedLegacyJsonFieldConflicts = 249;
+  deprecationWarning = 250;
+  description = 251;
+  DescriptorProto = 252;
+  Dictionary = 253;
+  dictionaryLiteral = 254;
+  digit = 255;
+  digit0 = 256;
+  digit1 = 257;
+  digitCount = 258;
+  digits = 259;
+  digitValue = 260;
+  discardableResult = 261;
+  discardUnknownFields = 262;
+  Double = 263;
+  doubleValue = 264;
+  duration = 265;
+  E = 266;
+  edition = 267;
+  EditionDefault = 268;
+  editionDefaults = 269;
+  editionDeprecated = 270;
+  editionIntroduced = 271;
+  editionRemoved = 272;
+  Element = 273;
+  elements = 274;
+  else = 275;
+  emitExtensionFieldName = 276;
+  emitFieldName = 277;
+  emitFieldNumber = 278;
+  Empty = 279;
+  emptyAnyTypeURL = 280;
+  emptyData = 281;
+  encodeAsBytes = 282;
+  encoded = 283;
+  encodedJSONString = 284;
+  encodedSize = 285;
+  encodeField = 286;
+  encoder = 287;
+  end = 288;
+  endArray = 289;
+  endMessageField = 290;
+  endObject = 291;
+  endRegularField = 292;
+  enforceNamingStyle = 293;
+  enum = 294;
+  EnumDescriptorProto = 295;
+  EnumOptions = 296;
+  EnumReservedRange = 297;
+  enumType = 298;
+  enumvalue = 299;
+  EnumValueDescriptorProto = 300;
+  EnumValueOptions = 301;
+  Equatable = 302;
+  Error = 303;
+  ExpressibleByArrayLiteral = 304;
+  ExpressibleByDictionaryLiteral = 305;
+  ext = 306;
+  extDecoder = 307;
+  extendedGraphemeClusterLiteral = 308;
+  ExtendedGraphemeClusterLiteralType = 309;
+  extendee = 310;
+  ExtensibleMessage = 311;
+  extension = 312;
+  ExtensionField = 313;
+  extensionFieldNumber = 314;
+  ExtensionFieldValueSet = 315;
+  ExtensionMap = 316;
+  extensionRange = 317;
+  ExtensionRangeOptions = 318;
+  extensions = 319;
+  extras = 320;
+  F = 321;
+  false = 322;
+  features = 323;
+  FeatureSet = 324;
+  FeatureSetDefaults = 325;
+  FeatureSetEditionDefault = 326;
+  featureSupport = 327;
+  field = 328;
+  fieldData = 329;
+  FieldDescriptorProto = 330;
+  FieldMask = 331;
+  FieldMaskError = 332;
+  fieldName = 333;
+  fieldNameCount = 334;
+  fieldNum = 335;
+  fieldNumber = 336;
+  fieldNumberForProto = 337;
+  FieldOptions = 338;
+  fieldPresence = 339;
+  fields = 340;
+  fieldSize = 341;
+  FieldTag = 342;
+  FieldType = 343;
+  file = 344;
+  FileDescriptorProto = 345;
+  FileDescriptorSet = 346;
+  fileName = 347;
+  FileOptions = 348;
+  filter = 349;
+  final = 350;
+  finiteOnly = 351;
+  first = 352;
+  firstItem = 353;
+  fixedFeatures = 354;
+  Float = 355;
+  floatLiteral = 356;
+  FloatLiteralType = 357;
+  FloatValue = 358;
+  for = 359;
+  forMessageName = 360;
+  formUnion = 361;
+  forReadingFrom = 362;
+  forTypeURL = 363;
+  ForwardParser = 364;
+  forWritingInto = 365;
+  from = 366;
+  fromAscii2 = 367;
+  fromAscii4 = 368;
+  fromByteOffset = 369;
+  fromHexDigit = 370;
+  fullName = 371;
+  func = 372;
+  function = 373;
+  G = 374;
+  GeneratedCodeInfo = 375;
+  get = 376;
+  getExtensionValue = 377;
+  googleapis = 378;
+  Google_Protobuf_Any = 379;
+  Google_Protobuf_Api = 380;
+  Google_Protobuf_BoolValue = 381;
+  Google_Protobuf_BytesValue = 382;
+  Google_Protobuf_DescriptorProto = 383;
+  Google_Protobuf_DoubleValue = 384;
+  Google_Protobuf_Duration = 385;
+  Google_Protobuf_Edition = 386;
+  Google_Protobuf_Empty = 387;
+  Google_Protobuf_Enum = 388;
+  Google_Protobuf_EnumDescriptorProto = 389;
+  Google_Protobuf_EnumOptions = 390;
+  Google_Protobuf_EnumValue = 391;
+  Google_Protobuf_EnumValueDescriptorProto = 392;
+  Google_Protobuf_EnumValueOptions = 393;
+  Google_Protobuf_ExtensionRangeOptions = 394;
+  Google_Protobuf_FeatureSet = 395;
+  Google_Protobuf_FeatureSetDefaults = 396;
+  Google_Protobuf_Field = 397;
+  Google_Protobuf_FieldDescriptorProto = 398;
+  Google_Protobuf_FieldMask = 399;
+  Google_Protobuf_FieldOptions = 400;
+  Google_Protobuf_FileDescriptorProto = 401;
+  Google_Protobuf_FileDescriptorSet = 402;
+  Google_Protobuf_FileOptions = 403;
+  Google_Protobuf_FloatValue = 404;
+  Google_Protobuf_GeneratedCodeInfo = 405;
+  Google_Protobuf_Int32Value = 406;
+  Google_Protobuf_Int64Value = 407;
+  Google_Protobuf_ListValue = 408;
+  Google_Protobuf_MessageOptions = 409;
+  Google_Protobuf_Method = 410;
+  Google_Protobuf_MethodDescriptorProto = 411;
+  Google_Protobuf_MethodOptions = 412;
+  Google_Protobuf_Mixin = 413;
+  Google_Protobuf_NullValue = 414;
+  Google_Protobuf_OneofDescriptorProto = 415;
+  Google_Protobuf_OneofOptions = 416;
+  Google_Protobuf_Option = 417;
+  Google_Protobuf_ServiceDescriptorProto = 418;
+  Google_Protobuf_ServiceOptions = 419;
+  Google_Protobuf_SourceCodeInfo = 420;
+  Google_Protobuf_SourceContext = 421;
+  Google_Protobuf_StringValue = 422;
+  Google_Protobuf_Struct = 423;
+  Google_Protobuf_Syntax = 424;
+  Google_Protobuf_Timestamp = 425;
+  Google_Protobuf_Type = 426;
+  Google_Protobuf_UInt32Value = 427;
+  Google_Protobuf_UInt64Value = 428;
+  Google_Protobuf_UninterpretedOption = 429;
+  Google_Protobuf_Value = 430;
+  goPackage = 431;
+  group = 432;
+  groupFieldNumberStack = 433;
+  groupSize = 434;
+  guard = 435;
+  hadOneofValue = 436;
+  handleConflictingOneOf = 437;
+  hasAggregateValue = 438;
+  hasAllowAlias = 439;
+  hasBegin = 440;
+  hasCcEnableArenas = 441;
+  hasCcGenericServices = 442;
+  hasClientStreaming = 443;
+  hasCsharpNamespace = 444;
+  hasCtype = 445;
+  hasDebugRedact = 446;
+  hasDefaultValue = 447;
+  hasDeprecated = 448;
+  hasDeprecatedLegacyJsonFieldConflicts = 449;
+  hasDeprecationWarning = 450;
+  hasDoubleValue = 451;
+  hasEdition = 452;
+  hasEditionDeprecated = 453;
+  hasEditionIntroduced = 454;
+  hasEditionRemoved = 455;
+  hasEnd = 456;
+  hasEnforceNamingStyle = 457;
+  hasEnumType = 458;
+  hasExtendee = 459;
+  hasExtensionValue = 460;
+  hasFeatures = 461;
+  hasFeatureSupport = 462;
+  hasFieldPresence = 463;
+  hasFixedFeatures = 464;
+  hasFullName = 465;
+  hasGoPackage = 466;
+  hash = 467;
+  Hashable = 468;
+  hasher = 469;
+  HashVisitor = 470;
+  hasIdempotencyLevel = 471;
+  hasIdentifierValue = 472;
+  hasInputType = 473;
+  hasIsExtension = 474;
+  hasJavaGenerateEqualsAndHash = 475;
+  hasJavaGenericServices = 476;
+  hasJavaMultipleFiles = 477;
+  hasJavaOuterClassname = 478;
+  hasJavaPackage = 479;
+  hasJavaStringCheckUtf8 = 480;
+  hasJsonFormat = 481;
+  hasJsonName = 482;
+  hasJstype = 483;
+  hasLabel = 484;
+  hasLazy = 485;
+  hasLeadingComments = 486;
+  hasMapEntry = 487;
+  hasMaximumEdition = 488;
+  hasMessageEncoding = 489;
+  hasMessageSetWireFormat = 490;
+  hasMinimumEdition = 491;
+  hasName = 492;
+  hasNamePart = 493;
+  hasNegativeIntValue = 494;
+  hasNoStandardDescriptorAccessor = 495;
+  hasNumber = 496;
+  hasObjcClassPrefix = 497;
+  hasOneofIndex = 498;
+  hasOptimizeFor = 499;
+  hasOptions = 500;
+  hasOutputType = 501;
+  hasOverridableFeatures = 502;
+  hasPackage = 503;
+  hasPacked = 504;
+  hasPhpClassPrefix = 505;
+  hasPhpMetadataNamespace = 506;
+  hasPhpNamespace = 507;
+  hasPositiveIntValue = 508;
+  hasProto3Optional = 509;
+  hasPyGenericServices = 510;
+  hasRepeated = 511;
+  hasRepeatedFieldEncoding = 512;
+  hasReserved = 513;
+  hasRetention = 514;
+  hasRubyPackage = 515;
+  hasSemantic = 516;
+  hasServerStreaming = 517;
+  hasSourceCodeInfo = 518;
+  hasSourceContext = 519;
+  hasSourceFile = 520;
+  hasStart = 521;
+  hasStringValue = 522;
+  hasSwiftPrefix = 523;
+  hasSyntax = 524;
+  hasTrailingComments = 525;
+  hasType = 526;
+  hasTypeName = 527;
+  hasUnverifiedLazy = 528;
+  hasUtf8Validation = 529;
+  hasValue = 530;
+  hasVerification = 531;
+  hasWeak = 532;
+  hour = 533;
+  i = 534;
+  idempotencyLevel = 535;
+  identifierValue = 536;
+  if = 537;
+  ignoreUnknownExtensionFields = 538;
+  ignoreUnknownFields = 539;
+  index = 540;
+  init = 541;
+  inout = 542;
+  inputType = 543;
+  insert = 544;
+  Int = 545;
+  Int32 = 546;
+  Int32Value = 547;
+  Int64 = 548;
+  Int64Value = 549;
+  Int8 = 550;
+  integerLiteral = 551;
+  IntegerLiteralType = 552;
+  intern = 553;
+  Internal = 554;
+  InternalState = 555;
+  intersect = 556;
+  into = 557;
+  ints = 558;
+  invalidAnyTypeURL = 559;
+  isA = 560;
+  isEqual = 561;
+  isEqualTo = 562;
+  isExtension = 563;
+  isInitialized = 564;
+  isNegative = 565;
+  isPathValid = 566;
+  isValid = 567;
+  itemTagsEncodedSize = 568;
+  iterator = 569;
+  javaGenerateEqualsAndHash = 570;
+  javaGenericServices = 571;
+  javaMultipleFiles = 572;
+  javaOuterClassname = 573;
+  javaPackage = 574;
+  javaStringCheckUtf8 = 575;
+  JSONDecoder = 576;
+  JSONDecoding = 577;
+  JSONDecodingError = 578;
+  JSONDecodingOptions = 579;
+  jsonEncoder = 580;
+  JSONEncoding = 581;
+  JSONEncodingError = 582;
+  JSONEncodingOptions = 583;
+  JSONEncodingVisitor = 584;
+  jsonFormat = 585;
+  JSONMapEncodingVisitor = 586;
+  jsonName = 587;
+  jsonPath = 588;
+  jsonPaths = 589;
+  JSONScanner = 590;
+  jsonString = 591;
+  jsonText = 592;
+  jsonUTF8Bytes = 593;
+  jsonUTF8Data = 594;
+  jstype = 595;
+  k = 596;
+  kChunkSize = 597;
+  Key = 598;
+  keyField = 599;
+  keyFieldOpt = 600;
+  KeyType = 601;
+  kind = 602;
+  l = 603;
+  label = 604;
+  lazy = 605;
+  leadingComments = 606;
+  leadingDetachedComments = 607;
+  length = 608;
+  lessThan = 609;
+  let = 610;
+  lhs = 611;
+  line = 612;
+  list = 613;
+  listOfMessages = 614;
+  listValue = 615;
+  littleEndian = 616;
+  load = 617;
+  localHasher = 618;
+  location = 619;
+  M = 620;
+  major = 621;
+  makeAsyncIterator = 622;
+  makeIterator = 623;
+  malformedLength = 624;
+  mapEntry = 625;
+  MapKeyType = 626;
+  mapToMessages = 627;
+  MapValueType = 628;
+  mapVisitor = 629;
+  mask = 630;
+  maximumEdition = 631;
+  mdayStart = 632;
+  merge = 633;
+  MergeOptions = 634;
+  message = 635;
+  messageDepthLimit = 636;
+  messageEncoding = 637;
+  MessageExtension = 638;
+  MessageImplementationBase = 639;
+  MessageOptions = 640;
+  MessageSet = 641;
+  messageSetWireFormat = 642;
+  messageSize = 643;
+  messageType = 644;
+  Method = 645;
+  MethodDescriptorProto = 646;
+  MethodOptions = 647;
+  methods = 648;
+  min = 649;
+  minimumEdition = 650;
+  minor = 651;
+  Mixin = 652;
+  mixins = 653;
+  modify = 654;
+  month = 655;
+  msgExtension = 656;
+  mutating = 657;
+  n = 658;
+  name = 659;
+  NameDescription = 660;
+  NameMap = 661;
+  NamePart = 662;
+  names = 663;
+  nanos = 664;
+  negativeIntValue = 665;
+  nestedType = 666;
+  newExtensible = 667;
+  newL = 668;
+  newList = 669;
+  newMessage = 670;
+  newValue = 671;
+  next = 672;
+  nextByte = 673;
+  nextFieldNumber = 674;
+  nextVarInt = 675;
+  nil = 676;
+  nilLiteral = 677;
+  noBytesAvailable = 678;
+  noStandardDescriptorAccessor = 679;
+  nullValue = 680;
+  number = 681;
+  numberValue = 682;
+  objcClassPrefix = 683;
+  of = 684;
+  oneofDecl = 685;
+  OneofDescriptorProto = 686;
+  oneofIndex = 687;
+  OneofOptions = 688;
+  oneofs = 689;
+  OneOf_Kind = 690;
+  optimizeFor = 691;
+  OptimizeMode = 692;
+  Option = 693;
+  OptionalEnumExtensionField = 694;
+  OptionalExtensionField = 695;
+  OptionalGroupExtensionField = 696;
+  OptionalMessageExtensionField = 697;
+  OptionRetention = 698;
+  options = 699;
+  OptionTargetType = 700;
+  other = 701;
+  others = 702;
+  out = 703;
+  outputType = 704;
+  overridableFeatures = 705;
+  p = 706;
+  package = 707;
+  packed = 708;
+  PackedEnumExtensionField = 709;
+  PackedExtensionField = 710;
+  padding = 711;
+  parent = 712;
+  parse = 713;
+  partial = 714;
+  path = 715;
+  PathDecoder = 716;
+  PathDecodingError = 717;
+  paths = 718;
+  PathVisitor = 719;
+  payload = 720;
+  payloadSize = 721;
+  phpClassPrefix = 722;
+  phpMetadataNamespace = 723;
+  phpNamespace = 724;
+  pos = 725;
+  positiveIntValue = 726;
+  prefix = 727;
+  preserveProtoFieldNames = 728;
+  preTraverse = 729;
+  prevPath = 730;
+  printUnknownFields = 731;
+  proto2 = 732;
+  proto3DefaultValue = 733;
+  proto3Optional = 734;
+  ProtobufAPIVersionCheck = 735;
+  ProtobufAPIVersion_2 = 736;
+  ProtobufBool = 737;
+  ProtobufBytes = 738;
+  ProtobufDouble = 739;
+  ProtobufEnumMap = 740;
+  protobufExtension = 741;
+  ProtobufFixed32 = 742;
+  ProtobufFixed64 = 743;
+  ProtobufFloat = 744;
+  ProtobufInt32 = 745;
+  ProtobufInt64 = 746;
+  ProtobufMap = 747;
+  ProtobufMessageMap = 748;
+  ProtobufSFixed32 = 749;
+  ProtobufSFixed64 = 750;
+  ProtobufSInt32 = 751;
+  ProtobufSInt64 = 752;
+  ProtobufString = 753;
+  ProtobufUInt32 = 754;
+  ProtobufUInt64 = 755;
+  protobuf_extensionFieldValues = 756;
+  protobuf_fieldNumber = 757;
+  protobuf_generated_isEqualTo = 758;
+  protobuf_nameMap = 759;
+  protobuf_newField = 760;
+  protobuf_package = 761;
+  protocol = 762;
+  protoFieldName = 763;
+  protoMessageName = 764;
+  ProtoNameProviding = 765;
+  protoPaths = 766;
+  public = 767;
+  publicDependency = 768;
+  putBoolValue = 769;
+  putBytesValue = 770;
+  putDoubleValue = 771;
+  putEnumValue = 772;
+  putFixedUInt32 = 773;
+  putFixedUInt64 = 774;
+  putFloatValue = 775;
+  putInt64 = 776;
+  putStringValue = 777;
+  putUInt64 = 778;
+  putUInt64Hex = 779;
+  putVarInt = 780;
+  putZigZagVarInt = 781;
+  pyGenericServices = 782;
+  R = 783;
+  rawChars = 784;
+  RawRepresentable = 785;
+  RawValue = 786;
+  read4HexDigits = 787;
+  readBytes = 788;
+  register = 789;
+  removingAllFieldsOf = 790;
+  repeated = 791;
+  RepeatedEnumExtensionField = 792;
+  RepeatedExtensionField = 793;
+  repeatedFieldEncoding = 794;
+  RepeatedGroupExtensionField = 795;
+  RepeatedMessageExtensionField = 796;
+  repeating = 797;
+  replaceRepeatedFields = 798;
+  requestStreaming = 799;
+  requestTypeURL = 800;
+  requiredSize = 801;
+  responseStreaming = 802;
+  responseTypeURL = 803;
+  result = 804;
+  retention = 805;
+  rethrows = 806;
+  return = 807;
+  ReturnType = 808;
+  revision = 809;
+  rhs = 810;
+  root = 811;
+  rubyPackage = 812;
+  s = 813;
+  sawBackslash = 814;
+  sawSection4Characters = 815;
+  sawSection5Characters = 816;
+  scan = 817;
+  scanner = 818;
+  seconds = 819;
+  self = 820;
+  semantic = 821;
+  Sendable = 822;
+  separator = 823;
+  serialize = 824;
+  serializedBytes = 825;
+  serializedData = 826;
+  serializedSize = 827;
+  serverStreaming = 828;
+  service = 829;
+  ServiceDescriptorProto = 830;
+  ServiceOptions = 831;
+  set = 832;
+  setExtensionValue = 833;
+  shift = 834;
+  SimpleExtensionMap = 835;
+  size = 836;
+  sizer = 837;
+  source = 838;
+  sourceCodeInfo = 839;
+  sourceContext = 840;
+  sourceEncoding = 841;
+  sourceFile = 842;
+  SourceLocation = 843;
+  span = 844;
+  split = 845;
+  start = 846;
+  startArray = 847;
+  startArrayObject = 848;
+  startField = 849;
+  startIndex = 850;
+  startMessageField = 851;
+  startObject = 852;
+  startRegularField = 853;
+  state = 854;
+  static = 855;
+  StaticString = 856;
+  storage = 857;
+  String = 858;
+  stringLiteral = 859;
+  StringLiteralType = 860;
+  stringResult = 861;
+  stringValue = 862;
+  struct = 863;
+  structValue = 864;
+  subDecoder = 865;
+  subscript = 866;
+  subtract = 867;
+  subVisitor = 868;
+  Swift = 869;
+  swiftPrefix = 870;
+  SwiftProtobufContiguousBytes = 871;
+  SwiftProtobufError = 872;
+  syntax = 873;
+  T = 874;
+  tag = 875;
+  targets = 876;
+  terminator = 877;
+  testDecoder = 878;
+  text = 879;
+  textDecoder = 880;
+  TextFormatDecoder = 881;
+  TextFormatDecodingError = 882;
+  TextFormatDecodingOptions = 883;
+  TextFormatEncodingOptions = 884;
+  TextFormatEncodingVisitor = 885;
+  textFormatString = 886;
+  throwOrIgnore = 887;
+  throws = 888;
+  timeInterval = 889;
+  timeIntervalSince1970 = 890;
+  timeIntervalSinceReferenceDate = 891;
+  Timestamp = 892;
+  tmp = 893;
+  tooLarge = 894;
+  total = 895;
+  totalArrayDepth = 896;
+  totalSize = 897;
+  trailingComments = 898;
+  traverse = 899;
+  trim = 900;
+  true = 901;
+  try = 902;
+  type = 903;
+  typealias = 904;
+  TypeEnum = 905;
+  typeName = 906;
+  typePrefix = 907;
+  typeStart = 908;
+  typeUnknown = 909;
+  typeURL = 910;
+  UInt32 = 911;
+  UInt32Value = 912;
+  UInt64 = 913;
+  UInt64Value = 914;
+  UInt8 = 915;
+  unchecked = 916;
+  unicodeScalarLiteral = 917;
+  UnicodeScalarLiteralType = 918;
+  unicodeScalars = 919;
+  UnicodeScalarView = 920;
+  uninterpretedOption = 921;
+  union = 922;
+  uniqueStorage = 923;
+  unknown = 924;
+  unknownFields = 925;
+  UnknownStorage = 926;
+  unpackTo = 927;
+  UnsafeBufferPointer = 928;
+  UnsafeMutablePointer = 929;
+  UnsafeMutableRawBufferPointer = 930;
+  UnsafeRawBufferPointer = 931;
+  UnsafeRawPointer = 932;
+  unverifiedLazy = 933;
+  updatedOptions = 934;
+  url = 935;
+  useDeterministicOrdering = 936;
+  utf8 = 937;
+  utf8Ptr = 938;
+  utf8ToDouble = 939;
+  utf8Validation = 940;
+  UTF8View = 941;
+  v = 942;
+  value = 943;
+  valueField = 944;
+  values = 945;
+  ValueType = 946;
+  var = 947;
+  verification = 948;
+  VerificationState = 949;
+  Version = 950;
+  versionString = 951;
+  visitExtensionFields = 952;
+  visitExtensionFieldsAsMessageSet = 953;
+  visitMapField = 954;
+  visitor = 955;
+  visitPacked = 956;
+  visitPackedBoolField = 957;
+  visitPackedDoubleField = 958;
+  visitPackedEnumField = 959;
+  visitPackedFixed32Field = 960;
+  visitPackedFixed64Field = 961;
+  visitPackedFloatField = 962;
+  visitPackedInt32Field = 963;
+  visitPackedInt64Field = 964;
+  visitPackedSFixed32Field = 965;
+  visitPackedSFixed64Field = 966;
+  visitPackedSInt32Field = 967;
+  visitPackedSInt64Field = 968;
+  visitPackedUInt32Field = 969;
+  visitPackedUInt64Field = 970;
+  visitRepeated = 971;
+  visitRepeatedBoolField = 972;
+  visitRepeatedBytesField = 973;
+  visitRepeatedDoubleField = 974;
+  visitRepeatedEnumField = 975;
+  visitRepeatedFixed32Field = 976;
+  visitRepeatedFixed64Field = 977;
+  visitRepeatedFloatField = 978;
+  visitRepeatedGroupField = 979;
+  visitRepeatedInt32Field = 980;
+  visitRepeatedInt64Field = 981;
+  visitRepeatedMessageField = 982;
+  visitRepeatedSFixed32Field = 983;
+  visitRepeatedSFixed64Field = 984;
+  visitRepeatedSInt32Field = 985;
+  visitRepeatedSInt64Field = 986;
+  visitRepeatedStringField = 987;
+  visitRepeatedUInt32Field = 988;
+  visitRepeatedUInt64Field = 989;
+  visitSingular = 990;
+  visitSingularBoolField = 991;
+  visitSingularBytesField = 992;
+  visitSingularDoubleField = 993;
+  visitSingularEnumField = 994;
+  visitSingularFixed32Field = 995;
+  visitSingularFixed64Field = 996;
+  visitSingularFloatField = 997;
+  visitSingularGroupField = 998;
+  visitSingularInt32Field = 999;
+  visitSingularInt64Field = 1000;
+  visitSingularMessageField = 1001;
+  visitSingularSFixed32Field = 1002;
+  visitSingularSFixed64Field = 1003;
+  visitSingularSInt32Field = 1004;
+  visitSingularSInt64Field = 1005;
+  visitSingularStringField = 1006;
+  visitSingularUInt32Field = 1007;
+  visitSingularUInt64Field = 1008;
+  visitUnknown = 1009;
+  wasDecoded = 1010;
+  weak = 1011;
+  weakDependency = 1012;
+  where = 1013;
+  wireFormat = 1014;
+  with = 1015;
+  withUnsafeBytes = 1016;
+  withUnsafeMutableBytes = 1017;
+  work = 1018;
+  Wrapped = 1019;
+  WrappedType = 1020;
+  wrappedValue = 1021;
+  written = 1022;
+  yday = 1023;
 }
diff --git a/Protos/SwiftProtobufTests/generated_swift_names_enums.proto b/Protos/SwiftProtobufTests/generated_swift_names_enums.proto
index ff5668f13..507fa67ed 100644
--- a/Protos/SwiftProtobufTests/generated_swift_names_enums.proto
+++ b/Protos/SwiftProtobufTests/generated_swift_names_enums.proto
@@ -100,6 +100,7 @@ message GeneratedSwiftReservedEnums {
   enum clearEditionIntroduced { NONE_clearEditionIntroduced = 0; }
   enum clearEditionRemoved { NONE_clearEditionRemoved = 0; }
   enum clearEnd { NONE_clearEnd = 0; }
+  enum clearEnforceNamingStyle { NONE_clearEnforceNamingStyle = 0; }
   enum clearEnumType { NONE_clearEnumType = 0; }
   enum clearExtendee { NONE_clearExtendee = 0; }
   enum clearExtensionValue { NONE_clearExtensionValue = 0; }
@@ -267,7 +268,7 @@ message GeneratedSwiftReservedEnums {
   enum discardUnknownFields { NONE_discardUnknownFields = 0; }
   enum Double { NONE_Double = 0; }
   enum doubleValue { NONE_doubleValue = 0; }
-  enum Duration { NONE_Duration = 0; }
+  enum duration { NONE_duration = 0; }
   enum E { NONE_E = 0; }
   enum edition { NONE_edition = 0; }
   enum EditionDefault { NONE_EditionDefault = 0; }
@@ -282,6 +283,7 @@ message GeneratedSwiftReservedEnums {
   enum emitFieldName { NONE_emitFieldName = 0; }
   enum emitFieldNumber { NONE_emitFieldNumber = 0; }
   enum Empty { NONE_Empty = 0; }
+  enum emptyAnyTypeURL { NONE_emptyAnyTypeURL = 0; }
   enum emptyData { NONE_emptyData = 0; }
   enum encodeAsBytes { NONE_encodeAsBytes = 0; }
   enum encoded { NONE_encoded = 0; }
@@ -294,6 +296,7 @@ message GeneratedSwiftReservedEnums {
   enum endMessageField { NONE_endMessageField = 0; }
   enum endObject { NONE_endObject = 0; }
   enum endRegularField { NONE_endRegularField = 0; }
+  enum enforceNamingStyle { NONE_enforceNamingStyle = 0; }
   enum enum { NONE_enum = 0; }
   enum EnumDescriptorProto { NONE_EnumDescriptorProto = 0; }
   enum EnumOptions { NONE_EnumOptions = 0; }
@@ -457,6 +460,7 @@ message GeneratedSwiftReservedEnums {
   enum hasEditionIntroduced { NONE_hasEditionIntroduced = 0; }
   enum hasEditionRemoved { NONE_hasEditionRemoved = 0; }
   enum hasEnd { NONE_hasEnd = 0; }
+  enum hasEnforceNamingStyle { NONE_hasEnforceNamingStyle = 0; }
   enum hasEnumType { NONE_hasEnumType = 0; }
   enum hasExtendee { NONE_hasExtendee = 0; }
   enum hasExtensionValue { NONE_hasExtensionValue = 0; }
@@ -558,6 +562,7 @@ message GeneratedSwiftReservedEnums {
   enum intersect { NONE_intersect = 0; }
   enum into { NONE_into = 0; }
   enum ints { NONE_ints = 0; }
+  enum invalidAnyTypeURL { NONE_invalidAnyTypeURL = 0; }
   enum isA { NONE_isA = 0; }
   enum isEqual { NONE_isEqual = 0; }
   enum isEqualTo { NONE_isEqualTo = 0; }
@@ -575,9 +580,11 @@ message GeneratedSwiftReservedEnums {
   enum javaPackage { NONE_javaPackage = 0; }
   enum javaStringCheckUtf8 { NONE_javaStringCheckUtf8 = 0; }
   enum JSONDecoder { NONE_JSONDecoder = 0; }
+  enum JSONDecoding { NONE_JSONDecoding = 0; }
   enum JSONDecodingError { NONE_JSONDecodingError = 0; }
   enum JSONDecodingOptions { NONE_JSONDecodingOptions = 0; }
   enum jsonEncoder { NONE_jsonEncoder = 0; }
+  enum JSONEncoding { NONE_JSONEncoding = 0; }
   enum JSONEncodingError { NONE_JSONEncodingError = 0; }
   enum JSONEncodingOptions { NONE_JSONEncodingOptions = 0; }
   enum JSONEncodingVisitor { NONE_JSONEncodingVisitor = 0; }
diff --git a/Protos/SwiftProtobufTests/generated_swift_names_fields.proto b/Protos/SwiftProtobufTests/generated_swift_names_fields.proto
index 5f3ea3de6..5629a4ace 100644
--- a/Protos/SwiftProtobufTests/generated_swift_names_fields.proto
+++ b/Protos/SwiftProtobufTests/generated_swift_names_fields.proto
@@ -100,924 +100,931 @@ message GeneratedSwiftReservedFields {
   int32 clearEditionIntroduced = 94;
   int32 clearEditionRemoved = 95;
   int32 clearEnd = 96;
-  int32 clearEnumType = 97;
-  int32 clearExtendee = 98;
-  int32 clearExtensionValue = 99;
-  int32 clearFeatures = 100;
-  int32 clearFeatureSupport = 101;
-  int32 clearFieldPresence = 102;
-  int32 clearFixedFeatures = 103;
-  int32 clearFullName = 104;
-  int32 clearGoPackage = 105;
-  int32 clearIdempotencyLevel = 106;
-  int32 clearIdentifierValue = 107;
-  int32 clearInputType = 108;
-  int32 clearIsExtension = 109;
-  int32 clearJavaGenerateEqualsAndHash = 110;
-  int32 clearJavaGenericServices = 111;
-  int32 clearJavaMultipleFiles = 112;
-  int32 clearJavaOuterClassname = 113;
-  int32 clearJavaPackage = 114;
-  int32 clearJavaStringCheckUtf8 = 115;
-  int32 clearJsonFormat = 116;
-  int32 clearJsonName = 117;
-  int32 clearJstype = 118;
-  int32 clearLabel = 119;
-  int32 clearLazy = 120;
-  int32 clearLeadingComments = 121;
-  int32 clearMapEntry = 122;
-  int32 clearMaximumEdition = 123;
-  int32 clearMessageEncoding = 124;
-  int32 clearMessageSetWireFormat = 125;
-  int32 clearMinimumEdition = 126;
-  int32 clearName = 127;
-  int32 clearNamePart = 128;
-  int32 clearNegativeIntValue = 129;
-  int32 clearNoStandardDescriptorAccessor = 130;
-  int32 clearNumber = 131;
-  int32 clearObjcClassPrefix = 132;
-  int32 clearOneofIndex = 133;
-  int32 clearOptimizeFor = 134;
-  int32 clearOptions = 135;
-  int32 clearOutputType = 136;
-  int32 clearOverridableFeatures = 137;
-  int32 clearPackage = 138;
-  int32 clearPacked = 139;
-  int32 clearPhpClassPrefix = 140;
-  int32 clearPhpMetadataNamespace = 141;
-  int32 clearPhpNamespace = 142;
-  int32 clearPositiveIntValue = 143;
-  int32 clearProto3Optional = 144;
-  int32 clearPyGenericServices = 145;
-  int32 clearRepeated = 146;
-  int32 clearRepeatedFieldEncoding = 147;
-  int32 clearReserved = 148;
-  int32 clearRetention = 149;
-  int32 clearRubyPackage = 150;
-  int32 clearSemantic = 151;
-  int32 clearServerStreaming = 152;
-  int32 clearSourceCodeInfo = 153;
-  int32 clearSourceContext = 154;
-  int32 clearSourceFile = 155;
-  int32 clearStart = 156;
-  int32 clearStringValue = 157;
-  int32 clearSwiftPrefix = 158;
-  int32 clearSyntax = 159;
-  int32 clearTrailingComments = 160;
-  int32 clearType = 161;
-  int32 clearTypeName = 162;
-  int32 clearUnverifiedLazy = 163;
-  int32 clearUtf8Validation = 164;
-  int32 clearValue = 165;
-  int32 clearVerification = 166;
-  int32 clearWeak = 167;
-  int32 clientStreaming = 168;
-  int32 code = 169;
-  int32 codePoint = 170;
-  int32 codeUnits = 171;
-  int32 Collection = 172;
-  int32 com = 173;
-  int32 comma = 174;
-  int32 consumedBytes = 175;
-  int32 contains = 176;
-  int32 contentsOf = 177;
-  int32 ContiguousBytes = 178;
-  int32 copy = 179;
-  int32 count = 180;
-  int32 countVarintsInBuffer = 181;
-  int32 csharpNamespace = 182;
-  int32 ctype = 183;
-  int32 customCodable = 184;
-  int32 CustomDebugStringConvertible = 185;
-  int32 CustomStringConvertible = 186;
-  int32 d = 187;
-  int32 Data = 188;
-  int32 dataResult = 189;
-  int32 date = 190;
-  int32 daySec = 191;
-  int32 daysSinceEpoch = 192;
-  int32 debugDescription = 193;
-  int32 debugRedact = 194;
-  int32 declaration = 195;
-  int32 decoded = 196;
-  int32 decodedFromJSONNull = 197;
-  int32 decodeExtensionField = 198;
-  int32 decodeExtensionFieldsAsMessageSet = 199;
-  int32 decodeJSON = 200;
-  int32 decodeMapField = 201;
-  int32 decodeMessage = 202;
-  int32 decoder = 203;
-  int32 decodeRepeated = 204;
-  int32 decodeRepeatedBoolField = 205;
-  int32 decodeRepeatedBytesField = 206;
-  int32 decodeRepeatedDoubleField = 207;
-  int32 decodeRepeatedEnumField = 208;
-  int32 decodeRepeatedFixed32Field = 209;
-  int32 decodeRepeatedFixed64Field = 210;
-  int32 decodeRepeatedFloatField = 211;
-  int32 decodeRepeatedGroupField = 212;
-  int32 decodeRepeatedInt32Field = 213;
-  int32 decodeRepeatedInt64Field = 214;
-  int32 decodeRepeatedMessageField = 215;
-  int32 decodeRepeatedSFixed32Field = 216;
-  int32 decodeRepeatedSFixed64Field = 217;
-  int32 decodeRepeatedSInt32Field = 218;
-  int32 decodeRepeatedSInt64Field = 219;
-  int32 decodeRepeatedStringField = 220;
-  int32 decodeRepeatedUInt32Field = 221;
-  int32 decodeRepeatedUInt64Field = 222;
-  int32 decodeSingular = 223;
-  int32 decodeSingularBoolField = 224;
-  int32 decodeSingularBytesField = 225;
-  int32 decodeSingularDoubleField = 226;
-  int32 decodeSingularEnumField = 227;
-  int32 decodeSingularFixed32Field = 228;
-  int32 decodeSingularFixed64Field = 229;
-  int32 decodeSingularFloatField = 230;
-  int32 decodeSingularGroupField = 231;
-  int32 decodeSingularInt32Field = 232;
-  int32 decodeSingularInt64Field = 233;
-  int32 decodeSingularMessageField = 234;
-  int32 decodeSingularSFixed32Field = 235;
-  int32 decodeSingularSFixed64Field = 236;
-  int32 decodeSingularSInt32Field = 237;
-  int32 decodeSingularSInt64Field = 238;
-  int32 decodeSingularStringField = 239;
-  int32 decodeSingularUInt32Field = 240;
-  int32 decodeSingularUInt64Field = 241;
-  int32 decodeTextFormat = 242;
-  int32 defaultAnyTypeURLPrefix = 243;
-  int32 defaults = 244;
-  int32 defaultValue = 245;
-  int32 dependency = 246;
-  int32 deprecated = 247;
-  int32 deprecatedLegacyJsonFieldConflicts = 248;
-  int32 deprecationWarning = 249;
-  int32 description = 250;
-  int32 DescriptorProto = 251;
-  int32 Dictionary = 252;
-  int32 dictionaryLiteral = 253;
-  int32 digit = 254;
-  int32 digit0 = 255;
-  int32 digit1 = 256;
-  int32 digitCount = 257;
-  int32 digits = 258;
-  int32 digitValue = 259;
-  int32 discardableResult = 260;
-  int32 discardUnknownFields = 261;
-  int32 Double = 262;
-  int32 doubleValue = 263;
-  int32 Duration = 264;
-  int32 E = 265;
-  int32 edition = 266;
-  int32 EditionDefault = 267;
-  int32 editionDefaults = 268;
-  int32 editionDeprecated = 269;
-  int32 editionIntroduced = 270;
-  int32 editionRemoved = 271;
-  int32 Element = 272;
-  int32 elements = 273;
-  int32 else = 274;
-  int32 emitExtensionFieldName = 275;
-  int32 emitFieldName = 276;
-  int32 emitFieldNumber = 277;
-  int32 Empty = 278;
-  int32 emptyData = 279;
-  int32 encodeAsBytes = 280;
-  int32 encoded = 281;
-  int32 encodedJSONString = 282;
-  int32 encodedSize = 283;
-  int32 encodeField = 284;
-  int32 encoder = 285;
-  int32 end = 286;
-  int32 endArray = 287;
-  int32 endMessageField = 288;
-  int32 endObject = 289;
-  int32 endRegularField = 290;
-  int32 enum = 291;
-  int32 EnumDescriptorProto = 292;
-  int32 EnumOptions = 293;
-  int32 EnumReservedRange = 294;
-  int32 enumType = 295;
-  int32 enumvalue = 296;
-  int32 EnumValueDescriptorProto = 297;
-  int32 EnumValueOptions = 298;
-  int32 Equatable = 299;
-  int32 Error = 300;
-  int32 ExpressibleByArrayLiteral = 301;
-  int32 ExpressibleByDictionaryLiteral = 302;
-  int32 ext = 303;
-  int32 extDecoder = 304;
-  int32 extendedGraphemeClusterLiteral = 305;
-  int32 ExtendedGraphemeClusterLiteralType = 306;
-  int32 extendee = 307;
-  int32 ExtensibleMessage = 308;
-  int32 extension = 309;
-  int32 ExtensionField = 310;
-  int32 extensionFieldNumber = 311;
-  int32 ExtensionFieldValueSet = 312;
-  int32 ExtensionMap = 313;
-  int32 extensionRange = 314;
-  int32 ExtensionRangeOptions = 315;
-  int32 extensions = 316;
-  int32 extras = 317;
-  int32 F = 318;
-  int32 false = 319;
-  int32 features = 320;
-  int32 FeatureSet = 321;
-  int32 FeatureSetDefaults = 322;
-  int32 FeatureSetEditionDefault = 323;
-  int32 featureSupport = 324;
-  int32 field = 325;
-  int32 fieldData = 326;
-  int32 FieldDescriptorProto = 327;
-  int32 FieldMask = 328;
-  int32 FieldMaskError = 329;
-  int32 fieldName = 330;
-  int32 fieldNameCount = 331;
-  int32 fieldNum = 332;
-  int32 fieldNumber = 333;
-  int32 fieldNumberForProto = 334;
-  int32 FieldOptions = 335;
-  int32 fieldPresence = 336;
-  int32 fields = 337;
-  int32 fieldSize = 338;
-  int32 FieldTag = 339;
-  int32 FieldType = 340;
-  int32 file = 341;
-  int32 FileDescriptorProto = 342;
-  int32 FileDescriptorSet = 343;
-  int32 fileName = 344;
-  int32 FileOptions = 345;
-  int32 filter = 346;
-  int32 final = 347;
-  int32 finiteOnly = 348;
-  int32 first = 349;
-  int32 firstItem = 350;
-  int32 fixedFeatures = 351;
-  int32 Float = 352;
-  int32 floatLiteral = 353;
-  int32 FloatLiteralType = 354;
-  int32 FloatValue = 355;
-  int32 for = 356;
-  int32 forMessageName = 357;
-  int32 formUnion = 358;
-  int32 forReadingFrom = 359;
-  int32 forTypeURL = 360;
-  int32 ForwardParser = 361;
-  int32 forWritingInto = 362;
-  int32 from = 363;
-  int32 fromAscii2 = 364;
-  int32 fromAscii4 = 365;
-  int32 fromByteOffset = 366;
-  int32 fromHexDigit = 367;
-  int32 fullName = 368;
-  int32 func = 369;
-  int32 function = 370;
-  int32 G = 371;
-  int32 GeneratedCodeInfo = 372;
-  int32 get = 373;
-  int32 getExtensionValue = 374;
-  int32 googleapis = 375;
-  int32 Google_Protobuf_Any = 376;
-  int32 Google_Protobuf_Api = 377;
-  int32 Google_Protobuf_BoolValue = 378;
-  int32 Google_Protobuf_BytesValue = 379;
-  int32 Google_Protobuf_DescriptorProto = 380;
-  int32 Google_Protobuf_DoubleValue = 381;
-  int32 Google_Protobuf_Duration = 382;
-  int32 Google_Protobuf_Edition = 383;
-  int32 Google_Protobuf_Empty = 384;
-  int32 Google_Protobuf_Enum = 385;
-  int32 Google_Protobuf_EnumDescriptorProto = 386;
-  int32 Google_Protobuf_EnumOptions = 387;
-  int32 Google_Protobuf_EnumValue = 388;
-  int32 Google_Protobuf_EnumValueDescriptorProto = 389;
-  int32 Google_Protobuf_EnumValueOptions = 390;
-  int32 Google_Protobuf_ExtensionRangeOptions = 391;
-  int32 Google_Protobuf_FeatureSet = 392;
-  int32 Google_Protobuf_FeatureSetDefaults = 393;
-  int32 Google_Protobuf_Field = 394;
-  int32 Google_Protobuf_FieldDescriptorProto = 395;
-  int32 Google_Protobuf_FieldMask = 396;
-  int32 Google_Protobuf_FieldOptions = 397;
-  int32 Google_Protobuf_FileDescriptorProto = 398;
-  int32 Google_Protobuf_FileDescriptorSet = 399;
-  int32 Google_Protobuf_FileOptions = 400;
-  int32 Google_Protobuf_FloatValue = 401;
-  int32 Google_Protobuf_GeneratedCodeInfo = 402;
-  int32 Google_Protobuf_Int32Value = 403;
-  int32 Google_Protobuf_Int64Value = 404;
-  int32 Google_Protobuf_ListValue = 405;
-  int32 Google_Protobuf_MessageOptions = 406;
-  int32 Google_Protobuf_Method = 407;
-  int32 Google_Protobuf_MethodDescriptorProto = 408;
-  int32 Google_Protobuf_MethodOptions = 409;
-  int32 Google_Protobuf_Mixin = 410;
-  int32 Google_Protobuf_NullValue = 411;
-  int32 Google_Protobuf_OneofDescriptorProto = 412;
-  int32 Google_Protobuf_OneofOptions = 413;
-  int32 Google_Protobuf_Option = 414;
-  int32 Google_Protobuf_ServiceDescriptorProto = 415;
-  int32 Google_Protobuf_ServiceOptions = 416;
-  int32 Google_Protobuf_SourceCodeInfo = 417;
-  int32 Google_Protobuf_SourceContext = 418;
-  int32 Google_Protobuf_StringValue = 419;
-  int32 Google_Protobuf_Struct = 420;
-  int32 Google_Protobuf_Syntax = 421;
-  int32 Google_Protobuf_Timestamp = 422;
-  int32 Google_Protobuf_Type = 423;
-  int32 Google_Protobuf_UInt32Value = 424;
-  int32 Google_Protobuf_UInt64Value = 425;
-  int32 Google_Protobuf_UninterpretedOption = 426;
-  int32 Google_Protobuf_Value = 427;
-  int32 goPackage = 428;
-  int32 group = 429;
-  int32 groupFieldNumberStack = 430;
-  int32 groupSize = 431;
-  int32 guard = 432;
-  int32 hadOneofValue = 433;
-  int32 handleConflictingOneOf = 434;
-  int32 hasAggregateValue = 435;
-  int32 hasAllowAlias = 436;
-  int32 hasBegin = 437;
-  int32 hasCcEnableArenas = 438;
-  int32 hasCcGenericServices = 439;
-  int32 hasClientStreaming = 440;
-  int32 hasCsharpNamespace = 441;
-  int32 hasCtype = 442;
-  int32 hasDebugRedact = 443;
-  int32 hasDefaultValue = 444;
-  int32 hasDeprecated = 445;
-  int32 hasDeprecatedLegacyJsonFieldConflicts = 446;
-  int32 hasDeprecationWarning = 447;
-  int32 hasDoubleValue = 448;
-  int32 hasEdition = 449;
-  int32 hasEditionDeprecated = 450;
-  int32 hasEditionIntroduced = 451;
-  int32 hasEditionRemoved = 452;
-  int32 hasEnd = 453;
-  int32 hasEnumType = 454;
-  int32 hasExtendee = 455;
-  int32 hasExtensionValue = 456;
-  int32 hasFeatures = 457;
-  int32 hasFeatureSupport = 458;
-  int32 hasFieldPresence = 459;
-  int32 hasFixedFeatures = 460;
-  int32 hasFullName = 461;
-  int32 hasGoPackage = 462;
-  int32 hash = 463;
-  int32 Hashable = 464;
-  int32 hasher = 465;
-  int32 HashVisitor = 466;
-  int32 hasIdempotencyLevel = 467;
-  int32 hasIdentifierValue = 468;
-  int32 hasInputType = 469;
-  int32 hasIsExtension = 470;
-  int32 hasJavaGenerateEqualsAndHash = 471;
-  int32 hasJavaGenericServices = 472;
-  int32 hasJavaMultipleFiles = 473;
-  int32 hasJavaOuterClassname = 474;
-  int32 hasJavaPackage = 475;
-  int32 hasJavaStringCheckUtf8 = 476;
-  int32 hasJsonFormat = 477;
-  int32 hasJsonName = 478;
-  int32 hasJstype = 479;
-  int32 hasLabel = 480;
-  int32 hasLazy = 481;
-  int32 hasLeadingComments = 482;
-  int32 hasMapEntry = 483;
-  int32 hasMaximumEdition = 484;
-  int32 hasMessageEncoding = 485;
-  int32 hasMessageSetWireFormat = 486;
-  int32 hasMinimumEdition = 487;
-  int32 hasName = 488;
-  int32 hasNamePart = 489;
-  int32 hasNegativeIntValue = 490;
-  int32 hasNoStandardDescriptorAccessor = 491;
-  int32 hasNumber = 492;
-  int32 hasObjcClassPrefix = 493;
-  int32 hasOneofIndex = 494;
-  int32 hasOptimizeFor = 495;
-  int32 hasOptions = 496;
-  int32 hasOutputType = 497;
-  int32 hasOverridableFeatures = 498;
-  int32 hasPackage = 499;
-  int32 hasPacked = 500;
-  int32 hasPhpClassPrefix = 501;
-  int32 hasPhpMetadataNamespace = 502;
-  int32 hasPhpNamespace = 503;
-  int32 hasPositiveIntValue = 504;
-  int32 hasProto3Optional = 505;
-  int32 hasPyGenericServices = 506;
-  int32 hasRepeated = 507;
-  int32 hasRepeatedFieldEncoding = 508;
-  int32 hasReserved = 509;
-  int32 hasRetention = 510;
-  int32 hasRubyPackage = 511;
-  int32 hasSemantic = 512;
-  int32 hasServerStreaming = 513;
-  int32 hasSourceCodeInfo = 514;
-  int32 hasSourceContext = 515;
-  int32 hasSourceFile = 516;
-  int32 hasStart = 517;
-  int32 hasStringValue = 518;
-  int32 hasSwiftPrefix = 519;
-  int32 hasSyntax = 520;
-  int32 hasTrailingComments = 521;
-  int32 hasType = 522;
-  int32 hasTypeName = 523;
-  int32 hasUnverifiedLazy = 524;
-  int32 hasUtf8Validation = 525;
-  int32 hasValue = 526;
-  int32 hasVerification = 527;
-  int32 hasWeak = 528;
-  int32 hour = 529;
-  int32 i = 530;
-  int32 idempotencyLevel = 531;
-  int32 identifierValue = 532;
-  int32 if = 533;
-  int32 ignoreUnknownExtensionFields = 534;
-  int32 ignoreUnknownFields = 535;
-  int32 index = 536;
-  int32 init = 537;
-  int32 inout = 538;
-  int32 inputType = 539;
-  int32 insert = 540;
-  int32 Int = 541;
-  int32 Int32 = 542;
-  int32 Int32Value = 543;
-  int32 Int64 = 544;
-  int32 Int64Value = 545;
-  int32 Int8 = 546;
-  int32 integerLiteral = 547;
-  int32 IntegerLiteralType = 548;
-  int32 intern = 549;
-  int32 Internal = 550;
-  int32 InternalState = 551;
-  int32 intersect = 552;
-  int32 into = 553;
-  int32 ints = 554;
-  int32 isA = 555;
-  int32 isEqual = 556;
-  int32 isEqualTo = 557;
-  int32 isExtension = 558;
-  int32 isInitialized = 559;
-  int32 isNegative = 560;
-  int32 isPathValid = 561;
-  int32 isValid = 562;
-  int32 itemTagsEncodedSize = 563;
-  int32 iterator = 564;
-  int32 javaGenerateEqualsAndHash = 565;
-  int32 javaGenericServices = 566;
-  int32 javaMultipleFiles = 567;
-  int32 javaOuterClassname = 568;
-  int32 javaPackage = 569;
-  int32 javaStringCheckUtf8 = 570;
-  int32 JSONDecoder = 571;
-  int32 JSONDecodingError = 572;
-  int32 JSONDecodingOptions = 573;
-  int32 jsonEncoder = 574;
-  int32 JSONEncodingError = 575;
-  int32 JSONEncodingOptions = 576;
-  int32 JSONEncodingVisitor = 577;
-  int32 jsonFormat = 578;
-  int32 JSONMapEncodingVisitor = 579;
-  int32 jsonName = 580;
-  int32 jsonPath = 581;
-  int32 jsonPaths = 582;
-  int32 JSONScanner = 583;
-  int32 jsonString = 584;
-  int32 jsonText = 585;
-  int32 jsonUTF8Bytes = 586;
-  int32 jsonUTF8Data = 587;
-  int32 jstype = 588;
-  int32 k = 589;
-  int32 kChunkSize = 590;
-  int32 Key = 591;
-  int32 keyField = 592;
-  int32 keyFieldOpt = 593;
-  int32 KeyType = 594;
-  int32 kind = 595;
-  int32 l = 596;
-  int32 label = 597;
-  int32 lazy = 598;
-  int32 leadingComments = 599;
-  int32 leadingDetachedComments = 600;
-  int32 length = 601;
-  int32 lessThan = 602;
-  int32 let = 603;
-  int32 lhs = 604;
-  int32 line = 605;
-  int32 list = 606;
-  int32 listOfMessages = 607;
-  int32 listValue = 608;
-  int32 littleEndian = 609;
-  int32 load = 610;
-  int32 localHasher = 611;
-  int32 location = 612;
-  int32 M = 613;
-  int32 major = 614;
-  int32 makeAsyncIterator = 615;
-  int32 makeIterator = 616;
-  int32 malformedLength = 617;
-  int32 mapEntry = 618;
-  int32 MapKeyType = 619;
-  int32 mapToMessages = 620;
-  int32 MapValueType = 621;
-  int32 mapVisitor = 622;
-  int32 mask = 623;
-  int32 maximumEdition = 624;
-  int32 mdayStart = 625;
-  int32 merge = 626;
-  int32 MergeOptions = 627;
-  int32 message = 628;
-  int32 messageDepthLimit = 629;
-  int32 messageEncoding = 630;
-  int32 MessageExtension = 631;
-  int32 MessageImplementationBase = 632;
-  int32 MessageOptions = 633;
-  int32 MessageSet = 634;
-  int32 messageSetWireFormat = 635;
-  int32 messageSize = 636;
-  int32 messageType = 637;
-  int32 Method = 638;
-  int32 MethodDescriptorProto = 639;
-  int32 MethodOptions = 640;
-  int32 methods = 641;
-  int32 min = 642;
-  int32 minimumEdition = 643;
-  int32 minor = 644;
-  int32 Mixin = 645;
-  int32 mixins = 646;
-  int32 modify = 647;
-  int32 month = 648;
-  int32 msgExtension = 649;
-  int32 mutating = 650;
-  int32 n = 651;
-  int32 name = 652;
-  int32 NameDescription = 653;
-  int32 NameMap = 654;
-  int32 NamePart = 655;
-  int32 names = 656;
-  int32 nanos = 657;
-  int32 negativeIntValue = 658;
-  int32 nestedType = 659;
-  int32 newExtensible = 660;
-  int32 newL = 661;
-  int32 newList = 662;
-  int32 newMessage = 663;
-  int32 newValue = 664;
-  int32 next = 665;
-  int32 nextByte = 666;
-  int32 nextFieldNumber = 667;
-  int32 nextVarInt = 668;
-  int32 nil = 669;
-  int32 nilLiteral = 670;
-  int32 noBytesAvailable = 671;
-  int32 noStandardDescriptorAccessor = 672;
-  int32 nullValue = 673;
-  int32 number = 674;
-  int32 numberValue = 675;
-  int32 objcClassPrefix = 676;
-  int32 of = 677;
-  int32 oneofDecl = 678;
-  int32 OneofDescriptorProto = 679;
-  int32 oneofIndex = 680;
-  int32 OneofOptions = 681;
-  int32 oneofs = 682;
-  int32 OneOf_Kind = 683;
-  int32 optimizeFor = 684;
-  int32 OptimizeMode = 685;
-  int32 Option = 686;
-  int32 OptionalEnumExtensionField = 687;
-  int32 OptionalExtensionField = 688;
-  int32 OptionalGroupExtensionField = 689;
-  int32 OptionalMessageExtensionField = 690;
-  int32 OptionRetention = 691;
-  int32 options = 692;
-  int32 OptionTargetType = 693;
-  int32 other = 694;
-  int32 others = 695;
-  int32 out = 696;
-  int32 outputType = 697;
-  int32 overridableFeatures = 698;
-  int32 p = 699;
-  int32 package = 700;
-  int32 packed = 701;
-  int32 PackedEnumExtensionField = 702;
-  int32 PackedExtensionField = 703;
-  int32 padding = 704;
-  int32 parent = 705;
-  int32 parse = 706;
-  int32 partial = 707;
-  int32 path = 708;
-  int32 PathDecoder = 709;
-  int32 PathDecodingError = 710;
-  int32 paths = 711;
-  int32 PathVisitor = 712;
-  int32 payload = 713;
-  int32 payloadSize = 714;
-  int32 phpClassPrefix = 715;
-  int32 phpMetadataNamespace = 716;
-  int32 phpNamespace = 717;
-  int32 pos = 718;
-  int32 positiveIntValue = 719;
-  int32 prefix = 720;
-  int32 preserveProtoFieldNames = 721;
-  int32 preTraverse = 722;
-  int32 prevPath = 723;
-  int32 printUnknownFields = 724;
-  int32 proto2 = 725;
-  int32 proto3DefaultValue = 726;
-  int32 proto3Optional = 727;
-  int32 ProtobufAPIVersionCheck = 728;
-  int32 ProtobufAPIVersion_2 = 729;
-  int32 ProtobufBool = 730;
-  int32 ProtobufBytes = 731;
-  int32 ProtobufDouble = 732;
-  int32 ProtobufEnumMap = 733;
-  int32 protobufExtension = 734;
-  int32 ProtobufFixed32 = 735;
-  int32 ProtobufFixed64 = 736;
-  int32 ProtobufFloat = 737;
-  int32 ProtobufInt32 = 738;
-  int32 ProtobufInt64 = 739;
-  int32 ProtobufMap = 740;
-  int32 ProtobufMessageMap = 741;
-  int32 ProtobufSFixed32 = 742;
-  int32 ProtobufSFixed64 = 743;
-  int32 ProtobufSInt32 = 744;
-  int32 ProtobufSInt64 = 745;
-  int32 ProtobufString = 746;
-  int32 ProtobufUInt32 = 747;
-  int32 ProtobufUInt64 = 748;
-  int32 protobuf_extensionFieldValues = 749;
-  int32 protobuf_fieldNumber = 750;
-  int32 protobuf_generated_isEqualTo = 751;
-  int32 protobuf_nameMap = 752;
-  int32 protobuf_newField = 753;
-  int32 protobuf_package = 754;
-  int32 protocol = 755;
-  int32 protoFieldName = 756;
-  int32 protoMessageName = 757;
-  int32 ProtoNameProviding = 758;
-  int32 protoPaths = 759;
-  int32 public = 760;
-  int32 publicDependency = 761;
-  int32 putBoolValue = 762;
-  int32 putBytesValue = 763;
-  int32 putDoubleValue = 764;
-  int32 putEnumValue = 765;
-  int32 putFixedUInt32 = 766;
-  int32 putFixedUInt64 = 767;
-  int32 putFloatValue = 768;
-  int32 putInt64 = 769;
-  int32 putStringValue = 770;
-  int32 putUInt64 = 771;
-  int32 putUInt64Hex = 772;
-  int32 putVarInt = 773;
-  int32 putZigZagVarInt = 774;
-  int32 pyGenericServices = 775;
-  int32 R = 776;
-  int32 rawChars = 777;
-  int32 RawRepresentable = 778;
-  int32 RawValue = 779;
-  int32 read4HexDigits = 780;
-  int32 readBytes = 781;
-  int32 register = 782;
-  int32 removingAllFieldsOf = 783;
-  int32 repeated = 784;
-  int32 RepeatedEnumExtensionField = 785;
-  int32 RepeatedExtensionField = 786;
-  int32 repeatedFieldEncoding = 787;
-  int32 RepeatedGroupExtensionField = 788;
-  int32 RepeatedMessageExtensionField = 789;
-  int32 repeating = 790;
-  int32 replaceRepeatedFields = 791;
-  int32 requestStreaming = 792;
-  int32 requestTypeURL = 793;
-  int32 requiredSize = 794;
-  int32 responseStreaming = 795;
-  int32 responseTypeURL = 796;
-  int32 result = 797;
-  int32 retention = 798;
-  int32 rethrows = 799;
-  int32 return = 800;
-  int32 ReturnType = 801;
-  int32 revision = 802;
-  int32 rhs = 803;
-  int32 root = 804;
-  int32 rubyPackage = 805;
-  int32 s = 806;
-  int32 sawBackslash = 807;
-  int32 sawSection4Characters = 808;
-  int32 sawSection5Characters = 809;
-  int32 scan = 810;
-  int32 scanner = 811;
-  int32 seconds = 812;
-  int32 self = 813;
-  int32 semantic = 814;
-  int32 Sendable = 815;
-  int32 separator = 816;
-  int32 serialize = 817;
-  int32 serializedBytes = 818;
-  int32 serializedData = 819;
-  int32 serializedSize = 820;
-  int32 serverStreaming = 821;
-  int32 service = 822;
-  int32 ServiceDescriptorProto = 823;
-  int32 ServiceOptions = 824;
-  int32 set = 825;
-  int32 setExtensionValue = 826;
-  int32 shift = 827;
-  int32 SimpleExtensionMap = 828;
-  int32 size = 829;
-  int32 sizer = 830;
-  int32 source = 831;
-  int32 sourceCodeInfo = 832;
-  int32 sourceContext = 833;
-  int32 sourceEncoding = 834;
-  int32 sourceFile = 835;
-  int32 SourceLocation = 836;
-  int32 span = 837;
-  int32 split = 838;
-  int32 start = 839;
-  int32 startArray = 840;
-  int32 startArrayObject = 841;
-  int32 startField = 842;
-  int32 startIndex = 843;
-  int32 startMessageField = 844;
-  int32 startObject = 845;
-  int32 startRegularField = 846;
-  int32 state = 847;
-  int32 static = 848;
-  int32 StaticString = 849;
-  int32 storage = 850;
-  int32 String = 851;
-  int32 stringLiteral = 852;
-  int32 StringLiteralType = 853;
-  int32 stringResult = 854;
-  int32 stringValue = 855;
-  int32 struct = 856;
-  int32 structValue = 857;
-  int32 subDecoder = 858;
-  int32 subscript = 859;
-  int32 subtract = 860;
-  int32 subVisitor = 861;
-  int32 Swift = 862;
-  int32 swiftPrefix = 863;
-  int32 SwiftProtobufContiguousBytes = 864;
-  int32 SwiftProtobufError = 865;
-  int32 syntax = 866;
-  int32 T = 867;
-  int32 tag = 868;
-  int32 targets = 869;
-  int32 terminator = 870;
-  int32 testDecoder = 871;
-  int32 text = 872;
-  int32 textDecoder = 873;
-  int32 TextFormatDecoder = 874;
-  int32 TextFormatDecodingError = 875;
-  int32 TextFormatDecodingOptions = 876;
-  int32 TextFormatEncodingOptions = 877;
-  int32 TextFormatEncodingVisitor = 878;
-  int32 textFormatString = 879;
-  int32 throwOrIgnore = 880;
-  int32 throws = 881;
-  int32 timeInterval = 882;
-  int32 timeIntervalSince1970 = 883;
-  int32 timeIntervalSinceReferenceDate = 884;
-  int32 Timestamp = 885;
-  int32 tmp = 886;
-  int32 tooLarge = 887;
-  int32 total = 888;
-  int32 totalArrayDepth = 889;
-  int32 totalSize = 890;
-  int32 trailingComments = 891;
-  int32 traverse = 892;
-  int32 trim = 893;
-  int32 true = 894;
-  int32 try = 895;
-  int32 type = 896;
-  int32 typealias = 897;
-  int32 TypeEnum = 898;
-  int32 typeName = 899;
-  int32 typePrefix = 900;
-  int32 typeStart = 901;
-  int32 typeUnknown = 902;
-  int32 typeURL = 903;
-  int32 UInt32 = 904;
-  int32 UInt32Value = 905;
-  int32 UInt64 = 906;
-  int32 UInt64Value = 907;
-  int32 UInt8 = 908;
-  int32 unchecked = 909;
-  int32 unicodeScalarLiteral = 910;
-  int32 UnicodeScalarLiteralType = 911;
-  int32 unicodeScalars = 912;
-  int32 UnicodeScalarView = 913;
-  int32 uninterpretedOption = 914;
-  int32 union = 915;
-  int32 uniqueStorage = 916;
-  int32 unknown = 917;
-  int32 unknownFields = 918;
-  int32 UnknownStorage = 919;
-  int32 unpackTo = 920;
-  int32 UnsafeBufferPointer = 921;
-  int32 UnsafeMutablePointer = 922;
-  int32 UnsafeMutableRawBufferPointer = 923;
-  int32 UnsafeRawBufferPointer = 924;
-  int32 UnsafeRawPointer = 925;
-  int32 unverifiedLazy = 926;
-  int32 updatedOptions = 927;
-  int32 url = 928;
-  int32 useDeterministicOrdering = 929;
-  int32 utf8 = 930;
-  int32 utf8Ptr = 931;
-  int32 utf8ToDouble = 932;
-  int32 utf8Validation = 933;
-  int32 UTF8View = 934;
-  int32 v = 935;
-  int32 value = 936;
-  int32 valueField = 937;
-  int32 values = 938;
-  int32 ValueType = 939;
-  int32 var = 940;
-  int32 verification = 941;
-  int32 VerificationState = 942;
-  int32 Version = 943;
-  int32 versionString = 944;
-  int32 visitExtensionFields = 945;
-  int32 visitExtensionFieldsAsMessageSet = 946;
-  int32 visitMapField = 947;
-  int32 visitor = 948;
-  int32 visitPacked = 949;
-  int32 visitPackedBoolField = 950;
-  int32 visitPackedDoubleField = 951;
-  int32 visitPackedEnumField = 952;
-  int32 visitPackedFixed32Field = 953;
-  int32 visitPackedFixed64Field = 954;
-  int32 visitPackedFloatField = 955;
-  int32 visitPackedInt32Field = 956;
-  int32 visitPackedInt64Field = 957;
-  int32 visitPackedSFixed32Field = 958;
-  int32 visitPackedSFixed64Field = 959;
-  int32 visitPackedSInt32Field = 960;
-  int32 visitPackedSInt64Field = 961;
-  int32 visitPackedUInt32Field = 962;
-  int32 visitPackedUInt64Field = 963;
-  int32 visitRepeated = 964;
-  int32 visitRepeatedBoolField = 965;
-  int32 visitRepeatedBytesField = 966;
-  int32 visitRepeatedDoubleField = 967;
-  int32 visitRepeatedEnumField = 968;
-  int32 visitRepeatedFixed32Field = 969;
-  int32 visitRepeatedFixed64Field = 970;
-  int32 visitRepeatedFloatField = 971;
-  int32 visitRepeatedGroupField = 972;
-  int32 visitRepeatedInt32Field = 973;
-  int32 visitRepeatedInt64Field = 974;
-  int32 visitRepeatedMessageField = 975;
-  int32 visitRepeatedSFixed32Field = 976;
-  int32 visitRepeatedSFixed64Field = 977;
-  int32 visitRepeatedSInt32Field = 978;
-  int32 visitRepeatedSInt64Field = 979;
-  int32 visitRepeatedStringField = 980;
-  int32 visitRepeatedUInt32Field = 981;
-  int32 visitRepeatedUInt64Field = 982;
-  int32 visitSingular = 983;
-  int32 visitSingularBoolField = 984;
-  int32 visitSingularBytesField = 985;
-  int32 visitSingularDoubleField = 986;
-  int32 visitSingularEnumField = 987;
-  int32 visitSingularFixed32Field = 988;
-  int32 visitSingularFixed64Field = 989;
-  int32 visitSingularFloatField = 990;
-  int32 visitSingularGroupField = 991;
-  int32 visitSingularInt32Field = 992;
-  int32 visitSingularInt64Field = 993;
-  int32 visitSingularMessageField = 994;
-  int32 visitSingularSFixed32Field = 995;
-  int32 visitSingularSFixed64Field = 996;
-  int32 visitSingularSInt32Field = 997;
-  int32 visitSingularSInt64Field = 998;
-  int32 visitSingularStringField = 999;
-  int32 visitSingularUInt32Field = 1000;
-  int32 visitSingularUInt64Field = 1001;
-  int32 visitUnknown = 1002;
-  int32 wasDecoded = 1003;
-  int32 weak = 1004;
-  int32 weakDependency = 1005;
-  int32 where = 1006;
-  int32 wireFormat = 1007;
-  int32 with = 1008;
-  int32 withUnsafeBytes = 1009;
-  int32 withUnsafeMutableBytes = 1010;
-  int32 work = 1011;
-  int32 Wrapped = 1012;
-  int32 WrappedType = 1013;
-  int32 wrappedValue = 1014;
-  int32 written = 1015;
-  int32 yday = 1016;
+  int32 clearEnforceNamingStyle = 97;
+  int32 clearEnumType = 98;
+  int32 clearExtendee = 99;
+  int32 clearExtensionValue = 100;
+  int32 clearFeatures = 101;
+  int32 clearFeatureSupport = 102;
+  int32 clearFieldPresence = 103;
+  int32 clearFixedFeatures = 104;
+  int32 clearFullName = 105;
+  int32 clearGoPackage = 106;
+  int32 clearIdempotencyLevel = 107;
+  int32 clearIdentifierValue = 108;
+  int32 clearInputType = 109;
+  int32 clearIsExtension = 110;
+  int32 clearJavaGenerateEqualsAndHash = 111;
+  int32 clearJavaGenericServices = 112;
+  int32 clearJavaMultipleFiles = 113;
+  int32 clearJavaOuterClassname = 114;
+  int32 clearJavaPackage = 115;
+  int32 clearJavaStringCheckUtf8 = 116;
+  int32 clearJsonFormat = 117;
+  int32 clearJsonName = 118;
+  int32 clearJstype = 119;
+  int32 clearLabel = 120;
+  int32 clearLazy = 121;
+  int32 clearLeadingComments = 122;
+  int32 clearMapEntry = 123;
+  int32 clearMaximumEdition = 124;
+  int32 clearMessageEncoding = 125;
+  int32 clearMessageSetWireFormat = 126;
+  int32 clearMinimumEdition = 127;
+  int32 clearName = 128;
+  int32 clearNamePart = 129;
+  int32 clearNegativeIntValue = 130;
+  int32 clearNoStandardDescriptorAccessor = 131;
+  int32 clearNumber = 132;
+  int32 clearObjcClassPrefix = 133;
+  int32 clearOneofIndex = 134;
+  int32 clearOptimizeFor = 135;
+  int32 clearOptions = 136;
+  int32 clearOutputType = 137;
+  int32 clearOverridableFeatures = 138;
+  int32 clearPackage = 139;
+  int32 clearPacked = 140;
+  int32 clearPhpClassPrefix = 141;
+  int32 clearPhpMetadataNamespace = 142;
+  int32 clearPhpNamespace = 143;
+  int32 clearPositiveIntValue = 144;
+  int32 clearProto3Optional = 145;
+  int32 clearPyGenericServices = 146;
+  int32 clearRepeated = 147;
+  int32 clearRepeatedFieldEncoding = 148;
+  int32 clearReserved = 149;
+  int32 clearRetention = 150;
+  int32 clearRubyPackage = 151;
+  int32 clearSemantic = 152;
+  int32 clearServerStreaming = 153;
+  int32 clearSourceCodeInfo = 154;
+  int32 clearSourceContext = 155;
+  int32 clearSourceFile = 156;
+  int32 clearStart = 157;
+  int32 clearStringValue = 158;
+  int32 clearSwiftPrefix = 159;
+  int32 clearSyntax = 160;
+  int32 clearTrailingComments = 161;
+  int32 clearType = 162;
+  int32 clearTypeName = 163;
+  int32 clearUnverifiedLazy = 164;
+  int32 clearUtf8Validation = 165;
+  int32 clearValue = 166;
+  int32 clearVerification = 167;
+  int32 clearWeak = 168;
+  int32 clientStreaming = 169;
+  int32 code = 170;
+  int32 codePoint = 171;
+  int32 codeUnits = 172;
+  int32 Collection = 173;
+  int32 com = 174;
+  int32 comma = 175;
+  int32 consumedBytes = 176;
+  int32 contains = 177;
+  int32 contentsOf = 178;
+  int32 ContiguousBytes = 179;
+  int32 copy = 180;
+  int32 count = 181;
+  int32 countVarintsInBuffer = 182;
+  int32 csharpNamespace = 183;
+  int32 ctype = 184;
+  int32 customCodable = 185;
+  int32 CustomDebugStringConvertible = 186;
+  int32 CustomStringConvertible = 187;
+  int32 d = 188;
+  int32 Data = 189;
+  int32 dataResult = 190;
+  int32 date = 191;
+  int32 daySec = 192;
+  int32 daysSinceEpoch = 193;
+  int32 debugDescription = 194;
+  int32 debugRedact = 195;
+  int32 declaration = 196;
+  int32 decoded = 197;
+  int32 decodedFromJSONNull = 198;
+  int32 decodeExtensionField = 199;
+  int32 decodeExtensionFieldsAsMessageSet = 200;
+  int32 decodeJSON = 201;
+  int32 decodeMapField = 202;
+  int32 decodeMessage = 203;
+  int32 decoder = 204;
+  int32 decodeRepeated = 205;
+  int32 decodeRepeatedBoolField = 206;
+  int32 decodeRepeatedBytesField = 207;
+  int32 decodeRepeatedDoubleField = 208;
+  int32 decodeRepeatedEnumField = 209;
+  int32 decodeRepeatedFixed32Field = 210;
+  int32 decodeRepeatedFixed64Field = 211;
+  int32 decodeRepeatedFloatField = 212;
+  int32 decodeRepeatedGroupField = 213;
+  int32 decodeRepeatedInt32Field = 214;
+  int32 decodeRepeatedInt64Field = 215;
+  int32 decodeRepeatedMessageField = 216;
+  int32 decodeRepeatedSFixed32Field = 217;
+  int32 decodeRepeatedSFixed64Field = 218;
+  int32 decodeRepeatedSInt32Field = 219;
+  int32 decodeRepeatedSInt64Field = 220;
+  int32 decodeRepeatedStringField = 221;
+  int32 decodeRepeatedUInt32Field = 222;
+  int32 decodeRepeatedUInt64Field = 223;
+  int32 decodeSingular = 224;
+  int32 decodeSingularBoolField = 225;
+  int32 decodeSingularBytesField = 226;
+  int32 decodeSingularDoubleField = 227;
+  int32 decodeSingularEnumField = 228;
+  int32 decodeSingularFixed32Field = 229;
+  int32 decodeSingularFixed64Field = 230;
+  int32 decodeSingularFloatField = 231;
+  int32 decodeSingularGroupField = 232;
+  int32 decodeSingularInt32Field = 233;
+  int32 decodeSingularInt64Field = 234;
+  int32 decodeSingularMessageField = 235;
+  int32 decodeSingularSFixed32Field = 236;
+  int32 decodeSingularSFixed64Field = 237;
+  int32 decodeSingularSInt32Field = 238;
+  int32 decodeSingularSInt64Field = 239;
+  int32 decodeSingularStringField = 240;
+  int32 decodeSingularUInt32Field = 241;
+  int32 decodeSingularUInt64Field = 242;
+  int32 decodeTextFormat = 243;
+  int32 defaultAnyTypeURLPrefix = 244;
+  int32 defaults = 245;
+  int32 defaultValue = 246;
+  int32 dependency = 247;
+  int32 deprecated = 248;
+  int32 deprecatedLegacyJsonFieldConflicts = 249;
+  int32 deprecationWarning = 250;
+  int32 description = 251;
+  int32 DescriptorProto = 252;
+  int32 Dictionary = 253;
+  int32 dictionaryLiteral = 254;
+  int32 digit = 255;
+  int32 digit0 = 256;
+  int32 digit1 = 257;
+  int32 digitCount = 258;
+  int32 digits = 259;
+  int32 digitValue = 260;
+  int32 discardableResult = 261;
+  int32 discardUnknownFields = 262;
+  int32 Double = 263;
+  int32 doubleValue = 264;
+  int32 duration = 265;
+  int32 E = 266;
+  int32 edition = 267;
+  int32 EditionDefault = 268;
+  int32 editionDefaults = 269;
+  int32 editionDeprecated = 270;
+  int32 editionIntroduced = 271;
+  int32 editionRemoved = 272;
+  int32 Element = 273;
+  int32 elements = 274;
+  int32 else = 275;
+  int32 emitExtensionFieldName = 276;
+  int32 emitFieldName = 277;
+  int32 emitFieldNumber = 278;
+  int32 Empty = 279;
+  int32 emptyAnyTypeURL = 280;
+  int32 emptyData = 281;
+  int32 encodeAsBytes = 282;
+  int32 encoded = 283;
+  int32 encodedJSONString = 284;
+  int32 encodedSize = 285;
+  int32 encodeField = 286;
+  int32 encoder = 287;
+  int32 end = 288;
+  int32 endArray = 289;
+  int32 endMessageField = 290;
+  int32 endObject = 291;
+  int32 endRegularField = 292;
+  int32 enforceNamingStyle = 293;
+  int32 enum = 294;
+  int32 EnumDescriptorProto = 295;
+  int32 EnumOptions = 296;
+  int32 EnumReservedRange = 297;
+  int32 enumType = 298;
+  int32 enumvalue = 299;
+  int32 EnumValueDescriptorProto = 300;
+  int32 EnumValueOptions = 301;
+  int32 Equatable = 302;
+  int32 Error = 303;
+  int32 ExpressibleByArrayLiteral = 304;
+  int32 ExpressibleByDictionaryLiteral = 305;
+  int32 ext = 306;
+  int32 extDecoder = 307;
+  int32 extendedGraphemeClusterLiteral = 308;
+  int32 ExtendedGraphemeClusterLiteralType = 309;
+  int32 extendee = 310;
+  int32 ExtensibleMessage = 311;
+  int32 extension = 312;
+  int32 ExtensionField = 313;
+  int32 extensionFieldNumber = 314;
+  int32 ExtensionFieldValueSet = 315;
+  int32 ExtensionMap = 316;
+  int32 extensionRange = 317;
+  int32 ExtensionRangeOptions = 318;
+  int32 extensions = 319;
+  int32 extras = 320;
+  int32 F = 321;
+  int32 false = 322;
+  int32 features = 323;
+  int32 FeatureSet = 324;
+  int32 FeatureSetDefaults = 325;
+  int32 FeatureSetEditionDefault = 326;
+  int32 featureSupport = 327;
+  int32 field = 328;
+  int32 fieldData = 329;
+  int32 FieldDescriptorProto = 330;
+  int32 FieldMask = 331;
+  int32 FieldMaskError = 332;
+  int32 fieldName = 333;
+  int32 fieldNameCount = 334;
+  int32 fieldNum = 335;
+  int32 fieldNumber = 336;
+  int32 fieldNumberForProto = 337;
+  int32 FieldOptions = 338;
+  int32 fieldPresence = 339;
+  int32 fields = 340;
+  int32 fieldSize = 341;
+  int32 FieldTag = 342;
+  int32 FieldType = 343;
+  int32 file = 344;
+  int32 FileDescriptorProto = 345;
+  int32 FileDescriptorSet = 346;
+  int32 fileName = 347;
+  int32 FileOptions = 348;
+  int32 filter = 349;
+  int32 final = 350;
+  int32 finiteOnly = 351;
+  int32 first = 352;
+  int32 firstItem = 353;
+  int32 fixedFeatures = 354;
+  int32 Float = 355;
+  int32 floatLiteral = 356;
+  int32 FloatLiteralType = 357;
+  int32 FloatValue = 358;
+  int32 for = 359;
+  int32 forMessageName = 360;
+  int32 formUnion = 361;
+  int32 forReadingFrom = 362;
+  int32 forTypeURL = 363;
+  int32 ForwardParser = 364;
+  int32 forWritingInto = 365;
+  int32 from = 366;
+  int32 fromAscii2 = 367;
+  int32 fromAscii4 = 368;
+  int32 fromByteOffset = 369;
+  int32 fromHexDigit = 370;
+  int32 fullName = 371;
+  int32 func = 372;
+  int32 function = 373;
+  int32 G = 374;
+  int32 GeneratedCodeInfo = 375;
+  int32 get = 376;
+  int32 getExtensionValue = 377;
+  int32 googleapis = 378;
+  int32 Google_Protobuf_Any = 379;
+  int32 Google_Protobuf_Api = 380;
+  int32 Google_Protobuf_BoolValue = 381;
+  int32 Google_Protobuf_BytesValue = 382;
+  int32 Google_Protobuf_DescriptorProto = 383;
+  int32 Google_Protobuf_DoubleValue = 384;
+  int32 Google_Protobuf_Duration = 385;
+  int32 Google_Protobuf_Edition = 386;
+  int32 Google_Protobuf_Empty = 387;
+  int32 Google_Protobuf_Enum = 388;
+  int32 Google_Protobuf_EnumDescriptorProto = 389;
+  int32 Google_Protobuf_EnumOptions = 390;
+  int32 Google_Protobuf_EnumValue = 391;
+  int32 Google_Protobuf_EnumValueDescriptorProto = 392;
+  int32 Google_Protobuf_EnumValueOptions = 393;
+  int32 Google_Protobuf_ExtensionRangeOptions = 394;
+  int32 Google_Protobuf_FeatureSet = 395;
+  int32 Google_Protobuf_FeatureSetDefaults = 396;
+  int32 Google_Protobuf_Field = 397;
+  int32 Google_Protobuf_FieldDescriptorProto = 398;
+  int32 Google_Protobuf_FieldMask = 399;
+  int32 Google_Protobuf_FieldOptions = 400;
+  int32 Google_Protobuf_FileDescriptorProto = 401;
+  int32 Google_Protobuf_FileDescriptorSet = 402;
+  int32 Google_Protobuf_FileOptions = 403;
+  int32 Google_Protobuf_FloatValue = 404;
+  int32 Google_Protobuf_GeneratedCodeInfo = 405;
+  int32 Google_Protobuf_Int32Value = 406;
+  int32 Google_Protobuf_Int64Value = 407;
+  int32 Google_Protobuf_ListValue = 408;
+  int32 Google_Protobuf_MessageOptions = 409;
+  int32 Google_Protobuf_Method = 410;
+  int32 Google_Protobuf_MethodDescriptorProto = 411;
+  int32 Google_Protobuf_MethodOptions = 412;
+  int32 Google_Protobuf_Mixin = 413;
+  int32 Google_Protobuf_NullValue = 414;
+  int32 Google_Protobuf_OneofDescriptorProto = 415;
+  int32 Google_Protobuf_OneofOptions = 416;
+  int32 Google_Protobuf_Option = 417;
+  int32 Google_Protobuf_ServiceDescriptorProto = 418;
+  int32 Google_Protobuf_ServiceOptions = 419;
+  int32 Google_Protobuf_SourceCodeInfo = 420;
+  int32 Google_Protobuf_SourceContext = 421;
+  int32 Google_Protobuf_StringValue = 422;
+  int32 Google_Protobuf_Struct = 423;
+  int32 Google_Protobuf_Syntax = 424;
+  int32 Google_Protobuf_Timestamp = 425;
+  int32 Google_Protobuf_Type = 426;
+  int32 Google_Protobuf_UInt32Value = 427;
+  int32 Google_Protobuf_UInt64Value = 428;
+  int32 Google_Protobuf_UninterpretedOption = 429;
+  int32 Google_Protobuf_Value = 430;
+  int32 goPackage = 431;
+  int32 group = 432;
+  int32 groupFieldNumberStack = 433;
+  int32 groupSize = 434;
+  int32 guard = 435;
+  int32 hadOneofValue = 436;
+  int32 handleConflictingOneOf = 437;
+  int32 hasAggregateValue = 438;
+  int32 hasAllowAlias = 439;
+  int32 hasBegin = 440;
+  int32 hasCcEnableArenas = 441;
+  int32 hasCcGenericServices = 442;
+  int32 hasClientStreaming = 443;
+  int32 hasCsharpNamespace = 444;
+  int32 hasCtype = 445;
+  int32 hasDebugRedact = 446;
+  int32 hasDefaultValue = 447;
+  int32 hasDeprecated = 448;
+  int32 hasDeprecatedLegacyJsonFieldConflicts = 449;
+  int32 hasDeprecationWarning = 450;
+  int32 hasDoubleValue = 451;
+  int32 hasEdition = 452;
+  int32 hasEditionDeprecated = 453;
+  int32 hasEditionIntroduced = 454;
+  int32 hasEditionRemoved = 455;
+  int32 hasEnd = 456;
+  int32 hasEnforceNamingStyle = 457;
+  int32 hasEnumType = 458;
+  int32 hasExtendee = 459;
+  int32 hasExtensionValue = 460;
+  int32 hasFeatures = 461;
+  int32 hasFeatureSupport = 462;
+  int32 hasFieldPresence = 463;
+  int32 hasFixedFeatures = 464;
+  int32 hasFullName = 465;
+  int32 hasGoPackage = 466;
+  int32 hash = 467;
+  int32 Hashable = 468;
+  int32 hasher = 469;
+  int32 HashVisitor = 470;
+  int32 hasIdempotencyLevel = 471;
+  int32 hasIdentifierValue = 472;
+  int32 hasInputType = 473;
+  int32 hasIsExtension = 474;
+  int32 hasJavaGenerateEqualsAndHash = 475;
+  int32 hasJavaGenericServices = 476;
+  int32 hasJavaMultipleFiles = 477;
+  int32 hasJavaOuterClassname = 478;
+  int32 hasJavaPackage = 479;
+  int32 hasJavaStringCheckUtf8 = 480;
+  int32 hasJsonFormat = 481;
+  int32 hasJsonName = 482;
+  int32 hasJstype = 483;
+  int32 hasLabel = 484;
+  int32 hasLazy = 485;
+  int32 hasLeadingComments = 486;
+  int32 hasMapEntry = 487;
+  int32 hasMaximumEdition = 488;
+  int32 hasMessageEncoding = 489;
+  int32 hasMessageSetWireFormat = 490;
+  int32 hasMinimumEdition = 491;
+  int32 hasName = 492;
+  int32 hasNamePart = 493;
+  int32 hasNegativeIntValue = 494;
+  int32 hasNoStandardDescriptorAccessor = 495;
+  int32 hasNumber = 496;
+  int32 hasObjcClassPrefix = 497;
+  int32 hasOneofIndex = 498;
+  int32 hasOptimizeFor = 499;
+  int32 hasOptions = 500;
+  int32 hasOutputType = 501;
+  int32 hasOverridableFeatures = 502;
+  int32 hasPackage = 503;
+  int32 hasPacked = 504;
+  int32 hasPhpClassPrefix = 505;
+  int32 hasPhpMetadataNamespace = 506;
+  int32 hasPhpNamespace = 507;
+  int32 hasPositiveIntValue = 508;
+  int32 hasProto3Optional = 509;
+  int32 hasPyGenericServices = 510;
+  int32 hasRepeated = 511;
+  int32 hasRepeatedFieldEncoding = 512;
+  int32 hasReserved = 513;
+  int32 hasRetention = 514;
+  int32 hasRubyPackage = 515;
+  int32 hasSemantic = 516;
+  int32 hasServerStreaming = 517;
+  int32 hasSourceCodeInfo = 518;
+  int32 hasSourceContext = 519;
+  int32 hasSourceFile = 520;
+  int32 hasStart = 521;
+  int32 hasStringValue = 522;
+  int32 hasSwiftPrefix = 523;
+  int32 hasSyntax = 524;
+  int32 hasTrailingComments = 525;
+  int32 hasType = 526;
+  int32 hasTypeName = 527;
+  int32 hasUnverifiedLazy = 528;
+  int32 hasUtf8Validation = 529;
+  int32 hasValue = 530;
+  int32 hasVerification = 531;
+  int32 hasWeak = 532;
+  int32 hour = 533;
+  int32 i = 534;
+  int32 idempotencyLevel = 535;
+  int32 identifierValue = 536;
+  int32 if = 537;
+  int32 ignoreUnknownExtensionFields = 538;
+  int32 ignoreUnknownFields = 539;
+  int32 index = 540;
+  int32 init = 541;
+  int32 inout = 542;
+  int32 inputType = 543;
+  int32 insert = 544;
+  int32 Int = 545;
+  int32 Int32 = 546;
+  int32 Int32Value = 547;
+  int32 Int64 = 548;
+  int32 Int64Value = 549;
+  int32 Int8 = 550;
+  int32 integerLiteral = 551;
+  int32 IntegerLiteralType = 552;
+  int32 intern = 553;
+  int32 Internal = 554;
+  int32 InternalState = 555;
+  int32 intersect = 556;
+  int32 into = 557;
+  int32 ints = 558;
+  int32 invalidAnyTypeURL = 559;
+  int32 isA = 560;
+  int32 isEqual = 561;
+  int32 isEqualTo = 562;
+  int32 isExtension = 563;
+  int32 isInitialized = 564;
+  int32 isNegative = 565;
+  int32 isPathValid = 566;
+  int32 isValid = 567;
+  int32 itemTagsEncodedSize = 568;
+  int32 iterator = 569;
+  int32 javaGenerateEqualsAndHash = 570;
+  int32 javaGenericServices = 571;
+  int32 javaMultipleFiles = 572;
+  int32 javaOuterClassname = 573;
+  int32 javaPackage = 574;
+  int32 javaStringCheckUtf8 = 575;
+  int32 JSONDecoder = 576;
+  int32 JSONDecoding = 577;
+  int32 JSONDecodingError = 578;
+  int32 JSONDecodingOptions = 579;
+  int32 jsonEncoder = 580;
+  int32 JSONEncoding = 581;
+  int32 JSONEncodingError = 582;
+  int32 JSONEncodingOptions = 583;
+  int32 JSONEncodingVisitor = 584;
+  int32 jsonFormat = 585;
+  int32 JSONMapEncodingVisitor = 586;
+  int32 jsonName = 587;
+  int32 jsonPath = 588;
+  int32 jsonPaths = 589;
+  int32 JSONScanner = 590;
+  int32 jsonString = 591;
+  int32 jsonText = 592;
+  int32 jsonUTF8Bytes = 593;
+  int32 jsonUTF8Data = 594;
+  int32 jstype = 595;
+  int32 k = 596;
+  int32 kChunkSize = 597;
+  int32 Key = 598;
+  int32 keyField = 599;
+  int32 keyFieldOpt = 600;
+  int32 KeyType = 601;
+  int32 kind = 602;
+  int32 l = 603;
+  int32 label = 604;
+  int32 lazy = 605;
+  int32 leadingComments = 606;
+  int32 leadingDetachedComments = 607;
+  int32 length = 608;
+  int32 lessThan = 609;
+  int32 let = 610;
+  int32 lhs = 611;
+  int32 line = 612;
+  int32 list = 613;
+  int32 listOfMessages = 614;
+  int32 listValue = 615;
+  int32 littleEndian = 616;
+  int32 load = 617;
+  int32 localHasher = 618;
+  int32 location = 619;
+  int32 M = 620;
+  int32 major = 621;
+  int32 makeAsyncIterator = 622;
+  int32 makeIterator = 623;
+  int32 malformedLength = 624;
+  int32 mapEntry = 625;
+  int32 MapKeyType = 626;
+  int32 mapToMessages = 627;
+  int32 MapValueType = 628;
+  int32 mapVisitor = 629;
+  int32 mask = 630;
+  int32 maximumEdition = 631;
+  int32 mdayStart = 632;
+  int32 merge = 633;
+  int32 MergeOptions = 634;
+  int32 message = 635;
+  int32 messageDepthLimit = 636;
+  int32 messageEncoding = 637;
+  int32 MessageExtension = 638;
+  int32 MessageImplementationBase = 639;
+  int32 MessageOptions = 640;
+  int32 MessageSet = 641;
+  int32 messageSetWireFormat = 642;
+  int32 messageSize = 643;
+  int32 messageType = 644;
+  int32 Method = 645;
+  int32 MethodDescriptorProto = 646;
+  int32 MethodOptions = 647;
+  int32 methods = 648;
+  int32 min = 649;
+  int32 minimumEdition = 650;
+  int32 minor = 651;
+  int32 Mixin = 652;
+  int32 mixins = 653;
+  int32 modify = 654;
+  int32 month = 655;
+  int32 msgExtension = 656;
+  int32 mutating = 657;
+  int32 n = 658;
+  int32 name = 659;
+  int32 NameDescription = 660;
+  int32 NameMap = 661;
+  int32 NamePart = 662;
+  int32 names = 663;
+  int32 nanos = 664;
+  int32 negativeIntValue = 665;
+  int32 nestedType = 666;
+  int32 newExtensible = 667;
+  int32 newL = 668;
+  int32 newList = 669;
+  int32 newMessage = 670;
+  int32 newValue = 671;
+  int32 next = 672;
+  int32 nextByte = 673;
+  int32 nextFieldNumber = 674;
+  int32 nextVarInt = 675;
+  int32 nil = 676;
+  int32 nilLiteral = 677;
+  int32 noBytesAvailable = 678;
+  int32 noStandardDescriptorAccessor = 679;
+  int32 nullValue = 680;
+  int32 number = 681;
+  int32 numberValue = 682;
+  int32 objcClassPrefix = 683;
+  int32 of = 684;
+  int32 oneofDecl = 685;
+  int32 OneofDescriptorProto = 686;
+  int32 oneofIndex = 687;
+  int32 OneofOptions = 688;
+  int32 oneofs = 689;
+  int32 OneOf_Kind = 690;
+  int32 optimizeFor = 691;
+  int32 OptimizeMode = 692;
+  int32 Option = 693;
+  int32 OptionalEnumExtensionField = 694;
+  int32 OptionalExtensionField = 695;
+  int32 OptionalGroupExtensionField = 696;
+  int32 OptionalMessageExtensionField = 697;
+  int32 OptionRetention = 698;
+  int32 options = 699;
+  int32 OptionTargetType = 700;
+  int32 other = 701;
+  int32 others = 702;
+  int32 out = 703;
+  int32 outputType = 704;
+  int32 overridableFeatures = 705;
+  int32 p = 706;
+  int32 package = 707;
+  int32 packed = 708;
+  int32 PackedEnumExtensionField = 709;
+  int32 PackedExtensionField = 710;
+  int32 padding = 711;
+  int32 parent = 712;
+  int32 parse = 713;
+  int32 partial = 714;
+  int32 path = 715;
+  int32 PathDecoder = 716;
+  int32 PathDecodingError = 717;
+  int32 paths = 718;
+  int32 PathVisitor = 719;
+  int32 payload = 720;
+  int32 payloadSize = 721;
+  int32 phpClassPrefix = 722;
+  int32 phpMetadataNamespace = 723;
+  int32 phpNamespace = 724;
+  int32 pos = 725;
+  int32 positiveIntValue = 726;
+  int32 prefix = 727;
+  int32 preserveProtoFieldNames = 728;
+  int32 preTraverse = 729;
+  int32 prevPath = 730;
+  int32 printUnknownFields = 731;
+  int32 proto2 = 732;
+  int32 proto3DefaultValue = 733;
+  int32 proto3Optional = 734;
+  int32 ProtobufAPIVersionCheck = 735;
+  int32 ProtobufAPIVersion_2 = 736;
+  int32 ProtobufBool = 737;
+  int32 ProtobufBytes = 738;
+  int32 ProtobufDouble = 739;
+  int32 ProtobufEnumMap = 740;
+  int32 protobufExtension = 741;
+  int32 ProtobufFixed32 = 742;
+  int32 ProtobufFixed64 = 743;
+  int32 ProtobufFloat = 744;
+  int32 ProtobufInt32 = 745;
+  int32 ProtobufInt64 = 746;
+  int32 ProtobufMap = 747;
+  int32 ProtobufMessageMap = 748;
+  int32 ProtobufSFixed32 = 749;
+  int32 ProtobufSFixed64 = 750;
+  int32 ProtobufSInt32 = 751;
+  int32 ProtobufSInt64 = 752;
+  int32 ProtobufString = 753;
+  int32 ProtobufUInt32 = 754;
+  int32 ProtobufUInt64 = 755;
+  int32 protobuf_extensionFieldValues = 756;
+  int32 protobuf_fieldNumber = 757;
+  int32 protobuf_generated_isEqualTo = 758;
+  int32 protobuf_nameMap = 759;
+  int32 protobuf_newField = 760;
+  int32 protobuf_package = 761;
+  int32 protocol = 762;
+  int32 protoFieldName = 763;
+  int32 protoMessageName = 764;
+  int32 ProtoNameProviding = 765;
+  int32 protoPaths = 766;
+  int32 public = 767;
+  int32 publicDependency = 768;
+  int32 putBoolValue = 769;
+  int32 putBytesValue = 770;
+  int32 putDoubleValue = 771;
+  int32 putEnumValue = 772;
+  int32 putFixedUInt32 = 773;
+  int32 putFixedUInt64 = 774;
+  int32 putFloatValue = 775;
+  int32 putInt64 = 776;
+  int32 putStringValue = 777;
+  int32 putUInt64 = 778;
+  int32 putUInt64Hex = 779;
+  int32 putVarInt = 780;
+  int32 putZigZagVarInt = 781;
+  int32 pyGenericServices = 782;
+  int32 R = 783;
+  int32 rawChars = 784;
+  int32 RawRepresentable = 785;
+  int32 RawValue = 786;
+  int32 read4HexDigits = 787;
+  int32 readBytes = 788;
+  int32 register = 789;
+  int32 removingAllFieldsOf = 790;
+  int32 repeated = 791;
+  int32 RepeatedEnumExtensionField = 792;
+  int32 RepeatedExtensionField = 793;
+  int32 repeatedFieldEncoding = 794;
+  int32 RepeatedGroupExtensionField = 795;
+  int32 RepeatedMessageExtensionField = 796;
+  int32 repeating = 797;
+  int32 replaceRepeatedFields = 798;
+  int32 requestStreaming = 799;
+  int32 requestTypeURL = 800;
+  int32 requiredSize = 801;
+  int32 responseStreaming = 802;
+  int32 responseTypeURL = 803;
+  int32 result = 804;
+  int32 retention = 805;
+  int32 rethrows = 806;
+  int32 return = 807;
+  int32 ReturnType = 808;
+  int32 revision = 809;
+  int32 rhs = 810;
+  int32 root = 811;
+  int32 rubyPackage = 812;
+  int32 s = 813;
+  int32 sawBackslash = 814;
+  int32 sawSection4Characters = 815;
+  int32 sawSection5Characters = 816;
+  int32 scan = 817;
+  int32 scanner = 818;
+  int32 seconds = 819;
+  int32 self = 820;
+  int32 semantic = 821;
+  int32 Sendable = 822;
+  int32 separator = 823;
+  int32 serialize = 824;
+  int32 serializedBytes = 825;
+  int32 serializedData = 826;
+  int32 serializedSize = 827;
+  int32 serverStreaming = 828;
+  int32 service = 829;
+  int32 ServiceDescriptorProto = 830;
+  int32 ServiceOptions = 831;
+  int32 set = 832;
+  int32 setExtensionValue = 833;
+  int32 shift = 834;
+  int32 SimpleExtensionMap = 835;
+  int32 size = 836;
+  int32 sizer = 837;
+  int32 source = 838;
+  int32 sourceCodeInfo = 839;
+  int32 sourceContext = 840;
+  int32 sourceEncoding = 841;
+  int32 sourceFile = 842;
+  int32 SourceLocation = 843;
+  int32 span = 844;
+  int32 split = 845;
+  int32 start = 846;
+  int32 startArray = 847;
+  int32 startArrayObject = 848;
+  int32 startField = 849;
+  int32 startIndex = 850;
+  int32 startMessageField = 851;
+  int32 startObject = 852;
+  int32 startRegularField = 853;
+  int32 state = 854;
+  int32 static = 855;
+  int32 StaticString = 856;
+  int32 storage = 857;
+  int32 String = 858;
+  int32 stringLiteral = 859;
+  int32 StringLiteralType = 860;
+  int32 stringResult = 861;
+  int32 stringValue = 862;
+  int32 struct = 863;
+  int32 structValue = 864;
+  int32 subDecoder = 865;
+  int32 subscript = 866;
+  int32 subtract = 867;
+  int32 subVisitor = 868;
+  int32 Swift = 869;
+  int32 swiftPrefix = 870;
+  int32 SwiftProtobufContiguousBytes = 871;
+  int32 SwiftProtobufError = 872;
+  int32 syntax = 873;
+  int32 T = 874;
+  int32 tag = 875;
+  int32 targets = 876;
+  int32 terminator = 877;
+  int32 testDecoder = 878;
+  int32 text = 879;
+  int32 textDecoder = 880;
+  int32 TextFormatDecoder = 881;
+  int32 TextFormatDecodingError = 882;
+  int32 TextFormatDecodingOptions = 883;
+  int32 TextFormatEncodingOptions = 884;
+  int32 TextFormatEncodingVisitor = 885;
+  int32 textFormatString = 886;
+  int32 throwOrIgnore = 887;
+  int32 throws = 888;
+  int32 timeInterval = 889;
+  int32 timeIntervalSince1970 = 890;
+  int32 timeIntervalSinceReferenceDate = 891;
+  int32 Timestamp = 892;
+  int32 tmp = 893;
+  int32 tooLarge = 894;
+  int32 total = 895;
+  int32 totalArrayDepth = 896;
+  int32 totalSize = 897;
+  int32 trailingComments = 898;
+  int32 traverse = 899;
+  int32 trim = 900;
+  int32 true = 901;
+  int32 try = 902;
+  int32 type = 903;
+  int32 typealias = 904;
+  int32 TypeEnum = 905;
+  int32 typeName = 906;
+  int32 typePrefix = 907;
+  int32 typeStart = 908;
+  int32 typeUnknown = 909;
+  int32 typeURL = 910;
+  int32 UInt32 = 911;
+  int32 UInt32Value = 912;
+  int32 UInt64 = 913;
+  int32 UInt64Value = 914;
+  int32 UInt8 = 915;
+  int32 unchecked = 916;
+  int32 unicodeScalarLiteral = 917;
+  int32 UnicodeScalarLiteralType = 918;
+  int32 unicodeScalars = 919;
+  int32 UnicodeScalarView = 920;
+  int32 uninterpretedOption = 921;
+  int32 union = 922;
+  int32 uniqueStorage = 923;
+  int32 unknown = 924;
+  int32 unknownFields = 925;
+  int32 UnknownStorage = 926;
+  int32 unpackTo = 927;
+  int32 UnsafeBufferPointer = 928;
+  int32 UnsafeMutablePointer = 929;
+  int32 UnsafeMutableRawBufferPointer = 930;
+  int32 UnsafeRawBufferPointer = 931;
+  int32 UnsafeRawPointer = 932;
+  int32 unverifiedLazy = 933;
+  int32 updatedOptions = 934;
+  int32 url = 935;
+  int32 useDeterministicOrdering = 936;
+  int32 utf8 = 937;
+  int32 utf8Ptr = 938;
+  int32 utf8ToDouble = 939;
+  int32 utf8Validation = 940;
+  int32 UTF8View = 941;
+  int32 v = 942;
+  int32 value = 943;
+  int32 valueField = 944;
+  int32 values = 945;
+  int32 ValueType = 946;
+  int32 var = 947;
+  int32 verification = 948;
+  int32 VerificationState = 949;
+  int32 Version = 950;
+  int32 versionString = 951;
+  int32 visitExtensionFields = 952;
+  int32 visitExtensionFieldsAsMessageSet = 953;
+  int32 visitMapField = 954;
+  int32 visitor = 955;
+  int32 visitPacked = 956;
+  int32 visitPackedBoolField = 957;
+  int32 visitPackedDoubleField = 958;
+  int32 visitPackedEnumField = 959;
+  int32 visitPackedFixed32Field = 960;
+  int32 visitPackedFixed64Field = 961;
+  int32 visitPackedFloatField = 962;
+  int32 visitPackedInt32Field = 963;
+  int32 visitPackedInt64Field = 964;
+  int32 visitPackedSFixed32Field = 965;
+  int32 visitPackedSFixed64Field = 966;
+  int32 visitPackedSInt32Field = 967;
+  int32 visitPackedSInt64Field = 968;
+  int32 visitPackedUInt32Field = 969;
+  int32 visitPackedUInt64Field = 970;
+  int32 visitRepeated = 971;
+  int32 visitRepeatedBoolField = 972;
+  int32 visitRepeatedBytesField = 973;
+  int32 visitRepeatedDoubleField = 974;
+  int32 visitRepeatedEnumField = 975;
+  int32 visitRepeatedFixed32Field = 976;
+  int32 visitRepeatedFixed64Field = 977;
+  int32 visitRepeatedFloatField = 978;
+  int32 visitRepeatedGroupField = 979;
+  int32 visitRepeatedInt32Field = 980;
+  int32 visitRepeatedInt64Field = 981;
+  int32 visitRepeatedMessageField = 982;
+  int32 visitRepeatedSFixed32Field = 983;
+  int32 visitRepeatedSFixed64Field = 984;
+  int32 visitRepeatedSInt32Field = 985;
+  int32 visitRepeatedSInt64Field = 986;
+  int32 visitRepeatedStringField = 987;
+  int32 visitRepeatedUInt32Field = 988;
+  int32 visitRepeatedUInt64Field = 989;
+  int32 visitSingular = 990;
+  int32 visitSingularBoolField = 991;
+  int32 visitSingularBytesField = 992;
+  int32 visitSingularDoubleField = 993;
+  int32 visitSingularEnumField = 994;
+  int32 visitSingularFixed32Field = 995;
+  int32 visitSingularFixed64Field = 996;
+  int32 visitSingularFloatField = 997;
+  int32 visitSingularGroupField = 998;
+  int32 visitSingularInt32Field = 999;
+  int32 visitSingularInt64Field = 1000;
+  int32 visitSingularMessageField = 1001;
+  int32 visitSingularSFixed32Field = 1002;
+  int32 visitSingularSFixed64Field = 1003;
+  int32 visitSingularSInt32Field = 1004;
+  int32 visitSingularSInt64Field = 1005;
+  int32 visitSingularStringField = 1006;
+  int32 visitSingularUInt32Field = 1007;
+  int32 visitSingularUInt64Field = 1008;
+  int32 visitUnknown = 1009;
+  int32 wasDecoded = 1010;
+  int32 weak = 1011;
+  int32 weakDependency = 1012;
+  int32 where = 1013;
+  int32 wireFormat = 1014;
+  int32 with = 1015;
+  int32 withUnsafeBytes = 1016;
+  int32 withUnsafeMutableBytes = 1017;
+  int32 work = 1018;
+  int32 Wrapped = 1019;
+  int32 WrappedType = 1020;
+  int32 wrappedValue = 1021;
+  int32 written = 1022;
+  int32 yday = 1023;
 }
diff --git a/Protos/SwiftProtobufTests/generated_swift_names_messages.proto b/Protos/SwiftProtobufTests/generated_swift_names_messages.proto
index 040e7b65d..19b5f73b7 100644
--- a/Protos/SwiftProtobufTests/generated_swift_names_messages.proto
+++ b/Protos/SwiftProtobufTests/generated_swift_names_messages.proto
@@ -100,6 +100,7 @@ message GeneratedSwiftReservedMessages {
   message clearEditionIntroduced { int32 clearEditionIntroduced = 1; }
   message clearEditionRemoved { int32 clearEditionRemoved = 1; }
   message clearEnd { int32 clearEnd = 1; }
+  message clearEnforceNamingStyle { int32 clearEnforceNamingStyle = 1; }
   message clearEnumType { int32 clearEnumType = 1; }
   message clearExtendee { int32 clearExtendee = 1; }
   message clearExtensionValue { int32 clearExtensionValue = 1; }
@@ -267,7 +268,7 @@ message GeneratedSwiftReservedMessages {
   message discardUnknownFields { int32 discardUnknownFields = 1; }
   message Double { int32 Double = 1; }
   message doubleValue { int32 doubleValue = 1; }
-  message Duration { int32 Duration = 1; }
+  message duration { int32 duration = 1; }
   message E { int32 E = 1; }
   message edition { int32 edition = 1; }
   message EditionDefault { int32 EditionDefault = 1; }
@@ -282,6 +283,7 @@ message GeneratedSwiftReservedMessages {
   message emitFieldName { int32 emitFieldName = 1; }
   message emitFieldNumber { int32 emitFieldNumber = 1; }
   message Empty { int32 Empty = 1; }
+  message emptyAnyTypeURL { int32 emptyAnyTypeURL = 1; }
   message emptyData { int32 emptyData = 1; }
   message encodeAsBytes { int32 encodeAsBytes = 1; }
   message encoded { int32 encoded = 1; }
@@ -294,6 +296,7 @@ message GeneratedSwiftReservedMessages {
   message endMessageField { int32 endMessageField = 1; }
   message endObject { int32 endObject = 1; }
   message endRegularField { int32 endRegularField = 1; }
+  message enforceNamingStyle { int32 enforceNamingStyle = 1; }
   message enum { int32 enum = 1; }
   message EnumDescriptorProto { int32 EnumDescriptorProto = 1; }
   message EnumOptions { int32 EnumOptions = 1; }
@@ -457,6 +460,7 @@ message GeneratedSwiftReservedMessages {
   message hasEditionIntroduced { int32 hasEditionIntroduced = 1; }
   message hasEditionRemoved { int32 hasEditionRemoved = 1; }
   message hasEnd { int32 hasEnd = 1; }
+  message hasEnforceNamingStyle { int32 hasEnforceNamingStyle = 1; }
   message hasEnumType { int32 hasEnumType = 1; }
   message hasExtendee { int32 hasExtendee = 1; }
   message hasExtensionValue { int32 hasExtensionValue = 1; }
@@ -558,6 +562,7 @@ message GeneratedSwiftReservedMessages {
   message intersect { int32 intersect = 1; }
   message into { int32 into = 1; }
   message ints { int32 ints = 1; }
+  message invalidAnyTypeURL { int32 invalidAnyTypeURL = 1; }
   message isA { int32 isA = 1; }
   message isEqual { int32 isEqual = 1; }
   message isEqualTo { int32 isEqualTo = 1; }
@@ -575,9 +580,11 @@ message GeneratedSwiftReservedMessages {
   message javaPackage { int32 javaPackage = 1; }
   message javaStringCheckUtf8 { int32 javaStringCheckUtf8 = 1; }
   message JSONDecoder { int32 JSONDecoder = 1; }
+  message JSONDecoding { int32 JSONDecoding = 1; }
   message JSONDecodingError { int32 JSONDecodingError = 1; }
   message JSONDecodingOptions { int32 JSONDecodingOptions = 1; }
   message jsonEncoder { int32 jsonEncoder = 1; }
+  message JSONEncoding { int32 JSONEncoding = 1; }
   message JSONEncodingError { int32 JSONEncodingError = 1; }
   message JSONEncodingOptions { int32 JSONEncodingOptions = 1; }
   message JSONEncodingVisitor { int32 JSONEncodingVisitor = 1; }
diff --git a/Protos/upstream/editions/golden/test_messages_proto2_editions.proto b/Protos/upstream/editions/golden/test_messages_proto2_editions.proto
index 23988c624..4cfcd2327 100644
--- a/Protos/upstream/editions/golden/test_messages_proto2_editions.proto
+++ b/Protos/upstream/editions/golden/test_messages_proto2_editions.proto
@@ -316,6 +316,8 @@ message TestAllTypesProto2 {
   // Reserved for unknown fields test.
   reserved 1000 to 9999;
 
+  MessageSetCorrect message_set_correct = 500;
+
   // message_set test case.
   message MessageSetCorrect {
     option message_set_wire_format = true;
@@ -338,6 +340,17 @@ message TestAllTypesProto2 {
 
     int32 i = 9;
   }
+
+  message ExtensionWithOneof {
+    oneof oneof_field {
+      int32 a = 1;
+      int32 b = 2;
+    }
+
+    extend MessageSetCorrect {
+      ExtensionWithOneof extension_with_oneof = 123456789;
+    }
+  }
 }
 
 message ForeignMessageProto2 {
@@ -640,3 +653,28 @@ message TestAllRequiredTypesProto2 {
     ];
   }
 }
+
+message TestLargeOneof {
+  message A1 {
+  }
+
+  message A2 {
+  }
+
+  message A3 {
+  }
+
+  message A4 {
+  }
+
+  message A5 {
+  }
+
+  oneof large_oneof {
+    A1 a1 = 1;
+    A2 a2 = 2;
+    A3 a3 = 3;
+    A4 a4 = 4;
+    A5 a5 = 5;
+  }
+}
diff --git a/Protos/upstream/google/protobuf/any_test.proto b/Protos/upstream/google/protobuf/any_test.proto
index db8c97c1c..05b0c8bcd 100644
--- a/Protos/upstream/google/protobuf/any_test.proto
+++ b/Protos/upstream/google/protobuf/any_test.proto
@@ -7,7 +7,7 @@
 
 syntax = "proto3";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/any.proto";
 
diff --git a/Protos/upstream/google/protobuf/descriptor.proto b/Protos/upstream/google/protobuf/descriptor.proto
index dd2d0fbf4..ac3de48de 100644
--- a/Protos/upstream/google/protobuf/descriptor.proto
+++ b/Protos/upstream/google/protobuf/descriptor.proto
@@ -1098,6 +1098,29 @@ message FeatureSet {
     edition_defaults = { edition: EDITION_PROTO3, value: "ALLOW" }
   ];
 
+  enum EnforceNamingStyle {
+    ENFORCE_NAMING_STYLE_UNKNOWN = 0;
+    STYLE2024 = 1;
+    STYLE_LEGACY = 2;
+  }
+  optional EnforceNamingStyle enforce_naming_style = 7 [
+    retention = RETENTION_SOURCE,
+    targets = TARGET_TYPE_FILE,
+    targets = TARGET_TYPE_EXTENSION_RANGE,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_FIELD,
+    targets = TARGET_TYPE_ONEOF,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_ENUM_ENTRY,
+    targets = TARGET_TYPE_SERVICE,
+    targets = TARGET_TYPE_METHOD,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = { edition: EDITION_LEGACY, value: "STYLE_LEGACY" },
+    edition_defaults = { edition: EDITION_2024, value: "STYLE2024" }
+  ];
+
   reserved 999;
 
   extensions 1000 to 9994 [
diff --git a/Protos/upstream/google/protobuf/edition_unittest.proto b/Protos/upstream/google/protobuf/edition_unittest.proto
index 794c1e5c2..fe540a408 100644
--- a/Protos/upstream/google/protobuf/edition_unittest.proto
+++ b/Protos/upstream/google/protobuf/edition_unittest.proto
@@ -83,18 +83,18 @@ message TestAllTypes {
 
   NestedMessage                        optional_nested_message  = 18;
   ForeignMessage                       optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message  = 20;
+  proto2_unittest_import.ImportMessage optional_import_message  = 20;
 
   NestedEnum                           optional_nested_enum     = 21;
   ForeignEnum                          optional_foreign_enum    = 22;
-  protobuf_unittest_import.ImportEnum    optional_import_enum     = 23;
+  proto2_unittest_import.ImportEnum    optional_import_enum     = 23;
 
   string optional_string_piece = 24 [ctype=STRING_PIECE];
   string optional_cord = 25 [ctype=CORD];
   bytes optional_bytes_cord = 86 [ctype=CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage
+  proto2_unittest_import.PublicImportMessage
       optional_public_import_message = 26;
 
   NestedMessage optional_lazy_message = 27 [lazy=true];
@@ -125,11 +125,11 @@ message TestAllTypes {
 
   repeated NestedMessage                        repeated_nested_message  = 48;
   repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message  = 50;
 
   repeated NestedEnum                           repeated_nested_enum     = 51;
   repeated ForeignEnum                          repeated_foreign_enum    = 52;
-  repeated protobuf_unittest_import.ImportEnum    repeated_import_enum     = 53;
+  repeated proto2_unittest_import.ImportEnum    repeated_import_enum     = 53;
 
   repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
   repeated string repeated_cord = 55 [ctype=CORD];
@@ -155,7 +155,7 @@ message TestAllTypes {
 
   NestedEnum  default_nested_enum  = 81 [default = BAR        ];
   ForeignEnum default_foreign_enum = 82 [default = FOREIGN_BAR];
-  protobuf_unittest_import.ImportEnum
+  proto2_unittest_import.ImportEnum
       default_import_enum = 83 [default = IMPORT_BAR];
 
   string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"];
@@ -255,12 +255,12 @@ extend TestAllExtensions {
 
   TestAllTypes.NestedMessage optional_nested_message_extension = 18;
   ForeignMessage optional_foreign_message_extension = 19;
-  protobuf_unittest_import.ImportMessage
+  proto2_unittest_import.ImportMessage
     optional_import_message_extension = 20;
 
   TestAllTypes.NestedEnum optional_nested_enum_extension = 21;
   ForeignEnum optional_foreign_enum_extension = 22;
-  protobuf_unittest_import.ImportEnum
+  proto2_unittest_import.ImportEnum
     optional_import_enum_extension = 23;
 
   string optional_string_piece_extension = 24 [ctype=STRING_PIECE];
@@ -269,7 +269,7 @@ extend TestAllExtensions {
   string optional_cord_extension = 25;
   bytes optional_bytes_cord_extension = 86;
 
-  protobuf_unittest_import.PublicImportMessage
+  proto2_unittest_import.PublicImportMessage
     optional_public_import_message_extension = 26;
 
   TestAllTypes.NestedMessage
@@ -299,12 +299,12 @@ extend TestAllExtensions {
 
   repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 48;
   repeated ForeignMessage repeated_foreign_message_extension = 49;
-  repeated protobuf_unittest_import.ImportMessage
+  repeated proto2_unittest_import.ImportMessage
     repeated_import_message_extension = 50;
 
   repeated TestAllTypes.NestedEnum repeated_nested_enum_extension = 51;
   repeated ForeignEnum repeated_foreign_enum_extension = 52;
-  repeated protobuf_unittest_import.ImportEnum
+  repeated proto2_unittest_import.ImportEnum
     repeated_import_enum_extension = 53;
 
   repeated string repeated_string_piece_extension = 54 [ctype=STRING_PIECE];
@@ -336,7 +336,7 @@ extend TestAllExtensions {
     default_nested_enum_extension = 81 [default = BAR];
   ForeignEnum
     default_foreign_enum_extension = 82 [default = FOREIGN_BAR];
-  protobuf_unittest_import.ImportEnum
+  proto2_unittest_import.ImportEnum
     default_import_enum_extension = 83 [default = IMPORT_BAR];
 
   string default_string_piece_extension = 84
@@ -649,7 +649,7 @@ message TestIsInitialized {
 // Test that groups have disjoint field numbers from their siblings and
 // parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
 // to compile with proto1, this will emit an error; so we only include it
-// in protobuf_unittest_proto.
+// in proto2_unittest_proto.
 message TestDupFieldNumber {                        // NO_PROTO1
   int32 a = 1;                             // NO_PROTO1
   message Foo { int32 a = 1; }  // NO_PROTO1
diff --git a/Protos/upstream/google/protobuf/late_loaded_option.proto b/Protos/upstream/google/protobuf/late_loaded_option.proto
index 6fc30166f..4c1b492b0 100644
--- a/Protos/upstream/google/protobuf/late_loaded_option.proto
+++ b/Protos/upstream/google/protobuf/late_loaded_option.proto
@@ -1,6 +1,6 @@
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/descriptor.proto";
 
diff --git a/Protos/upstream/google/protobuf/late_loaded_option_user.proto b/Protos/upstream/google/protobuf/late_loaded_option_user.proto
index f969af216..b27a015fd 100644
--- a/Protos/upstream/google/protobuf/late_loaded_option_user.proto
+++ b/Protos/upstream/google/protobuf/late_loaded_option_user.proto
@@ -1,11 +1,11 @@
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/late_loaded_option.proto";
 
 message LateLoadedOptionUser {
-  option (protobuf_unittest.LateLoadedOption.ext) = {
+  option (proto2_unittest.LateLoadedOption.ext) = {
     value: 1
   };
 }
diff --git a/Protos/upstream/google/protobuf/map_lite_unittest.proto b/Protos/upstream/google/protobuf/map_lite_unittest.proto
index b42b3de88..3bf3e2c23 100644
--- a/Protos/upstream/google/protobuf/map_lite_unittest.proto
+++ b/Protos/upstream/google/protobuf/map_lite_unittest.proto
@@ -7,7 +7,7 @@
 
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/unittest_lite.proto";
 
diff --git a/Protos/upstream/google/protobuf/map_proto2_unittest.proto b/Protos/upstream/google/protobuf/map_proto2_unittest.proto
index 34a381289..a9c09e80c 100644
--- a/Protos/upstream/google/protobuf/map_proto2_unittest.proto
+++ b/Protos/upstream/google/protobuf/map_proto2_unittest.proto
@@ -13,8 +13,8 @@ option cc_enable_arenas = true;
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
+// In map_test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest;
 
 enum Proto2MapEnum {
   PROTO2_MAP_ENUM_FOO = 0;
@@ -68,7 +68,7 @@ message TestEnumMapPlusExtra {
 }
 
 message TestImportEnumMap {
-  map<int32, protobuf_unittest_import.ImportEnumForMap> import_enum_amp = 1;
+  map<int32, proto2_unittest_import.ImportEnumForMap> import_enum_amp = 1;
 }
 
 message TestIntIntMap {
diff --git a/Protos/upstream/google/protobuf/map_proto3_unittest.proto b/Protos/upstream/google/protobuf/map_proto3_unittest.proto
index 29a3b367a..5c9d5c512 100644
--- a/Protos/upstream/google/protobuf/map_proto3_unittest.proto
+++ b/Protos/upstream/google/protobuf/map_proto3_unittest.proto
@@ -14,7 +14,7 @@ option features.field_presence = IMPLICIT;
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
+// In map_test_util.h we do "using namespace unittest = proto2_unittest".
 package proto3_unittest;
 
 message TestProto3BytesMap {
diff --git a/Protos/upstream/google/protobuf/map_unittest.proto b/Protos/upstream/google/protobuf/map_unittest.proto
index 91ee855a9..869b45dd7 100644
--- a/Protos/upstream/google/protobuf/map_unittest.proto
+++ b/Protos/upstream/google/protobuf/map_unittest.proto
@@ -13,8 +13,8 @@ import "google/protobuf/unittest.proto";
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
+// In map_test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest;
 
 // Tests maps.
 message TestMap {
diff --git a/Protos/upstream/google/protobuf/only_one_enum_test.proto b/Protos/upstream/google/protobuf/only_one_enum_test.proto
index 3446e86a4..f20fb20ab 100644
--- a/Protos/upstream/google/protobuf/only_one_enum_test.proto
+++ b/Protos/upstream/google/protobuf/only_one_enum_test.proto
@@ -1,6 +1,6 @@
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 option optimize_for = LITE_RUNTIME;
 
diff --git a/Protos/upstream/google/protobuf/test_messages_proto2.proto b/Protos/upstream/google/protobuf/test_messages_proto2.proto
index 73cba558c..a5d261403 100644
--- a/Protos/upstream/google/protobuf/test_messages_proto2.proto
+++ b/Protos/upstream/google/protobuf/test_messages_proto2.proto
@@ -219,6 +219,8 @@ message TestAllTypesProto2 {
   // Reserved for unknown fields test.
   reserved 1000 to 9999;
 
+  optional MessageSetCorrect message_set_correct = 500;
+
   // message_set test case.
   message MessageSetCorrect {
     option message_set_wire_format = true;
@@ -239,6 +241,16 @@ message TestAllTypesProto2 {
     }
     optional int32 i = 9;
   }
+
+  message ExtensionWithOneof {
+    oneof oneof_field {
+      int32 a = 1;
+      int32 b = 2;
+    }
+    extend MessageSetCorrect {
+      optional ExtensionWithOneof extension_with_oneof = 123456789;
+    }
+  }
 }
 
 message ForeignMessageProto2 {
@@ -385,3 +397,18 @@ message TestAllRequiredTypesProto2 {
     required int32 i = 9;
   }
 }
+
+message TestLargeOneof {
+  message A1 {}
+  message A2 {}
+  message A3 {}
+  message A4 {}
+  message A5 {}
+  oneof large_oneof {
+    A1 a1 = 1;
+    A2 a2 = 2;
+    A3 a3 = 3;
+    A4 a4 = 4;
+    A5 a5 = 5;
+  }
+}
diff --git a/Protos/upstream/google/protobuf/unittest.proto b/Protos/upstream/google/protobuf/unittest.proto
index 3f1aa841d..c63ea58c4 100644
--- a/Protos/upstream/google/protobuf/unittest.proto
+++ b/Protos/upstream/google/protobuf/unittest.proto
@@ -17,8 +17,8 @@ edition = "2023";
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
+// In test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest;
 
 import "google/protobuf/unittest_import.proto";
 
@@ -85,10 +85,10 @@ message TestAllTypes {
 
   NestedMessage optional_nested_message = 18;
   ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
+  proto2_unittest_import.ImportMessage optional_import_message = 20;
   NestedEnum optional_nested_enum = 21;
   ForeignEnum optional_foreign_enum = 22;
-  protobuf_unittest_import.ImportEnum optional_import_enum = 23;
+  proto2_unittest_import.ImportEnum optional_import_enum = 23;
   string optional_string_piece = 24 [
     ctype = STRING_PIECE
   ];
@@ -99,7 +99,7 @@ message TestAllTypes {
   bytes optional_bytes_cord = 86 [ctype=CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message = 26;
+  proto2_unittest_import.PublicImportMessage optional_public_import_message = 26;
   NestedMessage optional_lazy_message = 27 [
     lazy = true
   ];
@@ -135,10 +135,10 @@ message TestAllTypes {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message = 50;
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnum repeated_foreign_enum = 52;
-  repeated protobuf_unittest_import.ImportEnum repeated_import_enum = 53;
+  repeated proto2_unittest_import.ImportEnum repeated_import_enum = 53;
   repeated string repeated_string_piece = 54 [
     ctype = STRING_PIECE
   ];
@@ -220,7 +220,7 @@ message TestAllTypes {
     default = FOREIGN_BAR
   ];
 
-  protobuf_unittest_import.ImportEnum default_import_enum = 83 [
+  proto2_unittest_import.ImportEnum default_import_enum = 83 [
     default = IMPORT_BAR
   ];
 
@@ -350,10 +350,10 @@ extend TestAllExtensions {
 
   TestAllTypes.NestedMessage optional_nested_message_extension = 18;
   ForeignMessage optional_foreign_message_extension = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message_extension = 20;
+  proto2_unittest_import.ImportMessage optional_import_message_extension = 20;
   TestAllTypes.NestedEnum optional_nested_enum_extension = 21;
   ForeignEnum optional_foreign_enum_extension = 22;
-  protobuf_unittest_import.ImportEnum optional_import_enum_extension = 23;
+  proto2_unittest_import.ImportEnum optional_import_enum_extension = 23;
   string optional_string_piece_extension = 24 [
     ctype = STRING_PIECE
   ];
@@ -363,7 +363,7 @@ extend TestAllExtensions {
   string optional_cord_extension = 25;
   bytes optional_bytes_cord_extension = 86;
 
-  protobuf_unittest_import.PublicImportMessage
+  proto2_unittest_import.PublicImportMessage
       optional_public_import_message_extension = 26;
   TestAllTypes.NestedMessage optional_lazy_message_extension = 27 [
     lazy = true
@@ -395,11 +395,11 @@ extend TestAllExtensions {
 
   repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 48;
   repeated ForeignMessage repeated_foreign_message_extension = 49;
-  repeated protobuf_unittest_import.ImportMessage
+  repeated proto2_unittest_import.ImportMessage
       repeated_import_message_extension = 50;
   repeated TestAllTypes.NestedEnum repeated_nested_enum_extension = 51;
   repeated ForeignEnum repeated_foreign_enum_extension = 52;
-  repeated protobuf_unittest_import.ImportEnum repeated_import_enum_extension = 53;
+  repeated proto2_unittest_import.ImportEnum repeated_import_enum_extension = 53;
   repeated string repeated_string_piece_extension = 54 [
     ctype = STRING_PIECE
   ];
@@ -480,7 +480,7 @@ extend TestAllExtensions {
     default = FOREIGN_BAR
   ];
 
-  protobuf_unittest_import.ImportEnum default_import_enum_extension = 83 [
+  proto2_unittest_import.ImportEnum default_import_enum_extension = 83 [
     default = IMPORT_BAR
   ];
 
@@ -500,6 +500,13 @@ extend TestAllExtensions {
   TestAllTypes.NestedMessage oneof_nested_message_extension = 112;
   string oneof_string_extension = 113;
   bytes oneof_bytes_extension = 114;
+
+  string optional_utf8_string_extension = 115 [
+    features.utf8_validation = VERIFY
+  ];
+  repeated string repeated_utf8_string_extension = 116 [
+    features.utf8_validation = VERIFY
+  ];
 }
 
 message OptionalGroup_extension {
@@ -897,7 +904,7 @@ message TestIsInitialized {
 // Test that groups have disjoint field numbers from their siblings and
 // parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
 // to compile with proto1, this will emit an error; so we only include it
-// in protobuf_unittest_proto.
+// in proto2_unittest_proto.
 message TestDupFieldNumber {// NO_PROTO1
   int32 a = 1; // NO_PROTO1
   message Foo { // NO_PROTO1
@@ -1796,8 +1803,8 @@ message TestHugeFieldNumbers {
   extensions 536860000 to 536869999 [
     declaration = {
       number: 536860000
-      full_name: ".protobuf_unittest.test_all_types"
-      type: ".protobuf_unittest.TestAllTypes"
+      full_name: ".proto2_unittest.test_all_types"
+      type: ".proto2_unittest.TestAllTypes"
     }
   ];
 }
@@ -1836,7 +1843,7 @@ message TestNestedGroupExtensionOuter {
       // [metadata = {
       //  NOTE: can't write type there due to some clever build gen code at
       //  http://google3/google/protobuf/BUILD;l=1247;rcl=411090862
-      //  type: "protobuf_unittest.TestNestedGroupExtensionInnerExtension",
+      //  type: "proto2_unittest.TestNestedGroupExtensionInnerExtension",
       //  name: "inner",
       //  }]
       ;
diff --git a/Protos/upstream/google/protobuf/unittest_custom_options.proto b/Protos/upstream/google/protobuf/unittest_custom_options.proto
index 707501277..3ebb8e36a 100644
--- a/Protos/upstream/google/protobuf/unittest_custom_options.proto
+++ b/Protos/upstream/google/protobuf/unittest_custom_options.proto
@@ -27,7 +27,7 @@ import "google/protobuf/descriptor.proto";
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-package protobuf_unittest;
+package proto2_unittest;
 
 // Some simple test custom options of various types.
 
@@ -260,7 +260,7 @@ extend ComplexOptionType2 {
 }
 
 extend google.protobuf.MessageOptions {
-  optional protobuf_unittest.ComplexOptionType1 complex_opt1 = 7646756;
+  optional proto2_unittest.ComplexOptionType1 complex_opt1 = 7646756;
   optional ComplexOptionType2 complex_opt2 = 7636949;
   optional ComplexOptionType3 complex_opt3 = 7636463;
   optional group ComplexOpt6 = 7595468 {
@@ -270,19 +270,19 @@ extend google.protobuf.MessageOptions {
 
 // Note that we try various different ways of naming the same extension.
 message VariousComplexOptions {
-  option (.protobuf_unittest.complex_opt1).foo = 42;
-  option (protobuf_unittest.complex_opt1).(.protobuf_unittest.mooo) = 324;
-  option (.protobuf_unittest.complex_opt1).(protobuf_unittest.corge).moo = 876;
-  option (protobuf_unittest.complex_opt1).foo4 = 99;
-  option (protobuf_unittest.complex_opt1).foo4 = 88;
+  option (.proto2_unittest.complex_opt1).foo = 42;
+  option (proto2_unittest.complex_opt1).(.proto2_unittest.mooo) = 324;
+  option (.proto2_unittest.complex_opt1).(proto2_unittest.corge).moo = 876;
+  option (proto2_unittest.complex_opt1).foo4 = 99;
+  option (proto2_unittest.complex_opt1).foo4 = 88;
   option (complex_opt2).baz = 987;
   option (complex_opt2).(grault) = 654;
   option (complex_opt2).bar.foo = 743;
   option (complex_opt2).bar.(mooo) = 1999;
-  option (complex_opt2).bar.(protobuf_unittest.corge).moo = 2008;
+  option (complex_opt2).bar.(proto2_unittest.corge).moo = 2008;
   option (complex_opt2).(garply).foo = 741;
-  option (complex_opt2).(garply).(.protobuf_unittest.mooo) = 1998;
-  option (complex_opt2).(protobuf_unittest.garply).(corge).moo = 2121;
+  option (complex_opt2).(garply).(.proto2_unittest.mooo) = 1998;
+  option (complex_opt2).(proto2_unittest.garply).(corge).moo = 2121;
   option (ComplexOptionType2.ComplexOptionType4.complex_opt4).waldo = 1971;
   option (complex_opt2).fred.waldo = 321;
   option (complex_opt2).barney = {
@@ -291,7 +291,7 @@ message VariousComplexOptions {
   option (complex_opt2).barney = {
     waldo: 212
   };
-  option (protobuf_unittest.complex_opt3).moo = 9;
+  option (proto2_unittest.complex_opt3).moo = 9;
   option (complex_opt3).complexoptiontype5.plugh = 22;
   option (complexopt6).xyzzy = 24;
 }
@@ -370,18 +370,18 @@ option (fileopt) = {
   // Include a google.protobuf.FileOptions and recursively extend it with
   // another fileopt.
   file {
-    [protobuf_unittest.fileopt] { s: 'FileExtensionAnnotation' }
+    [proto2_unittest.fileopt] { s: 'FileExtensionAnnotation' }
   }
 
   // A message set inside an option value
   mset {
-    [protobuf_unittest.AggregateMessageSetElement.message_set_extension] {
+    [proto2_unittest.AggregateMessageSetElement.message_set_extension] {
       s: 'EmbeddedMessageSetElement'
     }
   }
 
   any {
-    [type.googleapis.com/protobuf_unittest.AggregateMessageSetElement] {
+    [type.googleapis.com/proto2_unittest.AggregateMessageSetElement] {
       s: 'EmbeddedMessageSetElement'
     }
   }
diff --git a/Protos/upstream/google/protobuf/unittest_embed_optimize_for.proto b/Protos/upstream/google/protobuf/unittest_embed_optimize_for.proto
index f4f2f8944..ef9b567ee 100644
--- a/Protos/upstream/google/protobuf/unittest_embed_optimize_for.proto
+++ b/Protos/upstream/google/protobuf/unittest_embed_optimize_for.proto
@@ -13,7 +13,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/unittest_optimize_for.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_enormous_descriptor.proto b/Protos/upstream/google/protobuf/unittest_enormous_descriptor.proto
index a8b6452a5..5a1acd8eb 100644
--- a/Protos/upstream/google/protobuf/unittest_enormous_descriptor.proto
+++ b/Protos/upstream/google/protobuf/unittest_enormous_descriptor.proto
@@ -16,7 +16,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 option java_package = "com.google.protobuf";
 
 // Avoid generating insanely long methods.
diff --git a/Protos/upstream/google/protobuf/unittest_extension_set.proto b/Protos/upstream/google/protobuf/unittest_extension_set.proto
index 0aa923c34..1f67b5ba8 100644
--- a/Protos/upstream/google/protobuf/unittest_extension_set.proto
+++ b/Protos/upstream/google/protobuf/unittest_extension_set.proto
@@ -13,7 +13,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 option optimize_for = SPEED;
 option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
diff --git a/Protos/upstream/google/protobuf/unittest_import.proto b/Protos/upstream/google/protobuf/unittest_import.proto
index 23fa9a8f3..41abd761d 100644
--- a/Protos/upstream/google/protobuf/unittest_import.proto
+++ b/Protos/upstream/google/protobuf/unittest_import.proto
@@ -16,8 +16,8 @@ syntax = "proto2";
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
 // In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
-package protobuf_unittest_import;
+// "using namespace unittest_import = proto2_unittest_import".
+package proto2_unittest_import;
 
 option optimize_for = SPEED;
 option cc_enable_arenas = true;
diff --git a/Protos/upstream/google/protobuf/unittest_import_lite.proto b/Protos/upstream/google/protobuf/unittest_import_lite.proto
index 88cce2993..39e71214b 100644
--- a/Protos/upstream/google/protobuf/unittest_import_lite.proto
+++ b/Protos/upstream/google/protobuf/unittest_import_lite.proto
@@ -11,7 +11,7 @@
 
 edition = "2023";
 
-package protobuf_unittest_import;
+package proto2_unittest_import;
 
 import public "google/protobuf/unittest_import_public_lite.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_import_public.proto b/Protos/upstream/google/protobuf/unittest_import_public.proto
index ff428143f..34701fe31 100644
--- a/Protos/upstream/google/protobuf/unittest_import_public.proto
+++ b/Protos/upstream/google/protobuf/unittest_import_public.proto
@@ -9,7 +9,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest_import;
+package proto2_unittest_import;
 
 option java_package = "com.google.protobuf.test";
 
diff --git a/Protos/upstream/google/protobuf/unittest_import_public_lite.proto b/Protos/upstream/google/protobuf/unittest_import_public_lite.proto
index 30172833d..1dd1ebd61 100644
--- a/Protos/upstream/google/protobuf/unittest_import_public_lite.proto
+++ b/Protos/upstream/google/protobuf/unittest_import_public_lite.proto
@@ -9,7 +9,7 @@
 
 edition = "2023";
 
-package protobuf_unittest_import;
+package proto2_unittest_import;
 
 option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.protobuf";
diff --git a/Protos/upstream/google/protobuf/unittest_large_oneof.proto b/Protos/upstream/google/protobuf/unittest_large_oneof.proto
index 13233f93d..cfc52c568 100644
--- a/Protos/upstream/google/protobuf/unittest_large_oneof.proto
+++ b/Protos/upstream/google/protobuf/unittest_large_oneof.proto
@@ -1,6 +1,6 @@
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 option java_multiple_files = true;
 
diff --git a/Protos/upstream/google/protobuf/unittest_lazy_dependencies.proto b/Protos/upstream/google/protobuf/unittest_lazy_dependencies.proto
index 5df67c775..204389b68 100644
--- a/Protos/upstream/google/protobuf/unittest_lazy_dependencies.proto
+++ b/Protos/upstream/google/protobuf/unittest_lazy_dependencies.proto
@@ -24,8 +24,8 @@ option cc_enable_arenas = true;
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
+// In test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest.lazy_imports;
 
 // Protos optimized for SPEED use a strict superset of the generated code
 // of equivalent ones optimized for CODE_SIZE, so we should optimize all our
diff --git a/Protos/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.proto b/Protos/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.proto
index 3b055dc66..7de13531c 100644
--- a/Protos/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.proto
+++ b/Protos/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.proto
@@ -25,8 +25,8 @@ option cc_enable_arenas = true;
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
+// In test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest.lazy_imports;
 
 // Protos optimized for SPEED use a strict superset of the generated code
 // of equivalent ones optimized for CODE_SIZE, so we should optimize all our
diff --git a/Protos/upstream/google/protobuf/unittest_lazy_dependencies_enum.proto b/Protos/upstream/google/protobuf/unittest_lazy_dependencies_enum.proto
index 851abc426..4bbe318b3 100644
--- a/Protos/upstream/google/protobuf/unittest_lazy_dependencies_enum.proto
+++ b/Protos/upstream/google/protobuf/unittest_lazy_dependencies_enum.proto
@@ -25,8 +25,8 @@ option cc_enable_arenas = true;
 
 // We don't put this in a package within proto2 because we need to make sure
 // that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
+// In test_util.h we do "using namespace unittest = proto2_unittest".
+package proto2_unittest.lazy_imports;
 
 // Protos optimized for SPEED use a strict superset of the generated code
 // of equivalent ones optimized for CODE_SIZE, so we should optimize all our
diff --git a/Protos/upstream/google/protobuf/unittest_lite.proto b/Protos/upstream/google/protobuf/unittest_lite.proto
index 0a6c0456c..1ea260cec 100644
--- a/Protos/upstream/google/protobuf/unittest_lite.proto
+++ b/Protos/upstream/google/protobuf/unittest_lite.proto
@@ -11,7 +11,7 @@
 
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/unittest_import_lite.proto";
 
@@ -65,17 +65,17 @@ message TestAllTypesLite {
 
   NestedMessage optional_nested_message = 18;
   ForeignMessageLite optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessageLite optional_import_message = 20;
+  proto2_unittest_import.ImportMessageLite optional_import_message = 20;
   NestedEnum optional_nested_enum = 21;
   ForeignEnumLite optional_foreign_enum = 22;
-  protobuf_unittest_import.ImportEnumLite optional_import_enum = 23;
+  proto2_unittest_import.ImportEnumLite optional_import_enum = 23;
   string optional_string_piece = 24 [ctype = STRING_PIECE];
 
   string optional_cord = 25 [ctype = CORD];
   bytes optional_bytes_cord = 86 [ctype = CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessageLite
+  proto2_unittest_import.PublicImportMessageLite
       optional_public_import_message = 26;
   NestedMessage optional_lazy_message = 27 [lazy = true];
 
@@ -107,11 +107,11 @@ message TestAllTypesLite {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessageLite repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessageLite repeated_import_message =
+  repeated proto2_unittest_import.ImportMessageLite repeated_import_message =
       50;
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnumLite repeated_foreign_enum = 52;
-  repeated protobuf_unittest_import.ImportEnumLite repeated_import_enum = 53;
+  repeated proto2_unittest_import.ImportEnumLite repeated_import_enum = 53;
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
 
   repeated string repeated_cord = 55 [ctype = CORD];
@@ -153,7 +153,7 @@ message TestAllTypesLite {
 
   ForeignEnumLite default_foreign_enum = 82 [default = FOREIGN_LITE_BAR];
 
-  protobuf_unittest_import.ImportEnumLite default_import_enum = 83
+  proto2_unittest_import.ImportEnumLite default_import_enum = 83
       [default = IMPORT_LITE_BAR];
 
   string default_string_piece = 84 [ctype = STRING_PIECE, default = "abc"];
@@ -251,11 +251,11 @@ extend TestAllExtensionsLite {
 
   TestAllTypesLite.NestedMessage optional_nested_message_extension_lite = 18;
   ForeignMessageLite optional_foreign_message_extension_lite = 19;
-  protobuf_unittest_import.ImportMessageLite
+  proto2_unittest_import.ImportMessageLite
       optional_import_message_extension_lite = 20;
   TestAllTypesLite.NestedEnum optional_nested_enum_extension_lite = 21;
   ForeignEnumLite optional_foreign_enum_extension_lite = 22;
-  protobuf_unittest_import.ImportEnumLite optional_import_enum_extension_lite =
+  proto2_unittest_import.ImportEnumLite optional_import_enum_extension_lite =
       23;
   string optional_string_piece_extension_lite = 24 [ctype = STRING_PIECE];
 
@@ -263,7 +263,7 @@ extend TestAllExtensionsLite {
   // ctype=CORD option back after it is supported.
   string optional_cord_extension_lite = 25;
   bytes optional_bytes_cord_extension_lite = 86;
-  protobuf_unittest_import.PublicImportMessageLite
+  proto2_unittest_import.PublicImportMessageLite
       optional_public_import_message_extension_lite = 26;
   TestAllTypesLite.NestedMessage optional_lazy_message_extension_lite = 27
       [lazy = true];
@@ -294,11 +294,11 @@ extend TestAllExtensionsLite {
   repeated TestAllTypesLite.NestedMessage
       repeated_nested_message_extension_lite = 48;
   repeated ForeignMessageLite repeated_foreign_message_extension_lite = 49;
-  repeated protobuf_unittest_import.ImportMessageLite
+  repeated proto2_unittest_import.ImportMessageLite
       repeated_import_message_extension_lite = 50;
   repeated TestAllTypesLite.NestedEnum repeated_nested_enum_extension_lite = 51;
   repeated ForeignEnumLite repeated_foreign_enum_extension_lite = 52;
-  repeated protobuf_unittest_import.ImportEnumLite
+  repeated proto2_unittest_import.ImportEnumLite
       repeated_import_enum_extension_lite = 53;
   repeated string repeated_string_piece_extension_lite = 54
       [ctype = STRING_PIECE];
@@ -346,7 +346,7 @@ extend TestAllExtensionsLite {
   ForeignEnumLite default_foreign_enum_extension_lite = 82
       [default = FOREIGN_LITE_BAR];
 
-  protobuf_unittest_import.ImportEnumLite default_import_enum_extension_lite = 83
+  proto2_unittest_import.ImportEnumLite default_import_enum_extension_lite = 83
       [default = IMPORT_LITE_BAR];
 
   string default_string_piece_extension_lite = 84
@@ -554,8 +554,8 @@ message TestHugeFieldNumbersLite {
 
   extensions 536860000 to 536869999 [declaration = {
     number: 536860000
-    full_name: ".protobuf_unittest.test_all_types_lite"
-    type: ".protobuf_unittest.TestAllTypesLite"
+    full_name: ".proto2_unittest.test_all_types_lite"
+    type: ".proto2_unittest.TestAllTypesLite"
   }];
 }
 
diff --git a/Protos/upstream/google/protobuf/unittest_lite_imports_nonlite.proto b/Protos/upstream/google/protobuf/unittest_lite_imports_nonlite.proto
index 681e6a87a..9399896d1 100644
--- a/Protos/upstream/google/protobuf/unittest_lite_imports_nonlite.proto
+++ b/Protos/upstream/google/protobuf/unittest_lite_imports_nonlite.proto
@@ -11,7 +11,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/unittest.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_mset.proto b/Protos/upstream/google/protobuf/unittest_mset.proto
index 8c7a7b15e..94b47127f 100644
--- a/Protos/upstream/google/protobuf/unittest_mset.proto
+++ b/Protos/upstream/google/protobuf/unittest_mset.proto
@@ -16,7 +16,7 @@ syntax = "proto2";
 
 import "google/protobuf/unittest_mset_wire_format.proto";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 option cc_enable_arenas = true;
 option optimize_for = SPEED;
diff --git a/Protos/upstream/google/protobuf/unittest_mset_wire_format.proto b/Protos/upstream/google/protobuf/unittest_mset_wire_format.proto
index 548e248e9..6242b8031 100644
--- a/Protos/upstream/google/protobuf/unittest_mset_wire_format.proto
+++ b/Protos/upstream/google/protobuf/unittest_mset_wire_format.proto
@@ -28,8 +28,8 @@ message TestMessageSet {
   extensions 530000000 to max
   [declaration = {
     number: 1952731290,
-    full_name: ".protobuf_unittest_v1api.TestMessageSetExtension3.message_set_extension",
-    type: ".protobuf_unittest_v1api.TestMessageSetExtension3"
+    full_name: ".proto2_unittest_v1api.TestMessageSetExtension3.message_set_extension",
+    type: ".proto2_unittest_v1api.TestMessageSetExtension3"
   }];
 }
 
diff --git a/Protos/upstream/google/protobuf/unittest_no_field_presence.proto b/Protos/upstream/google/protobuf/unittest_no_field_presence.proto
index cb25084c6..6ec49937e 100644
--- a/Protos/upstream/google/protobuf/unittest_no_field_presence.proto
+++ b/Protos/upstream/google/protobuf/unittest_no_field_presence.proto
@@ -51,13 +51,13 @@ message TestAllTypes {
 
   NestedMessage optional_nested_message = 18;
   ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest.TestAllTypes optional_proto2_message = 20;
+  proto2_unittest.TestAllTypes optional_proto2_message = 20;
 
   NestedEnum optional_nested_enum = 21;
   ForeignEnum optional_foreign_enum = 22;
   // N.B.: proto2-enum-type fields not allowed, because their default values
   // might not be zero.
-  // optional protobuf_unittest.ForeignEnum          optional_proto2_enum     =
+  // optional proto2_unittest.ForeignEnum          optional_proto2_enum     =
   // 23;
 
   string optional_string_piece = 24 [ctype = STRING_PIECE];
@@ -84,7 +84,7 @@ message TestAllTypes {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest.TestAllTypes repeated_proto2_message = 50;
+  repeated proto2_unittest.TestAllTypes repeated_proto2_message = 50;
 
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnum repeated_foreign_enum = 52;
@@ -110,7 +110,7 @@ message TestAllMapTypes {
 }
 
 message TestProto2Required {
-  protobuf_unittest.TestRequired proto2 = 1;
+  proto2_unittest.TestRequired proto2 = 1;
 }
 
 // Define these after TestAllTypes to make sure the compiler can handle
diff --git a/Protos/upstream/google/protobuf/unittest_no_generic_services.proto b/Protos/upstream/google/protobuf/unittest_no_generic_services.proto
index af3ecb578..3b1ab626c 100644
--- a/Protos/upstream/google/protobuf/unittest_no_generic_services.proto
+++ b/Protos/upstream/google/protobuf/unittest_no_generic_services.proto
@@ -9,7 +9,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest.no_generic_services_test;
+package proto2_unittest.no_generic_services_test;
 
 
 // *_generic_services are false by default.
diff --git a/Protos/upstream/google/protobuf/unittest_optimize_for.proto b/Protos/upstream/google/protobuf/unittest_optimize_for.proto
index c5e170724..147fa4eb8 100644
--- a/Protos/upstream/google/protobuf/unittest_optimize_for.proto
+++ b/Protos/upstream/google/protobuf/unittest_optimize_for.proto
@@ -13,7 +13,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/unittest.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_proto3.proto b/Protos/upstream/google/protobuf/unittest_proto3.proto
index d88521afe..48674bd4c 100644
--- a/Protos/upstream/google/protobuf/unittest_proto3.proto
+++ b/Protos/upstream/google/protobuf/unittest_proto3.proto
@@ -55,7 +55,7 @@ message TestAllTypes {
 
   optional NestedMessage optional_nested_message = 18;
   ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
+  proto2_unittest_import.ImportMessage optional_import_message = 20;
 
   NestedEnum optional_nested_enum = 21;
   ForeignEnum optional_foreign_enum = 22;
@@ -63,18 +63,18 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
+  // optional proto2_unittest_import.ImportEnum    optional_import_enum  = 23;
 
   string optional_string_piece = 24 [ctype = STRING_PIECE];
   string optional_cord = 25 [ctype = CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
+  proto2_unittest_import.PublicImportMessage optional_public_import_message =
       26;
 
   NestedMessage optional_lazy_message = 27 [lazy = true];
   NestedMessage optional_unverified_lazy_message = 28 [unverified_lazy = true];
-  protobuf_unittest_import.ImportMessage optional_lazy_import_message = 115
+  proto2_unittest_import.ImportMessage optional_lazy_import_message = 115
       [lazy = true];
 
   // Repeated
@@ -101,7 +101,7 @@ message TestAllTypes {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message = 50;
 
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnum repeated_foreign_enum = 52;
@@ -109,7 +109,7 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
+  // repeated proto2_unittest_import.ImportEnum    repeated_import_enum  = 53;
 
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
   repeated string repeated_cord = 55 [ctype = CORD];
diff --git a/Protos/upstream/google/protobuf/unittest_proto3_arena.proto b/Protos/upstream/google/protobuf/unittest_proto3_arena.proto
index ea801cef6..1d8a59e38 100644
--- a/Protos/upstream/google/protobuf/unittest_proto3_arena.proto
+++ b/Protos/upstream/google/protobuf/unittest_proto3_arena.proto
@@ -55,7 +55,7 @@ message TestAllTypes {
 
   NestedMessage                        optional_nested_message  = 18;
   ForeignMessage                       optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message  = 20;
+  proto2_unittest_import.ImportMessage optional_import_message  = 20;
 
   NestedEnum                           optional_nested_enum     = 21;
   ForeignEnum                          optional_foreign_enum    = 22;
@@ -63,19 +63,19 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
+  // optional proto2_unittest_import.ImportEnum    optional_import_enum  = 23;
 
   string optional_string_piece = 24 [ctype=STRING_PIECE];
   string optional_cord = 25 [ctype=CORD];
   bytes optional_bytes_cord = 86 [ctype=CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage
+  proto2_unittest_import.PublicImportMessage
       optional_public_import_message = 26;
 
   NestedMessage optional_lazy_message = 27 [lazy=true];
   NestedMessage optional_unverified_lazy_message = 28 [unverified_lazy=true];
-  protobuf_unittest_import.ImportMessage optional_lazy_import_message = 115
+  proto2_unittest_import.ImportMessage optional_lazy_import_message = 115
       [lazy = true];
 
   // Repeated
@@ -119,7 +119,7 @@ message TestAllTypes {
 
   repeated NestedMessage                        repeated_nested_message  = 48;
   repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message  = 50;
 
   repeated NestedEnum                           repeated_nested_enum     = 51;
   repeated ForeignEnum                          repeated_foreign_enum    = 52;
@@ -127,7 +127,7 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
+  // repeated proto2_unittest_import.ImportEnum    repeated_import_enum  = 53;
 
   repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
   repeated string repeated_cord = 55 [ctype=CORD];
diff --git a/Protos/upstream/google/protobuf/unittest_proto3_arena_lite.proto b/Protos/upstream/google/protobuf/unittest_proto3_arena_lite.proto
index 8a75ba548..5e38550bb 100644
--- a/Protos/upstream/google/protobuf/unittest_proto3_arena_lite.proto
+++ b/Protos/upstream/google/protobuf/unittest_proto3_arena_lite.proto
@@ -56,7 +56,7 @@ message TestAllTypes {
 
   NestedMessage optional_nested_message = 18;
   ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
+  proto2_unittest_import.ImportMessage optional_import_message = 20;
 
   NestedEnum optional_nested_enum = 21;
   ForeignEnum optional_foreign_enum = 22;
@@ -64,13 +64,13 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
+  // optional proto2_unittest_import.ImportEnum    optional_import_enum  = 23;
 
   string optional_string_piece = 24 [ctype = STRING_PIECE];
   string optional_cord = 25 [ctype = CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
+  proto2_unittest_import.PublicImportMessage optional_public_import_message =
       26;
 
   NestedMessage optional_lazy_message = 27 [lazy = true];
@@ -99,7 +99,7 @@ message TestAllTypes {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message = 50;
 
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnum repeated_foreign_enum = 52;
@@ -107,7 +107,7 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
+  // repeated proto2_unittest_import.ImportEnum    repeated_import_enum  = 53;
 
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
   repeated string repeated_cord = 55 [ctype = CORD];
diff --git a/Protos/upstream/google/protobuf/unittest_proto3_lite.proto b/Protos/upstream/google/protobuf/unittest_proto3_lite.proto
index 0d9b186ea..dee340174 100644
--- a/Protos/upstream/google/protobuf/unittest_proto3_lite.proto
+++ b/Protos/upstream/google/protobuf/unittest_proto3_lite.proto
@@ -55,7 +55,7 @@ message TestAllTypes {
 
   NestedMessage optional_nested_message = 18;
   ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
+  proto2_unittest_import.ImportMessage optional_import_message = 20;
 
   NestedEnum optional_nested_enum = 21;
   ForeignEnum optional_foreign_enum = 22;
@@ -63,13 +63,13 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
+  // optional proto2_unittest_import.ImportEnum    optional_import_enum  = 23;
 
   string optional_string_piece = 24 [ctype = STRING_PIECE];
   string optional_cord = 25 [ctype = CORD];
 
   // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
+  proto2_unittest_import.PublicImportMessage optional_public_import_message =
       26;
 
   NestedMessage optional_lazy_message = 27 [lazy = true];
@@ -98,7 +98,7 @@ message TestAllTypes {
 
   repeated NestedMessage repeated_nested_message = 48;
   repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
+  repeated proto2_unittest_import.ImportMessage repeated_import_message = 50;
 
   repeated NestedEnum repeated_nested_enum = 51;
   repeated ForeignEnum repeated_foreign_enum = 52;
@@ -106,7 +106,7 @@ message TestAllTypes {
   // Omitted (compared to unittest.proto) because proto2 enums are not allowed
   // inside proto2 messages.
   //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
+  // repeated proto2_unittest_import.ImportEnum    repeated_import_enum  = 53;
 
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
   repeated string repeated_cord = 55 [ctype = CORD];
diff --git a/Protos/upstream/google/protobuf/unittest_proto3_optional.proto b/Protos/upstream/google/protobuf/unittest_proto3_optional.proto
index 1169847f9..1354212b1 100644
--- a/Protos/upstream/google/protobuf/unittest_proto3_optional.proto
+++ b/Protos/upstream/google/protobuf/unittest_proto3_optional.proto
@@ -7,7 +7,7 @@
 
 syntax = "proto3";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/descriptor.proto";
 
@@ -68,8 +68,8 @@ message TestProto3OptionalMessage {
 }
 
 message Proto3OptionalExtensions {
-  option (protobuf_unittest.Proto3OptionalExtensions.ext_no_optional) = 8;
-  option (protobuf_unittest.Proto3OptionalExtensions.ext_with_optional) = 16;
+  option (proto2_unittest.Proto3OptionalExtensions.ext_no_optional) = 8;
+  option (proto2_unittest.Proto3OptionalExtensions.ext_with_optional) = 16;
 
   extend google.protobuf.MessageOptions {
     int32 ext_no_optional = 355886728;
diff --git a/Protos/upstream/google/protobuf/unittest_redaction.proto b/Protos/upstream/google/protobuf/unittest_redaction.proto
new file mode 100644
index 000000000..ce2729eac
--- /dev/null
+++ b/Protos/upstream/google/protobuf/unittest_redaction.proto
@@ -0,0 +1,72 @@
+// Test proto for redaction
+edition = "2023";
+
+package proto2_unittest;
+
+import "google/protobuf/any.proto";
+import "google/protobuf/descriptor.proto";
+
+option java_package = "com.google.protos";
+option java_outer_classname = "RedactionProto";
+option features.repeated_field_encoding = EXPANDED;
+option features.utf8_validation = NONE;
+
+extend .google.protobuf.FieldOptions {
+  MetaAnnotatedEnum meta_annotated_enum = 535801413;
+  repeated MetaAnnotatedEnum repeated_meta_annotated_enum = 535801414;
+  TestNestedMessageEnum test_nested_message_enum = 535801415;
+}
+
+message TestRedactedNestMessage {
+  string foo = 1;
+}
+
+message TestRepeatedRedactedNestMessage {
+  string bar = 1;
+}
+
+message TestMessageEnum {
+  repeated MetaAnnotatedEnum redactable_enum = 1;
+}
+
+message TestNestedMessageEnum {
+  repeated MetaAnnotatedEnum direct_enum = 1;
+  TestMessageEnum nested_enum = 2;
+  string redacted_string = 3 [debug_redact = true];
+}
+
+message TestRedactedMessage {
+  string text_field = 1 [deprecated = true];
+  string meta_annotated = 8 [(meta_annotated_enum) = TEST_REDACTABLE];
+  string repeated_meta_annotated = 9 [
+    (proto2_unittest.repeated_meta_annotated_enum) = TEST_NO_REDACT,
+    (proto2_unittest.repeated_meta_annotated_enum) = TEST_REDACTABLE
+  ];
+  string unredacted_repeated_annotations = 10 [
+    (proto2_unittest.repeated_meta_annotated_enum) = TEST_NO_REDACT,
+    (proto2_unittest.repeated_meta_annotated_enum) = TEST_NO_REDACT_AGAIN
+  ];
+  string unreported_non_meta_debug_redact_field = 17 [debug_redact = true];
+  google.protobuf.Any any_field = 18 [debug_redact = true];
+  string redactable_false = 19 [(meta_annotated_enum) = TEST_REDACTABLE_FALSE];
+  string test_direct_message_enum = 22
+      [(proto2_unittest.test_nested_message_enum) = {
+        direct_enum: [ TEST_NO_REDACT, TEST_REDACTABLE ]
+      }];
+  string test_nested_message_enum = 23
+      [(proto2_unittest.test_nested_message_enum) = {
+        nested_enum { redactable_enum: [ TEST_NO_REDACT, TEST_REDACTABLE ] }
+      }];
+  string test_redacted_message_enum = 24
+      [(proto2_unittest.test_nested_message_enum) = {
+        redacted_string: "redacted_but_doesnt_redact"
+      }];
+}
+
+enum MetaAnnotatedEnum {
+  TEST_NULL = 0;
+  TEST_REDACTABLE = 1 [debug_redact = true];
+  TEST_NO_REDACT = 2;
+  TEST_NO_REDACT_AGAIN = 3;
+  TEST_REDACTABLE_FALSE = 4 [debug_redact = false];
+}
diff --git a/Protos/upstream/google/protobuf/unittest_retention.proto b/Protos/upstream/google/protobuf/unittest_retention.proto
index 999836383..6c31846a2 100644
--- a/Protos/upstream/google/protobuf/unittest_retention.proto
+++ b/Protos/upstream/google/protobuf/unittest_retention.proto
@@ -7,7 +7,7 @@
 
 syntax = "proto2";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/descriptor.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_string_type.proto b/Protos/upstream/google/protobuf/unittest_string_type.proto
index 611588f19..713234d5c 100644
--- a/Protos/upstream/google/protobuf/unittest_string_type.proto
+++ b/Protos/upstream/google/protobuf/unittest_string_type.proto
@@ -7,7 +7,7 @@
 
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/cpp_features.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_string_view.proto b/Protos/upstream/google/protobuf/unittest_string_view.proto
index f2e8531e8..d2d328a4e 100644
--- a/Protos/upstream/google/protobuf/unittest_string_view.proto
+++ b/Protos/upstream/google/protobuf/unittest_string_view.proto
@@ -1,6 +1,6 @@
 edition = "2023";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/cpp_features.proto";
 
diff --git a/Protos/upstream/google/protobuf/unittest_well_known_types.proto b/Protos/upstream/google/protobuf/unittest_well_known_types.proto
index cc083bf6c..36eff35a1 100644
--- a/Protos/upstream/google/protobuf/unittest_well_known_types.proto
+++ b/Protos/upstream/google/protobuf/unittest_well_known_types.proto
@@ -7,7 +7,7 @@
 
 syntax = "proto3";
 
-package protobuf_unittest;
+package proto2_unittest;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/api.proto";
diff --git a/Reference/Conformance/editions/test_messages_proto2_editions.pb.swift b/Reference/Conformance/editions/test_messages_proto2_editions.pb.swift
index 2edf5f19a..91a2433cb 100644
--- a/Reference/Conformance/editions/test_messages_proto2_editions.pb.swift
+++ b/Reference/Conformance/editions/test_messages_proto2_editions.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: SwiftPro
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Editions_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2_editions.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
     clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions:
   ProtobufTestMessages_Editions_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.editions.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Messag
     return true
   }
 }
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift b/Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift
index b8c2c3801..604e98632 100644
--- a/Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift
+++ b/Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.Ext
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
     clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobuf.Sim
   ProtobufTestMessages_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorre
     return true
   }
 }
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift b/Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift
index f278e3881..dfd5e89a6 100644
--- a/Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift
+++ b/Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift
@@ -2244,6 +2244,15 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   /// Clears the value of `jsonFormat`. Subsequent reads from it will return its default value.
   mutating func clearJsonFormat() {self._jsonFormat = nil}
 
+  var enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle {
+    get {return _enforceNamingStyle ?? .unknown}
+    set {_enforceNamingStyle = newValue}
+  }
+  /// Returns true if `enforceNamingStyle` has been explicitly set.
+  var hasEnforceNamingStyle: Bool {return self._enforceNamingStyle != nil}
+  /// Clears the value of `enforceNamingStyle`. Subsequent reads from it will return its default value.
+  mutating func clearEnforceNamingStyle() {self._enforceNamingStyle = nil}
+
   var unknownFields = UnknownStorage()
 
   enum FieldPresence: Int, Enum, Swift.CaseIterable {
@@ -2313,6 +2322,17 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
 
   }
 
+  enum EnforceNamingStyle: Int, Enum, Swift.CaseIterable {
+    case unknown = 0
+    case style2024 = 1
+    case styleLegacy = 2
+
+    init() {
+      self = .unknown
+    }
+
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = ExtensionFieldValueSet()
@@ -2322,6 +2342,7 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   fileprivate var _utf8Validation: Google_Protobuf_FeatureSet.Utf8Validation? = nil
   fileprivate var _messageEncoding: Google_Protobuf_FeatureSet.MessageEncoding? = nil
   fileprivate var _jsonFormat: Google_Protobuf_FeatureSet.JsonFormat? = nil
+  fileprivate var _enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle? = nil
 }
 
 /// A compiled specification for the defaults of a set of features.  These
@@ -4843,6 +4864,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     4: .standard(proto: "utf8_validation"),
     5: .standard(proto: "message_encoding"),
     6: .standard(proto: "json_format"),
+    7: .standard(proto: "enforce_naming_style"),
   ]
 
   public var isInitialized: Bool {
@@ -4862,6 +4884,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
       case 4: try { try decoder.decodeSingularEnumField(value: &self._utf8Validation) }()
       case 5: try { try decoder.decodeSingularEnumField(value: &self._messageEncoding) }()
       case 6: try { try decoder.decodeSingularEnumField(value: &self._jsonFormat) }()
+      case 7: try { try decoder.decodeSingularEnumField(value: &self._enforceNamingStyle) }()
       case 1000..<10001:
         try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Google_Protobuf_FeatureSet.self, fieldNumber: fieldNumber) }()
       default: break
@@ -4892,6 +4915,9 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     try { if let v = self._jsonFormat {
       try visitor.visitSingularEnumField(value: v, fieldNumber: 6)
     } }()
+    try { if let v = self._enforceNamingStyle {
+      try visitor.visitSingularEnumField(value: v, fieldNumber: 7)
+    } }()
     try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 1000, end: 10001)
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -4903,6 +4929,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     if lhs._utf8Validation != rhs._utf8Validation {return false}
     if lhs._messageEncoding != rhs._messageEncoding {return false}
     if lhs._jsonFormat != rhs._jsonFormat {return false}
+    if lhs._enforceNamingStyle != rhs._enforceNamingStyle {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
@@ -4958,6 +4985,14 @@ extension Google_Protobuf_FeatureSet.JsonFormat: _ProtoNameProviding {
   ]
 }
 
+extension Google_Protobuf_FeatureSet.EnforceNamingStyle: _ProtoNameProviding {
+  static let _protobuf_nameMap: _NameMap = [
+    0: .same(proto: "ENFORCE_NAMING_STYLE_UNKNOWN"),
+    1: .same(proto: "STYLE2024"),
+    2: .same(proto: "STYLE_LEGACY"),
+  ]
+}
+
 extension Google_Protobuf_FeatureSetDefaults: Message, _MessageImplementationBase, _ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FeatureSetDefaults"
   static let _protobuf_nameMap: _NameMap = [
diff --git a/Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift b/Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
index 80e0fee97..d9aea26cf 100644
--- a/Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
+++ b/Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
@@ -123,926 +123,933 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case clearEditionIntroduced // = 94
   case clearEditionRemoved // = 95
   case clearEnd // = 96
-  case clearEnumType // = 97
-  case clearExtendee // = 98
-  case clearExtensionValue // = 99
-  case clearFeatures // = 100
-  case clearFeatureSupport // = 101
-  case clearFieldPresence // = 102
-  case clearFixedFeatures // = 103
-  case clearFullName // = 104
-  case clearGoPackage // = 105
-  case clearIdempotencyLevel // = 106
-  case clearIdentifierValue // = 107
-  case clearInputType // = 108
-  case clearIsExtension // = 109
-  case clearJavaGenerateEqualsAndHash // = 110
-  case clearJavaGenericServices // = 111
-  case clearJavaMultipleFiles // = 112
-  case clearJavaOuterClassname // = 113
-  case clearJavaPackage // = 114
-  case clearJavaStringCheckUtf8 // = 115
-  case clearJsonFormat // = 116
-  case clearJsonName // = 117
-  case clearJstype // = 118
-  case clearLabel // = 119
-  case clearLazy // = 120
-  case clearLeadingComments // = 121
-  case clearMapEntry // = 122
-  case clearMaximumEdition // = 123
-  case clearMessageEncoding // = 124
-  case clearMessageSetWireFormat // = 125
-  case clearMinimumEdition // = 126
-  case clearName // = 127
-  case clearNamePart // = 128
-  case clearNegativeIntValue // = 129
-  case clearNoStandardDescriptorAccessor // = 130
-  case clearNumber // = 131
-  case clearObjcClassPrefix // = 132
-  case clearOneofIndex // = 133
-  case clearOptimizeFor // = 134
-  case clearOptions // = 135
-  case clearOutputType // = 136
-  case clearOverridableFeatures // = 137
-  case clearPackage // = 138
-  case clearPacked // = 139
-  case clearPhpClassPrefix // = 140
-  case clearPhpMetadataNamespace // = 141
-  case clearPhpNamespace // = 142
-  case clearPositiveIntValue // = 143
-  case clearProto3Optional // = 144
-  case clearPyGenericServices // = 145
-  case clearRepeated // = 146
-  case clearRepeatedFieldEncoding // = 147
-  case clearReserved // = 148
-  case clearRetention // = 149
-  case clearRubyPackage // = 150
-  case clearSemantic // = 151
-  case clearServerStreaming // = 152
-  case clearSourceCodeInfo // = 153
-  case clearSourceContext // = 154
-  case clearSourceFile // = 155
-  case clearStart // = 156
-  case clearStringValue // = 157
-  case clearSwiftPrefix // = 158
-  case clearSyntax // = 159
-  case clearTrailingComments // = 160
-  case clearType // = 161
-  case clearTypeName // = 162
-  case clearUnverifiedLazy // = 163
-  case clearUtf8Validation // = 164
-  case clearValue // = 165
-  case clearVerification // = 166
-  case clearWeak // = 167
-  case clientStreaming // = 168
-  case code // = 169
-  case codePoint // = 170
-  case codeUnits // = 171
-  case collection // = 172
-  case com // = 173
-  case comma // = 174
-  case consumedBytes // = 175
-  case contains // = 176
-  case contentsOf // = 177
-  case contiguousBytes // = 178
-  case copy // = 179
-  case count // = 180
-  case countVarintsInBuffer // = 181
-  case csharpNamespace // = 182
-  case ctype // = 183
-  case customCodable // = 184
-  case customDebugStringConvertible // = 185
-  case customStringConvertible // = 186
-  case d // = 187
-  case data // = 188
-  case dataResult // = 189
-  case date // = 190
-  case daySec // = 191
-  case daysSinceEpoch // = 192
-  case debugDescription_ // = 193
-  case debugRedact // = 194
-  case declaration // = 195
-  case decoded // = 196
-  case decodedFromJsonnull // = 197
-  case decodeExtensionField // = 198
-  case decodeExtensionFieldsAsMessageSet // = 199
-  case decodeJson // = 200
-  case decodeMapField // = 201
-  case decodeMessage // = 202
-  case decoder // = 203
-  case decodeRepeated // = 204
-  case decodeRepeatedBoolField // = 205
-  case decodeRepeatedBytesField // = 206
-  case decodeRepeatedDoubleField // = 207
-  case decodeRepeatedEnumField // = 208
-  case decodeRepeatedFixed32Field // = 209
-  case decodeRepeatedFixed64Field // = 210
-  case decodeRepeatedFloatField // = 211
-  case decodeRepeatedGroupField // = 212
-  case decodeRepeatedInt32Field // = 213
-  case decodeRepeatedInt64Field // = 214
-  case decodeRepeatedMessageField // = 215
-  case decodeRepeatedSfixed32Field // = 216
-  case decodeRepeatedSfixed64Field // = 217
-  case decodeRepeatedSint32Field // = 218
-  case decodeRepeatedSint64Field // = 219
-  case decodeRepeatedStringField // = 220
-  case decodeRepeatedUint32Field // = 221
-  case decodeRepeatedUint64Field // = 222
-  case decodeSingular // = 223
-  case decodeSingularBoolField // = 224
-  case decodeSingularBytesField // = 225
-  case decodeSingularDoubleField // = 226
-  case decodeSingularEnumField // = 227
-  case decodeSingularFixed32Field // = 228
-  case decodeSingularFixed64Field // = 229
-  case decodeSingularFloatField // = 230
-  case decodeSingularGroupField // = 231
-  case decodeSingularInt32Field // = 232
-  case decodeSingularInt64Field // = 233
-  case decodeSingularMessageField // = 234
-  case decodeSingularSfixed32Field // = 235
-  case decodeSingularSfixed64Field // = 236
-  case decodeSingularSint32Field // = 237
-  case decodeSingularSint64Field // = 238
-  case decodeSingularStringField // = 239
-  case decodeSingularUint32Field // = 240
-  case decodeSingularUint64Field // = 241
-  case decodeTextFormat // = 242
-  case defaultAnyTypeUrlprefix // = 243
-  case defaults // = 244
-  case defaultValue // = 245
-  case dependency // = 246
-  case deprecated // = 247
-  case deprecatedLegacyJsonFieldConflicts // = 248
-  case deprecationWarning // = 249
-  case description_ // = 250
-  case descriptorProto // = 251
-  case dictionary // = 252
-  case dictionaryLiteral // = 253
-  case digit // = 254
-  case digit0 // = 255
-  case digit1 // = 256
-  case digitCount // = 257
-  case digits // = 258
-  case digitValue // = 259
-  case discardableResult // = 260
-  case discardUnknownFields // = 261
-  case double // = 262
-  case doubleValue // = 263
-  case duration // = 264
-  case e // = 265
-  case edition // = 266
-  case editionDefault // = 267
-  case editionDefaults // = 268
-  case editionDeprecated // = 269
-  case editionIntroduced // = 270
-  case editionRemoved // = 271
-  case element // = 272
-  case elements // = 273
-  case `else` // = 274
-  case emitExtensionFieldName // = 275
-  case emitFieldName // = 276
-  case emitFieldNumber // = 277
-  case empty // = 278
-  case emptyData // = 279
-  case encodeAsBytes // = 280
-  case encoded // = 281
-  case encodedJsonstring // = 282
-  case encodedSize // = 283
-  case encodeField // = 284
-  case encoder // = 285
-  case end // = 286
-  case endArray // = 287
-  case endMessageField // = 288
-  case endObject // = 289
-  case endRegularField // = 290
-  case `enum` // = 291
-  case enumDescriptorProto // = 292
-  case enumOptions // = 293
-  case enumReservedRange // = 294
-  case enumType // = 295
-  case enumvalue // = 296
-  case enumValueDescriptorProto // = 297
-  case enumValueOptions // = 298
-  case equatable // = 299
-  case error // = 300
-  case expressibleByArrayLiteral // = 301
-  case expressibleByDictionaryLiteral // = 302
-  case ext // = 303
-  case extDecoder // = 304
-  case extendedGraphemeClusterLiteral // = 305
-  case extendedGraphemeClusterLiteralType // = 306
-  case extendee // = 307
-  case extensibleMessage // = 308
-  case `extension` // = 309
-  case extensionField // = 310
-  case extensionFieldNumber // = 311
-  case extensionFieldValueSet // = 312
-  case extensionMap // = 313
-  case extensionRange // = 314
-  case extensionRangeOptions // = 315
-  case extensions // = 316
-  case extras // = 317
-  case f // = 318
-  case `false` // = 319
-  case features // = 320
-  case featureSet // = 321
-  case featureSetDefaults // = 322
-  case featureSetEditionDefault // = 323
-  case featureSupport // = 324
-  case field // = 325
-  case fieldData // = 326
-  case fieldDescriptorProto // = 327
-  case fieldMask // = 328
-  case fieldMaskError // = 329
-  case fieldName // = 330
-  case fieldNameCount // = 331
-  case fieldNum // = 332
-  case fieldNumber // = 333
-  case fieldNumberForProto // = 334
-  case fieldOptions // = 335
-  case fieldPresence // = 336
-  case fields // = 337
-  case fieldSize // = 338
-  case fieldTag // = 339
-  case fieldType // = 340
-  case file // = 341
-  case fileDescriptorProto // = 342
-  case fileDescriptorSet // = 343
-  case fileName // = 344
-  case fileOptions // = 345
-  case filter // = 346
-  case final // = 347
-  case finiteOnly // = 348
-  case first // = 349
-  case firstItem // = 350
-  case fixedFeatures // = 351
-  case float // = 352
-  case floatLiteral // = 353
-  case floatLiteralType // = 354
-  case floatValue // = 355
-  case `for` // = 356
-  case forMessageName // = 357
-  case formUnion // = 358
-  case forReadingFrom // = 359
-  case forTypeURL // = 360
-  case forwardParser // = 361
-  case forWritingInto // = 362
-  case from // = 363
-  case fromAscii2 // = 364
-  case fromAscii4 // = 365
-  case fromByteOffset // = 366
-  case fromHexDigit // = 367
-  case fullName // = 368
-  case `func` // = 369
-  case function // = 370
-  case g // = 371
-  case generatedCodeInfo // = 372
-  case get // = 373
-  case getExtensionValue // = 374
-  case googleapis // = 375
-  case googleProtobufAny // = 376
-  case googleProtobufApi // = 377
-  case googleProtobufBoolValue // = 378
-  case googleProtobufBytesValue // = 379
-  case googleProtobufDescriptorProto // = 380
-  case googleProtobufDoubleValue // = 381
-  case googleProtobufDuration // = 382
-  case googleProtobufEdition // = 383
-  case googleProtobufEmpty // = 384
-  case googleProtobufEnum // = 385
-  case googleProtobufEnumDescriptorProto // = 386
-  case googleProtobufEnumOptions // = 387
-  case googleProtobufEnumValue // = 388
-  case googleProtobufEnumValueDescriptorProto // = 389
-  case googleProtobufEnumValueOptions // = 390
-  case googleProtobufExtensionRangeOptions // = 391
-  case googleProtobufFeatureSet // = 392
-  case googleProtobufFeatureSetDefaults // = 393
-  case googleProtobufField // = 394
-  case googleProtobufFieldDescriptorProto // = 395
-  case googleProtobufFieldMask // = 396
-  case googleProtobufFieldOptions // = 397
-  case googleProtobufFileDescriptorProto // = 398
-  case googleProtobufFileDescriptorSet // = 399
-  case googleProtobufFileOptions // = 400
-  case googleProtobufFloatValue // = 401
-  case googleProtobufGeneratedCodeInfo // = 402
-  case googleProtobufInt32Value // = 403
-  case googleProtobufInt64Value // = 404
-  case googleProtobufListValue // = 405
-  case googleProtobufMessageOptions // = 406
-  case googleProtobufMethod // = 407
-  case googleProtobufMethodDescriptorProto // = 408
-  case googleProtobufMethodOptions // = 409
-  case googleProtobufMixin // = 410
-  case googleProtobufNullValue // = 411
-  case googleProtobufOneofDescriptorProto // = 412
-  case googleProtobufOneofOptions // = 413
-  case googleProtobufOption // = 414
-  case googleProtobufServiceDescriptorProto // = 415
-  case googleProtobufServiceOptions // = 416
-  case googleProtobufSourceCodeInfo // = 417
-  case googleProtobufSourceContext // = 418
-  case googleProtobufStringValue // = 419
-  case googleProtobufStruct // = 420
-  case googleProtobufSyntax // = 421
-  case googleProtobufTimestamp // = 422
-  case googleProtobufType // = 423
-  case googleProtobufUint32Value // = 424
-  case googleProtobufUint64Value // = 425
-  case googleProtobufUninterpretedOption // = 426
-  case googleProtobufValue // = 427
-  case goPackage // = 428
-  case group // = 429
-  case groupFieldNumberStack // = 430
-  case groupSize // = 431
-  case `guard` // = 432
-  case hadOneofValue // = 433
-  case handleConflictingOneOf // = 434
-  case hasAggregateValue // = 435
-  case hasAllowAlias // = 436
-  case hasBegin // = 437
-  case hasCcEnableArenas // = 438
-  case hasCcGenericServices // = 439
-  case hasClientStreaming // = 440
-  case hasCsharpNamespace // = 441
-  case hasCtype // = 442
-  case hasDebugRedact // = 443
-  case hasDefaultValue // = 444
-  case hasDeprecated // = 445
-  case hasDeprecatedLegacyJsonFieldConflicts // = 446
-  case hasDeprecationWarning // = 447
-  case hasDoubleValue // = 448
-  case hasEdition // = 449
-  case hasEditionDeprecated // = 450
-  case hasEditionIntroduced // = 451
-  case hasEditionRemoved // = 452
-  case hasEnd // = 453
-  case hasEnumType // = 454
-  case hasExtendee // = 455
-  case hasExtensionValue // = 456
-  case hasFeatures // = 457
-  case hasFeatureSupport // = 458
-  case hasFieldPresence // = 459
-  case hasFixedFeatures // = 460
-  case hasFullName // = 461
-  case hasGoPackage // = 462
-  case hash // = 463
-  case hashable // = 464
-  case hasher // = 465
-  case hashVisitor // = 466
-  case hasIdempotencyLevel // = 467
-  case hasIdentifierValue // = 468
-  case hasInputType // = 469
-  case hasIsExtension // = 470
-  case hasJavaGenerateEqualsAndHash // = 471
-  case hasJavaGenericServices // = 472
-  case hasJavaMultipleFiles // = 473
-  case hasJavaOuterClassname // = 474
-  case hasJavaPackage // = 475
-  case hasJavaStringCheckUtf8 // = 476
-  case hasJsonFormat // = 477
-  case hasJsonName // = 478
-  case hasJstype // = 479
-  case hasLabel // = 480
-  case hasLazy // = 481
-  case hasLeadingComments // = 482
-  case hasMapEntry // = 483
-  case hasMaximumEdition // = 484
-  case hasMessageEncoding // = 485
-  case hasMessageSetWireFormat // = 486
-  case hasMinimumEdition // = 487
-  case hasName // = 488
-  case hasNamePart // = 489
-  case hasNegativeIntValue // = 490
-  case hasNoStandardDescriptorAccessor // = 491
-  case hasNumber // = 492
-  case hasObjcClassPrefix // = 493
-  case hasOneofIndex // = 494
-  case hasOptimizeFor // = 495
-  case hasOptions // = 496
-  case hasOutputType // = 497
-  case hasOverridableFeatures // = 498
-  case hasPackage // = 499
-  case hasPacked // = 500
-  case hasPhpClassPrefix // = 501
-  case hasPhpMetadataNamespace // = 502
-  case hasPhpNamespace // = 503
-  case hasPositiveIntValue // = 504
-  case hasProto3Optional // = 505
-  case hasPyGenericServices // = 506
-  case hasRepeated // = 507
-  case hasRepeatedFieldEncoding // = 508
-  case hasReserved // = 509
-  case hasRetention // = 510
-  case hasRubyPackage // = 511
-  case hasSemantic // = 512
-  case hasServerStreaming // = 513
-  case hasSourceCodeInfo // = 514
-  case hasSourceContext // = 515
-  case hasSourceFile // = 516
-  case hasStart // = 517
-  case hasStringValue // = 518
-  case hasSwiftPrefix // = 519
-  case hasSyntax // = 520
-  case hasTrailingComments // = 521
-  case hasType // = 522
-  case hasTypeName // = 523
-  case hasUnverifiedLazy // = 524
-  case hasUtf8Validation // = 525
-  case hasValue // = 526
-  case hasVerification // = 527
-  case hasWeak // = 528
-  case hour // = 529
-  case i // = 530
-  case idempotencyLevel // = 531
-  case identifierValue // = 532
-  case `if` // = 533
-  case ignoreUnknownExtensionFields // = 534
-  case ignoreUnknownFields // = 535
-  case index // = 536
-  case init_ // = 537
-  case `inout` // = 538
-  case inputType // = 539
-  case insert // = 540
-  case int // = 541
-  case int32 // = 542
-  case int32Value // = 543
-  case int64 // = 544
-  case int64Value // = 545
-  case int8 // = 546
-  case integerLiteral // = 547
-  case integerLiteralType // = 548
-  case intern // = 549
-  case `internal` // = 550
-  case internalState // = 551
-  case intersect // = 552
-  case into // = 553
-  case ints // = 554
-  case isA // = 555
-  case isEqual // = 556
-  case isEqualTo // = 557
-  case isExtension // = 558
-  case isInitialized // = 559
-  case isNegative // = 560
-  case isPathValid // = 561
-  case isValid // = 562
-  case itemTagsEncodedSize // = 563
-  case iterator // = 564
-  case javaGenerateEqualsAndHash // = 565
-  case javaGenericServices // = 566
-  case javaMultipleFiles // = 567
-  case javaOuterClassname // = 568
-  case javaPackage // = 569
-  case javaStringCheckUtf8 // = 570
-  case jsondecoder // = 571
-  case jsondecodingError // = 572
-  case jsondecodingOptions // = 573
-  case jsonEncoder // = 574
-  case jsonencodingError // = 575
-  case jsonencodingOptions // = 576
-  case jsonencodingVisitor // = 577
-  case jsonFormat // = 578
-  case jsonmapEncodingVisitor // = 579
-  case jsonName // = 580
-  case jsonPath // = 581
-  case jsonPaths // = 582
-  case jsonscanner // = 583
-  case jsonString // = 584
-  case jsonText // = 585
-  case jsonUtf8Bytes // = 586
-  case jsonUtf8Data // = 587
-  case jstype // = 588
-  case k // = 589
-  case kChunkSize // = 590
-  case key // = 591
-  case keyField // = 592
-  case keyFieldOpt // = 593
-  case keyType // = 594
-  case kind // = 595
-  case l // = 596
-  case label // = 597
-  case lazy // = 598
-  case leadingComments // = 599
-  case leadingDetachedComments // = 600
-  case length // = 601
-  case lessThan // = 602
-  case `let` // = 603
-  case lhs // = 604
-  case line // = 605
-  case list // = 606
-  case listOfMessages // = 607
-  case listValue // = 608
-  case littleEndian // = 609
-  case load // = 610
-  case localHasher // = 611
-  case location // = 612
-  case m // = 613
-  case major // = 614
-  case makeAsyncIterator // = 615
-  case makeIterator // = 616
-  case malformedLength // = 617
-  case mapEntry // = 618
-  case mapKeyType // = 619
-  case mapToMessages // = 620
-  case mapValueType // = 621
-  case mapVisitor // = 622
-  case mask // = 623
-  case maximumEdition // = 624
-  case mdayStart // = 625
-  case merge // = 626
-  case mergeOptions // = 627
-  case message // = 628
-  case messageDepthLimit // = 629
-  case messageEncoding // = 630
-  case messageExtension // = 631
-  case messageImplementationBase // = 632
-  case messageOptions // = 633
-  case messageSet // = 634
-  case messageSetWireFormat // = 635
-  case messageSize // = 636
-  case messageType // = 637
-  case method // = 638
-  case methodDescriptorProto // = 639
-  case methodOptions // = 640
-  case methods // = 641
-  case min // = 642
-  case minimumEdition // = 643
-  case minor // = 644
-  case mixin // = 645
-  case mixins // = 646
-  case modify // = 647
-  case month // = 648
-  case msgExtension // = 649
-  case mutating // = 650
-  case n // = 651
-  case name // = 652
-  case nameDescription // = 653
-  case nameMap // = 654
-  case namePart // = 655
-  case names // = 656
-  case nanos // = 657
-  case negativeIntValue // = 658
-  case nestedType // = 659
-  case newExtensible // = 660
-  case newL // = 661
-  case newList // = 662
-  case newMessage // = 663
-  case newValue // = 664
-  case next // = 665
-  case nextByte // = 666
-  case nextFieldNumber // = 667
-  case nextVarInt // = 668
-  case `nil` // = 669
-  case nilLiteral // = 670
-  case noBytesAvailable // = 671
-  case noStandardDescriptorAccessor // = 672
-  case nullValue // = 673
-  case number // = 674
-  case numberValue // = 675
-  case objcClassPrefix // = 676
-  case of // = 677
-  case oneofDecl // = 678
-  case oneofDescriptorProto // = 679
-  case oneofIndex // = 680
-  case oneofOptions // = 681
-  case oneofs // = 682
-  case oneOfKind // = 683
-  case optimizeFor // = 684
-  case optimizeMode // = 685
-  case option // = 686
-  case optionalEnumExtensionField // = 687
-  case optionalExtensionField // = 688
-  case optionalGroupExtensionField // = 689
-  case optionalMessageExtensionField // = 690
-  case optionRetention // = 691
-  case options // = 692
-  case optionTargetType // = 693
-  case other // = 694
-  case others // = 695
-  case out // = 696
-  case outputType // = 697
-  case overridableFeatures // = 698
-  case p // = 699
-  case package // = 700
-  case packed // = 701
-  case packedEnumExtensionField // = 702
-  case packedExtensionField // = 703
-  case padding // = 704
-  case parent // = 705
-  case parse // = 706
-  case partial // = 707
-  case path // = 708
-  case pathDecoder // = 709
-  case pathDecodingError // = 710
-  case paths // = 711
-  case pathVisitor // = 712
-  case payload // = 713
-  case payloadSize // = 714
-  case phpClassPrefix // = 715
-  case phpMetadataNamespace // = 716
-  case phpNamespace // = 717
-  case pos // = 718
-  case positiveIntValue // = 719
-  case prefix // = 720
-  case preserveProtoFieldNames // = 721
-  case preTraverse // = 722
-  case prevPath // = 723
-  case printUnknownFields // = 724
-  case proto2 // = 725
-  case proto3DefaultValue // = 726
-  case proto3Optional // = 727
-  case protobufApiversionCheck // = 728
-  case protobufApiversion2 // = 729
-  case protobufBool // = 730
-  case protobufBytes // = 731
-  case protobufDouble // = 732
-  case protobufEnumMap // = 733
-  case protobufExtension // = 734
-  case protobufFixed32 // = 735
-  case protobufFixed64 // = 736
-  case protobufFloat // = 737
-  case protobufInt32 // = 738
-  case protobufInt64 // = 739
-  case protobufMap // = 740
-  case protobufMessageMap // = 741
-  case protobufSfixed32 // = 742
-  case protobufSfixed64 // = 743
-  case protobufSint32 // = 744
-  case protobufSint64 // = 745
-  case protobufString // = 746
-  case protobufUint32 // = 747
-  case protobufUint64 // = 748
-  case protobufExtensionFieldValues // = 749
-  case protobufFieldNumber // = 750
-  case protobufGeneratedIsEqualTo // = 751
-  case protobufNameMap // = 752
-  case protobufNewField // = 753
-  case protobufPackage // = 754
-  case `protocol` // = 755
-  case protoFieldName // = 756
-  case protoMessageName // = 757
-  case protoNameProviding // = 758
-  case protoPaths // = 759
-  case `public` // = 760
-  case publicDependency // = 761
-  case putBoolValue // = 762
-  case putBytesValue // = 763
-  case putDoubleValue // = 764
-  case putEnumValue // = 765
-  case putFixedUint32 // = 766
-  case putFixedUint64 // = 767
-  case putFloatValue // = 768
-  case putInt64 // = 769
-  case putStringValue // = 770
-  case putUint64 // = 771
-  case putUint64Hex // = 772
-  case putVarInt // = 773
-  case putZigZagVarInt // = 774
-  case pyGenericServices // = 775
-  case r // = 776
-  case rawChars // = 777
-  case rawRepresentable // = 778
-  case rawValue_ // = 779
-  case read4HexDigits // = 780
-  case readBytes // = 781
-  case register // = 782
-  case removingAllFieldsOf // = 783
-  case repeated // = 784
-  case repeatedEnumExtensionField // = 785
-  case repeatedExtensionField // = 786
-  case repeatedFieldEncoding // = 787
-  case repeatedGroupExtensionField // = 788
-  case repeatedMessageExtensionField // = 789
-  case repeating // = 790
-  case replaceRepeatedFields // = 791
-  case requestStreaming // = 792
-  case requestTypeURL // = 793
-  case requiredSize // = 794
-  case responseStreaming // = 795
-  case responseTypeURL // = 796
-  case result // = 797
-  case retention // = 798
-  case `rethrows` // = 799
-  case `return` // = 800
-  case returnType // = 801
-  case revision // = 802
-  case rhs // = 803
-  case root // = 804
-  case rubyPackage // = 805
-  case s // = 806
-  case sawBackslash // = 807
-  case sawSection4Characters // = 808
-  case sawSection5Characters // = 809
-  case scan // = 810
-  case scanner // = 811
-  case seconds // = 812
-  case self_ // = 813
-  case semantic // = 814
-  case sendable // = 815
-  case separator // = 816
-  case serialize // = 817
-  case serializedBytes // = 818
-  case serializedData // = 819
-  case serializedSize // = 820
-  case serverStreaming // = 821
-  case service // = 822
-  case serviceDescriptorProto // = 823
-  case serviceOptions // = 824
-  case set // = 825
-  case setExtensionValue // = 826
-  case shift // = 827
-  case simpleExtensionMap // = 828
-  case size // = 829
-  case sizer // = 830
-  case source // = 831
-  case sourceCodeInfo // = 832
-  case sourceContext // = 833
-  case sourceEncoding // = 834
-  case sourceFile // = 835
-  case sourceLocation // = 836
-  case span // = 837
-  case split // = 838
-  case start // = 839
-  case startArray // = 840
-  case startArrayObject // = 841
-  case startField // = 842
-  case startIndex // = 843
-  case startMessageField // = 844
-  case startObject // = 845
-  case startRegularField // = 846
-  case state // = 847
-  case `static` // = 848
-  case staticString // = 849
-  case storage // = 850
-  case string // = 851
-  case stringLiteral // = 852
-  case stringLiteralType // = 853
-  case stringResult // = 854
-  case stringValue // = 855
-  case `struct` // = 856
-  case structValue // = 857
-  case subDecoder // = 858
-  case `subscript` // = 859
-  case subtract // = 860
-  case subVisitor // = 861
-  case swift // = 862
-  case swiftPrefix // = 863
-  case swiftProtobufContiguousBytes // = 864
-  case swiftProtobufError // = 865
-  case syntax // = 866
-  case t // = 867
-  case tag // = 868
-  case targets // = 869
-  case terminator // = 870
-  case testDecoder // = 871
-  case text // = 872
-  case textDecoder // = 873
-  case textFormatDecoder // = 874
-  case textFormatDecodingError // = 875
-  case textFormatDecodingOptions // = 876
-  case textFormatEncodingOptions // = 877
-  case textFormatEncodingVisitor // = 878
-  case textFormatString // = 879
-  case throwOrIgnore // = 880
-  case `throws` // = 881
-  case timeInterval // = 882
-  case timeIntervalSince1970 // = 883
-  case timeIntervalSinceReferenceDate // = 884
-  case timestamp // = 885
-  case tmp // = 886
-  case tooLarge // = 887
-  case total // = 888
-  case totalArrayDepth // = 889
-  case totalSize // = 890
-  case trailingComments // = 891
-  case traverse // = 892
-  case trim // = 893
-  case `true` // = 894
-  case `try` // = 895
-  case type // = 896
-  case `typealias` // = 897
-  case typeEnum // = 898
-  case typeName // = 899
-  case typePrefix // = 900
-  case typeStart // = 901
-  case typeUnknown // = 902
-  case typeURL // = 903
-  case uint32 // = 904
-  case uint32Value // = 905
-  case uint64 // = 906
-  case uint64Value // = 907
-  case uint8 // = 908
-  case unchecked // = 909
-  case unicodeScalarLiteral // = 910
-  case unicodeScalarLiteralType // = 911
-  case unicodeScalars // = 912
-  case unicodeScalarView // = 913
-  case uninterpretedOption // = 914
-  case union // = 915
-  case uniqueStorage // = 916
-  case unknown // = 917
-  case unknownFields // = 918
-  case unknownStorage // = 919
-  case unpackTo // = 920
-  case unsafeBufferPointer // = 921
-  case unsafeMutablePointer // = 922
-  case unsafeMutableRawBufferPointer // = 923
-  case unsafeRawBufferPointer // = 924
-  case unsafeRawPointer // = 925
-  case unverifiedLazy // = 926
-  case updatedOptions // = 927
-  case url // = 928
-  case useDeterministicOrdering // = 929
-  case utf8 // = 930
-  case utf8Ptr // = 931
-  case utf8ToDouble // = 932
-  case utf8Validation // = 933
-  case utf8View // = 934
-  case v // = 935
-  case value // = 936
-  case valueField // = 937
-  case values // = 938
-  case valueType // = 939
-  case `var` // = 940
-  case verification // = 941
-  case verificationState // = 942
-  case version // = 943
-  case versionString // = 944
-  case visitExtensionFields // = 945
-  case visitExtensionFieldsAsMessageSet // = 946
-  case visitMapField // = 947
-  case visitor // = 948
-  case visitPacked // = 949
-  case visitPackedBoolField // = 950
-  case visitPackedDoubleField // = 951
-  case visitPackedEnumField // = 952
-  case visitPackedFixed32Field // = 953
-  case visitPackedFixed64Field // = 954
-  case visitPackedFloatField // = 955
-  case visitPackedInt32Field // = 956
-  case visitPackedInt64Field // = 957
-  case visitPackedSfixed32Field // = 958
-  case visitPackedSfixed64Field // = 959
-  case visitPackedSint32Field // = 960
-  case visitPackedSint64Field // = 961
-  case visitPackedUint32Field // = 962
-  case visitPackedUint64Field // = 963
-  case visitRepeated // = 964
-  case visitRepeatedBoolField // = 965
-  case visitRepeatedBytesField // = 966
-  case visitRepeatedDoubleField // = 967
-  case visitRepeatedEnumField // = 968
-  case visitRepeatedFixed32Field // = 969
-  case visitRepeatedFixed64Field // = 970
-  case visitRepeatedFloatField // = 971
-  case visitRepeatedGroupField // = 972
-  case visitRepeatedInt32Field // = 973
-  case visitRepeatedInt64Field // = 974
-  case visitRepeatedMessageField // = 975
-  case visitRepeatedSfixed32Field // = 976
-  case visitRepeatedSfixed64Field // = 977
-  case visitRepeatedSint32Field // = 978
-  case visitRepeatedSint64Field // = 979
-  case visitRepeatedStringField // = 980
-  case visitRepeatedUint32Field // = 981
-  case visitRepeatedUint64Field // = 982
-  case visitSingular // = 983
-  case visitSingularBoolField // = 984
-  case visitSingularBytesField // = 985
-  case visitSingularDoubleField // = 986
-  case visitSingularEnumField // = 987
-  case visitSingularFixed32Field // = 988
-  case visitSingularFixed64Field // = 989
-  case visitSingularFloatField // = 990
-  case visitSingularGroupField // = 991
-  case visitSingularInt32Field // = 992
-  case visitSingularInt64Field // = 993
-  case visitSingularMessageField // = 994
-  case visitSingularSfixed32Field // = 995
-  case visitSingularSfixed64Field // = 996
-  case visitSingularSint32Field // = 997
-  case visitSingularSint64Field // = 998
-  case visitSingularStringField // = 999
-  case visitSingularUint32Field // = 1000
-  case visitSingularUint64Field // = 1001
-  case visitUnknown // = 1002
-  case wasDecoded // = 1003
-  case weak // = 1004
-  case weakDependency // = 1005
-  case `where` // = 1006
-  case wireFormat // = 1007
-  case with // = 1008
-  case withUnsafeBytes // = 1009
-  case withUnsafeMutableBytes // = 1010
-  case work // = 1011
-  case wrapped // = 1012
-  case wrappedType // = 1013
-  case wrappedValue // = 1014
-  case written // = 1015
-  case yday // = 1016
+  case clearEnforceNamingStyle // = 97
+  case clearEnumType // = 98
+  case clearExtendee // = 99
+  case clearExtensionValue // = 100
+  case clearFeatures // = 101
+  case clearFeatureSupport // = 102
+  case clearFieldPresence // = 103
+  case clearFixedFeatures // = 104
+  case clearFullName // = 105
+  case clearGoPackage // = 106
+  case clearIdempotencyLevel // = 107
+  case clearIdentifierValue // = 108
+  case clearInputType // = 109
+  case clearIsExtension // = 110
+  case clearJavaGenerateEqualsAndHash // = 111
+  case clearJavaGenericServices // = 112
+  case clearJavaMultipleFiles // = 113
+  case clearJavaOuterClassname // = 114
+  case clearJavaPackage // = 115
+  case clearJavaStringCheckUtf8 // = 116
+  case clearJsonFormat // = 117
+  case clearJsonName // = 118
+  case clearJstype // = 119
+  case clearLabel // = 120
+  case clearLazy // = 121
+  case clearLeadingComments // = 122
+  case clearMapEntry // = 123
+  case clearMaximumEdition // = 124
+  case clearMessageEncoding // = 125
+  case clearMessageSetWireFormat // = 126
+  case clearMinimumEdition // = 127
+  case clearName // = 128
+  case clearNamePart // = 129
+  case clearNegativeIntValue // = 130
+  case clearNoStandardDescriptorAccessor // = 131
+  case clearNumber // = 132
+  case clearObjcClassPrefix // = 133
+  case clearOneofIndex // = 134
+  case clearOptimizeFor // = 135
+  case clearOptions // = 136
+  case clearOutputType // = 137
+  case clearOverridableFeatures // = 138
+  case clearPackage // = 139
+  case clearPacked // = 140
+  case clearPhpClassPrefix // = 141
+  case clearPhpMetadataNamespace // = 142
+  case clearPhpNamespace // = 143
+  case clearPositiveIntValue // = 144
+  case clearProto3Optional // = 145
+  case clearPyGenericServices // = 146
+  case clearRepeated // = 147
+  case clearRepeatedFieldEncoding // = 148
+  case clearReserved // = 149
+  case clearRetention // = 150
+  case clearRubyPackage // = 151
+  case clearSemantic // = 152
+  case clearServerStreaming // = 153
+  case clearSourceCodeInfo // = 154
+  case clearSourceContext // = 155
+  case clearSourceFile // = 156
+  case clearStart // = 157
+  case clearStringValue // = 158
+  case clearSwiftPrefix // = 159
+  case clearSyntax // = 160
+  case clearTrailingComments // = 161
+  case clearType // = 162
+  case clearTypeName // = 163
+  case clearUnverifiedLazy // = 164
+  case clearUtf8Validation // = 165
+  case clearValue // = 166
+  case clearVerification // = 167
+  case clearWeak // = 168
+  case clientStreaming // = 169
+  case code // = 170
+  case codePoint // = 171
+  case codeUnits // = 172
+  case collection // = 173
+  case com // = 174
+  case comma // = 175
+  case consumedBytes // = 176
+  case contains // = 177
+  case contentsOf // = 178
+  case contiguousBytes // = 179
+  case copy // = 180
+  case count // = 181
+  case countVarintsInBuffer // = 182
+  case csharpNamespace // = 183
+  case ctype // = 184
+  case customCodable // = 185
+  case customDebugStringConvertible // = 186
+  case customStringConvertible // = 187
+  case d // = 188
+  case data // = 189
+  case dataResult // = 190
+  case date // = 191
+  case daySec // = 192
+  case daysSinceEpoch // = 193
+  case debugDescription_ // = 194
+  case debugRedact // = 195
+  case declaration // = 196
+  case decoded // = 197
+  case decodedFromJsonnull // = 198
+  case decodeExtensionField // = 199
+  case decodeExtensionFieldsAsMessageSet // = 200
+  case decodeJson // = 201
+  case decodeMapField // = 202
+  case decodeMessage // = 203
+  case decoder // = 204
+  case decodeRepeated // = 205
+  case decodeRepeatedBoolField // = 206
+  case decodeRepeatedBytesField // = 207
+  case decodeRepeatedDoubleField // = 208
+  case decodeRepeatedEnumField // = 209
+  case decodeRepeatedFixed32Field // = 210
+  case decodeRepeatedFixed64Field // = 211
+  case decodeRepeatedFloatField // = 212
+  case decodeRepeatedGroupField // = 213
+  case decodeRepeatedInt32Field // = 214
+  case decodeRepeatedInt64Field // = 215
+  case decodeRepeatedMessageField // = 216
+  case decodeRepeatedSfixed32Field // = 217
+  case decodeRepeatedSfixed64Field // = 218
+  case decodeRepeatedSint32Field // = 219
+  case decodeRepeatedSint64Field // = 220
+  case decodeRepeatedStringField // = 221
+  case decodeRepeatedUint32Field // = 222
+  case decodeRepeatedUint64Field // = 223
+  case decodeSingular // = 224
+  case decodeSingularBoolField // = 225
+  case decodeSingularBytesField // = 226
+  case decodeSingularDoubleField // = 227
+  case decodeSingularEnumField // = 228
+  case decodeSingularFixed32Field // = 229
+  case decodeSingularFixed64Field // = 230
+  case decodeSingularFloatField // = 231
+  case decodeSingularGroupField // = 232
+  case decodeSingularInt32Field // = 233
+  case decodeSingularInt64Field // = 234
+  case decodeSingularMessageField // = 235
+  case decodeSingularSfixed32Field // = 236
+  case decodeSingularSfixed64Field // = 237
+  case decodeSingularSint32Field // = 238
+  case decodeSingularSint64Field // = 239
+  case decodeSingularStringField // = 240
+  case decodeSingularUint32Field // = 241
+  case decodeSingularUint64Field // = 242
+  case decodeTextFormat // = 243
+  case defaultAnyTypeUrlprefix // = 244
+  case defaults // = 245
+  case defaultValue // = 246
+  case dependency // = 247
+  case deprecated // = 248
+  case deprecatedLegacyJsonFieldConflicts // = 249
+  case deprecationWarning // = 250
+  case description_ // = 251
+  case descriptorProto // = 252
+  case dictionary // = 253
+  case dictionaryLiteral // = 254
+  case digit // = 255
+  case digit0 // = 256
+  case digit1 // = 257
+  case digitCount // = 258
+  case digits // = 259
+  case digitValue // = 260
+  case discardableResult // = 261
+  case discardUnknownFields // = 262
+  case double // = 263
+  case doubleValue // = 264
+  case duration // = 265
+  case e // = 266
+  case edition // = 267
+  case editionDefault // = 268
+  case editionDefaults // = 269
+  case editionDeprecated // = 270
+  case editionIntroduced // = 271
+  case editionRemoved // = 272
+  case element // = 273
+  case elements // = 274
+  case `else` // = 275
+  case emitExtensionFieldName // = 276
+  case emitFieldName // = 277
+  case emitFieldNumber // = 278
+  case empty // = 279
+  case emptyAnyTypeURL // = 280
+  case emptyData // = 281
+  case encodeAsBytes // = 282
+  case encoded // = 283
+  case encodedJsonstring // = 284
+  case encodedSize // = 285
+  case encodeField // = 286
+  case encoder // = 287
+  case end // = 288
+  case endArray // = 289
+  case endMessageField // = 290
+  case endObject // = 291
+  case endRegularField // = 292
+  case enforceNamingStyle // = 293
+  case `enum` // = 294
+  case enumDescriptorProto // = 295
+  case enumOptions // = 296
+  case enumReservedRange // = 297
+  case enumType // = 298
+  case enumvalue // = 299
+  case enumValueDescriptorProto // = 300
+  case enumValueOptions // = 301
+  case equatable // = 302
+  case error // = 303
+  case expressibleByArrayLiteral // = 304
+  case expressibleByDictionaryLiteral // = 305
+  case ext // = 306
+  case extDecoder // = 307
+  case extendedGraphemeClusterLiteral // = 308
+  case extendedGraphemeClusterLiteralType // = 309
+  case extendee // = 310
+  case extensibleMessage // = 311
+  case `extension` // = 312
+  case extensionField // = 313
+  case extensionFieldNumber // = 314
+  case extensionFieldValueSet // = 315
+  case extensionMap // = 316
+  case extensionRange // = 317
+  case extensionRangeOptions // = 318
+  case extensions // = 319
+  case extras // = 320
+  case f // = 321
+  case `false` // = 322
+  case features // = 323
+  case featureSet // = 324
+  case featureSetDefaults // = 325
+  case featureSetEditionDefault // = 326
+  case featureSupport // = 327
+  case field // = 328
+  case fieldData // = 329
+  case fieldDescriptorProto // = 330
+  case fieldMask // = 331
+  case fieldMaskError // = 332
+  case fieldName // = 333
+  case fieldNameCount // = 334
+  case fieldNum // = 335
+  case fieldNumber // = 336
+  case fieldNumberForProto // = 337
+  case fieldOptions // = 338
+  case fieldPresence // = 339
+  case fields // = 340
+  case fieldSize // = 341
+  case fieldTag // = 342
+  case fieldType // = 343
+  case file // = 344
+  case fileDescriptorProto // = 345
+  case fileDescriptorSet // = 346
+  case fileName // = 347
+  case fileOptions // = 348
+  case filter // = 349
+  case final // = 350
+  case finiteOnly // = 351
+  case first // = 352
+  case firstItem // = 353
+  case fixedFeatures // = 354
+  case float // = 355
+  case floatLiteral // = 356
+  case floatLiteralType // = 357
+  case floatValue // = 358
+  case `for` // = 359
+  case forMessageName // = 360
+  case formUnion // = 361
+  case forReadingFrom // = 362
+  case forTypeURL // = 363
+  case forwardParser // = 364
+  case forWritingInto // = 365
+  case from // = 366
+  case fromAscii2 // = 367
+  case fromAscii4 // = 368
+  case fromByteOffset // = 369
+  case fromHexDigit // = 370
+  case fullName // = 371
+  case `func` // = 372
+  case function // = 373
+  case g // = 374
+  case generatedCodeInfo // = 375
+  case get // = 376
+  case getExtensionValue // = 377
+  case googleapis // = 378
+  case googleProtobufAny // = 379
+  case googleProtobufApi // = 380
+  case googleProtobufBoolValue // = 381
+  case googleProtobufBytesValue // = 382
+  case googleProtobufDescriptorProto // = 383
+  case googleProtobufDoubleValue // = 384
+  case googleProtobufDuration // = 385
+  case googleProtobufEdition // = 386
+  case googleProtobufEmpty // = 387
+  case googleProtobufEnum // = 388
+  case googleProtobufEnumDescriptorProto // = 389
+  case googleProtobufEnumOptions // = 390
+  case googleProtobufEnumValue // = 391
+  case googleProtobufEnumValueDescriptorProto // = 392
+  case googleProtobufEnumValueOptions // = 393
+  case googleProtobufExtensionRangeOptions // = 394
+  case googleProtobufFeatureSet // = 395
+  case googleProtobufFeatureSetDefaults // = 396
+  case googleProtobufField // = 397
+  case googleProtobufFieldDescriptorProto // = 398
+  case googleProtobufFieldMask // = 399
+  case googleProtobufFieldOptions // = 400
+  case googleProtobufFileDescriptorProto // = 401
+  case googleProtobufFileDescriptorSet // = 402
+  case googleProtobufFileOptions // = 403
+  case googleProtobufFloatValue // = 404
+  case googleProtobufGeneratedCodeInfo // = 405
+  case googleProtobufInt32Value // = 406
+  case googleProtobufInt64Value // = 407
+  case googleProtobufListValue // = 408
+  case googleProtobufMessageOptions // = 409
+  case googleProtobufMethod // = 410
+  case googleProtobufMethodDescriptorProto // = 411
+  case googleProtobufMethodOptions // = 412
+  case googleProtobufMixin // = 413
+  case googleProtobufNullValue // = 414
+  case googleProtobufOneofDescriptorProto // = 415
+  case googleProtobufOneofOptions // = 416
+  case googleProtobufOption // = 417
+  case googleProtobufServiceDescriptorProto // = 418
+  case googleProtobufServiceOptions // = 419
+  case googleProtobufSourceCodeInfo // = 420
+  case googleProtobufSourceContext // = 421
+  case googleProtobufStringValue // = 422
+  case googleProtobufStruct // = 423
+  case googleProtobufSyntax // = 424
+  case googleProtobufTimestamp // = 425
+  case googleProtobufType // = 426
+  case googleProtobufUint32Value // = 427
+  case googleProtobufUint64Value // = 428
+  case googleProtobufUninterpretedOption // = 429
+  case googleProtobufValue // = 430
+  case goPackage // = 431
+  case group // = 432
+  case groupFieldNumberStack // = 433
+  case groupSize // = 434
+  case `guard` // = 435
+  case hadOneofValue // = 436
+  case handleConflictingOneOf // = 437
+  case hasAggregateValue // = 438
+  case hasAllowAlias // = 439
+  case hasBegin // = 440
+  case hasCcEnableArenas // = 441
+  case hasCcGenericServices // = 442
+  case hasClientStreaming // = 443
+  case hasCsharpNamespace // = 444
+  case hasCtype // = 445
+  case hasDebugRedact // = 446
+  case hasDefaultValue // = 447
+  case hasDeprecated // = 448
+  case hasDeprecatedLegacyJsonFieldConflicts // = 449
+  case hasDeprecationWarning // = 450
+  case hasDoubleValue // = 451
+  case hasEdition // = 452
+  case hasEditionDeprecated // = 453
+  case hasEditionIntroduced // = 454
+  case hasEditionRemoved // = 455
+  case hasEnd // = 456
+  case hasEnforceNamingStyle // = 457
+  case hasEnumType // = 458
+  case hasExtendee // = 459
+  case hasExtensionValue // = 460
+  case hasFeatures // = 461
+  case hasFeatureSupport // = 462
+  case hasFieldPresence // = 463
+  case hasFixedFeatures // = 464
+  case hasFullName // = 465
+  case hasGoPackage // = 466
+  case hash // = 467
+  case hashable // = 468
+  case hasher // = 469
+  case hashVisitor // = 470
+  case hasIdempotencyLevel // = 471
+  case hasIdentifierValue // = 472
+  case hasInputType // = 473
+  case hasIsExtension // = 474
+  case hasJavaGenerateEqualsAndHash // = 475
+  case hasJavaGenericServices // = 476
+  case hasJavaMultipleFiles // = 477
+  case hasJavaOuterClassname // = 478
+  case hasJavaPackage // = 479
+  case hasJavaStringCheckUtf8 // = 480
+  case hasJsonFormat // = 481
+  case hasJsonName // = 482
+  case hasJstype // = 483
+  case hasLabel // = 484
+  case hasLazy // = 485
+  case hasLeadingComments // = 486
+  case hasMapEntry // = 487
+  case hasMaximumEdition // = 488
+  case hasMessageEncoding // = 489
+  case hasMessageSetWireFormat // = 490
+  case hasMinimumEdition // = 491
+  case hasName // = 492
+  case hasNamePart // = 493
+  case hasNegativeIntValue // = 494
+  case hasNoStandardDescriptorAccessor // = 495
+  case hasNumber // = 496
+  case hasObjcClassPrefix // = 497
+  case hasOneofIndex // = 498
+  case hasOptimizeFor // = 499
+  case hasOptions // = 500
+  case hasOutputType // = 501
+  case hasOverridableFeatures // = 502
+  case hasPackage // = 503
+  case hasPacked // = 504
+  case hasPhpClassPrefix // = 505
+  case hasPhpMetadataNamespace // = 506
+  case hasPhpNamespace // = 507
+  case hasPositiveIntValue // = 508
+  case hasProto3Optional // = 509
+  case hasPyGenericServices // = 510
+  case hasRepeated // = 511
+  case hasRepeatedFieldEncoding // = 512
+  case hasReserved // = 513
+  case hasRetention // = 514
+  case hasRubyPackage // = 515
+  case hasSemantic // = 516
+  case hasServerStreaming // = 517
+  case hasSourceCodeInfo // = 518
+  case hasSourceContext // = 519
+  case hasSourceFile // = 520
+  case hasStart // = 521
+  case hasStringValue // = 522
+  case hasSwiftPrefix // = 523
+  case hasSyntax // = 524
+  case hasTrailingComments // = 525
+  case hasType // = 526
+  case hasTypeName // = 527
+  case hasUnverifiedLazy // = 528
+  case hasUtf8Validation // = 529
+  case hasValue // = 530
+  case hasVerification // = 531
+  case hasWeak // = 532
+  case hour // = 533
+  case i // = 534
+  case idempotencyLevel // = 535
+  case identifierValue // = 536
+  case `if` // = 537
+  case ignoreUnknownExtensionFields // = 538
+  case ignoreUnknownFields // = 539
+  case index // = 540
+  case init_ // = 541
+  case `inout` // = 542
+  case inputType // = 543
+  case insert // = 544
+  case int // = 545
+  case int32 // = 546
+  case int32Value // = 547
+  case int64 // = 548
+  case int64Value // = 549
+  case int8 // = 550
+  case integerLiteral // = 551
+  case integerLiteralType // = 552
+  case intern // = 553
+  case `internal` // = 554
+  case internalState // = 555
+  case intersect // = 556
+  case into // = 557
+  case ints // = 558
+  case invalidAnyTypeURL // = 559
+  case isA // = 560
+  case isEqual // = 561
+  case isEqualTo // = 562
+  case isExtension // = 563
+  case isInitialized // = 564
+  case isNegative // = 565
+  case isPathValid // = 566
+  case isValid // = 567
+  case itemTagsEncodedSize // = 568
+  case iterator // = 569
+  case javaGenerateEqualsAndHash // = 570
+  case javaGenericServices // = 571
+  case javaMultipleFiles // = 572
+  case javaOuterClassname // = 573
+  case javaPackage // = 574
+  case javaStringCheckUtf8 // = 575
+  case jsondecoder // = 576
+  case jsondecoding // = 577
+  case jsondecodingError // = 578
+  case jsondecodingOptions // = 579
+  case jsonEncoder // = 580
+  case jsonencoding // = 581
+  case jsonencodingError // = 582
+  case jsonencodingOptions // = 583
+  case jsonencodingVisitor // = 584
+  case jsonFormat // = 585
+  case jsonmapEncodingVisitor // = 586
+  case jsonName // = 587
+  case jsonPath // = 588
+  case jsonPaths // = 589
+  case jsonscanner // = 590
+  case jsonString // = 591
+  case jsonText // = 592
+  case jsonUtf8Bytes // = 593
+  case jsonUtf8Data // = 594
+  case jstype // = 595
+  case k // = 596
+  case kChunkSize // = 597
+  case key // = 598
+  case keyField // = 599
+  case keyFieldOpt // = 600
+  case keyType // = 601
+  case kind // = 602
+  case l // = 603
+  case label // = 604
+  case lazy // = 605
+  case leadingComments // = 606
+  case leadingDetachedComments // = 607
+  case length // = 608
+  case lessThan // = 609
+  case `let` // = 610
+  case lhs // = 611
+  case line // = 612
+  case list // = 613
+  case listOfMessages // = 614
+  case listValue // = 615
+  case littleEndian // = 616
+  case load // = 617
+  case localHasher // = 618
+  case location // = 619
+  case m // = 620
+  case major // = 621
+  case makeAsyncIterator // = 622
+  case makeIterator // = 623
+  case malformedLength // = 624
+  case mapEntry // = 625
+  case mapKeyType // = 626
+  case mapToMessages // = 627
+  case mapValueType // = 628
+  case mapVisitor // = 629
+  case mask // = 630
+  case maximumEdition // = 631
+  case mdayStart // = 632
+  case merge // = 633
+  case mergeOptions // = 634
+  case message // = 635
+  case messageDepthLimit // = 636
+  case messageEncoding // = 637
+  case messageExtension // = 638
+  case messageImplementationBase // = 639
+  case messageOptions // = 640
+  case messageSet // = 641
+  case messageSetWireFormat // = 642
+  case messageSize // = 643
+  case messageType // = 644
+  case method // = 645
+  case methodDescriptorProto // = 646
+  case methodOptions // = 647
+  case methods // = 648
+  case min // = 649
+  case minimumEdition // = 650
+  case minor // = 651
+  case mixin // = 652
+  case mixins // = 653
+  case modify // = 654
+  case month // = 655
+  case msgExtension // = 656
+  case mutating // = 657
+  case n // = 658
+  case name // = 659
+  case nameDescription // = 660
+  case nameMap // = 661
+  case namePart // = 662
+  case names // = 663
+  case nanos // = 664
+  case negativeIntValue // = 665
+  case nestedType // = 666
+  case newExtensible // = 667
+  case newL // = 668
+  case newList // = 669
+  case newMessage // = 670
+  case newValue // = 671
+  case next // = 672
+  case nextByte // = 673
+  case nextFieldNumber // = 674
+  case nextVarInt // = 675
+  case `nil` // = 676
+  case nilLiteral // = 677
+  case noBytesAvailable // = 678
+  case noStandardDescriptorAccessor // = 679
+  case nullValue // = 680
+  case number // = 681
+  case numberValue // = 682
+  case objcClassPrefix // = 683
+  case of // = 684
+  case oneofDecl // = 685
+  case oneofDescriptorProto // = 686
+  case oneofIndex // = 687
+  case oneofOptions // = 688
+  case oneofs // = 689
+  case oneOfKind // = 690
+  case optimizeFor // = 691
+  case optimizeMode // = 692
+  case option // = 693
+  case optionalEnumExtensionField // = 694
+  case optionalExtensionField // = 695
+  case optionalGroupExtensionField // = 696
+  case optionalMessageExtensionField // = 697
+  case optionRetention // = 698
+  case options // = 699
+  case optionTargetType // = 700
+  case other // = 701
+  case others // = 702
+  case out // = 703
+  case outputType // = 704
+  case overridableFeatures // = 705
+  case p // = 706
+  case package // = 707
+  case packed // = 708
+  case packedEnumExtensionField // = 709
+  case packedExtensionField // = 710
+  case padding // = 711
+  case parent // = 712
+  case parse // = 713
+  case partial // = 714
+  case path // = 715
+  case pathDecoder // = 716
+  case pathDecodingError // = 717
+  case paths // = 718
+  case pathVisitor // = 719
+  case payload // = 720
+  case payloadSize // = 721
+  case phpClassPrefix // = 722
+  case phpMetadataNamespace // = 723
+  case phpNamespace // = 724
+  case pos // = 725
+  case positiveIntValue // = 726
+  case prefix // = 727
+  case preserveProtoFieldNames // = 728
+  case preTraverse // = 729
+  case prevPath // = 730
+  case printUnknownFields // = 731
+  case proto2 // = 732
+  case proto3DefaultValue // = 733
+  case proto3Optional // = 734
+  case protobufApiversionCheck // = 735
+  case protobufApiversion2 // = 736
+  case protobufBool // = 737
+  case protobufBytes // = 738
+  case protobufDouble // = 739
+  case protobufEnumMap // = 740
+  case protobufExtension // = 741
+  case protobufFixed32 // = 742
+  case protobufFixed64 // = 743
+  case protobufFloat // = 744
+  case protobufInt32 // = 745
+  case protobufInt64 // = 746
+  case protobufMap // = 747
+  case protobufMessageMap // = 748
+  case protobufSfixed32 // = 749
+  case protobufSfixed64 // = 750
+  case protobufSint32 // = 751
+  case protobufSint64 // = 752
+  case protobufString // = 753
+  case protobufUint32 // = 754
+  case protobufUint64 // = 755
+  case protobufExtensionFieldValues // = 756
+  case protobufFieldNumber // = 757
+  case protobufGeneratedIsEqualTo // = 758
+  case protobufNameMap // = 759
+  case protobufNewField // = 760
+  case protobufPackage // = 761
+  case `protocol` // = 762
+  case protoFieldName // = 763
+  case protoMessageName // = 764
+  case protoNameProviding // = 765
+  case protoPaths // = 766
+  case `public` // = 767
+  case publicDependency // = 768
+  case putBoolValue // = 769
+  case putBytesValue // = 770
+  case putDoubleValue // = 771
+  case putEnumValue // = 772
+  case putFixedUint32 // = 773
+  case putFixedUint64 // = 774
+  case putFloatValue // = 775
+  case putInt64 // = 776
+  case putStringValue // = 777
+  case putUint64 // = 778
+  case putUint64Hex // = 779
+  case putVarInt // = 780
+  case putZigZagVarInt // = 781
+  case pyGenericServices // = 782
+  case r // = 783
+  case rawChars // = 784
+  case rawRepresentable // = 785
+  case rawValue_ // = 786
+  case read4HexDigits // = 787
+  case readBytes // = 788
+  case register // = 789
+  case removingAllFieldsOf // = 790
+  case repeated // = 791
+  case repeatedEnumExtensionField // = 792
+  case repeatedExtensionField // = 793
+  case repeatedFieldEncoding // = 794
+  case repeatedGroupExtensionField // = 795
+  case repeatedMessageExtensionField // = 796
+  case repeating // = 797
+  case replaceRepeatedFields // = 798
+  case requestStreaming // = 799
+  case requestTypeURL // = 800
+  case requiredSize // = 801
+  case responseStreaming // = 802
+  case responseTypeURL // = 803
+  case result // = 804
+  case retention // = 805
+  case `rethrows` // = 806
+  case `return` // = 807
+  case returnType // = 808
+  case revision // = 809
+  case rhs // = 810
+  case root // = 811
+  case rubyPackage // = 812
+  case s // = 813
+  case sawBackslash // = 814
+  case sawSection4Characters // = 815
+  case sawSection5Characters // = 816
+  case scan // = 817
+  case scanner // = 818
+  case seconds // = 819
+  case self_ // = 820
+  case semantic // = 821
+  case sendable // = 822
+  case separator // = 823
+  case serialize // = 824
+  case serializedBytes // = 825
+  case serializedData // = 826
+  case serializedSize // = 827
+  case serverStreaming // = 828
+  case service // = 829
+  case serviceDescriptorProto // = 830
+  case serviceOptions // = 831
+  case set // = 832
+  case setExtensionValue // = 833
+  case shift // = 834
+  case simpleExtensionMap // = 835
+  case size // = 836
+  case sizer // = 837
+  case source // = 838
+  case sourceCodeInfo // = 839
+  case sourceContext // = 840
+  case sourceEncoding // = 841
+  case sourceFile // = 842
+  case sourceLocation // = 843
+  case span // = 844
+  case split // = 845
+  case start // = 846
+  case startArray // = 847
+  case startArrayObject // = 848
+  case startField // = 849
+  case startIndex // = 850
+  case startMessageField // = 851
+  case startObject // = 852
+  case startRegularField // = 853
+  case state // = 854
+  case `static` // = 855
+  case staticString // = 856
+  case storage // = 857
+  case string // = 858
+  case stringLiteral // = 859
+  case stringLiteralType // = 860
+  case stringResult // = 861
+  case stringValue // = 862
+  case `struct` // = 863
+  case structValue // = 864
+  case subDecoder // = 865
+  case `subscript` // = 866
+  case subtract // = 867
+  case subVisitor // = 868
+  case swift // = 869
+  case swiftPrefix // = 870
+  case swiftProtobufContiguousBytes // = 871
+  case swiftProtobufError // = 872
+  case syntax // = 873
+  case t // = 874
+  case tag // = 875
+  case targets // = 876
+  case terminator // = 877
+  case testDecoder // = 878
+  case text // = 879
+  case textDecoder // = 880
+  case textFormatDecoder // = 881
+  case textFormatDecodingError // = 882
+  case textFormatDecodingOptions // = 883
+  case textFormatEncodingOptions // = 884
+  case textFormatEncodingVisitor // = 885
+  case textFormatString // = 886
+  case throwOrIgnore // = 887
+  case `throws` // = 888
+  case timeInterval // = 889
+  case timeIntervalSince1970 // = 890
+  case timeIntervalSinceReferenceDate // = 891
+  case timestamp // = 892
+  case tmp // = 893
+  case tooLarge // = 894
+  case total // = 895
+  case totalArrayDepth // = 896
+  case totalSize // = 897
+  case trailingComments // = 898
+  case traverse // = 899
+  case trim // = 900
+  case `true` // = 901
+  case `try` // = 902
+  case type // = 903
+  case `typealias` // = 904
+  case typeEnum // = 905
+  case typeName // = 906
+  case typePrefix // = 907
+  case typeStart // = 908
+  case typeUnknown // = 909
+  case typeURL // = 910
+  case uint32 // = 911
+  case uint32Value // = 912
+  case uint64 // = 913
+  case uint64Value // = 914
+  case uint8 // = 915
+  case unchecked // = 916
+  case unicodeScalarLiteral // = 917
+  case unicodeScalarLiteralType // = 918
+  case unicodeScalars // = 919
+  case unicodeScalarView // = 920
+  case uninterpretedOption // = 921
+  case union // = 922
+  case uniqueStorage // = 923
+  case unknown // = 924
+  case unknownFields // = 925
+  case unknownStorage // = 926
+  case unpackTo // = 927
+  case unsafeBufferPointer // = 928
+  case unsafeMutablePointer // = 929
+  case unsafeMutableRawBufferPointer // = 930
+  case unsafeRawBufferPointer // = 931
+  case unsafeRawPointer // = 932
+  case unverifiedLazy // = 933
+  case updatedOptions // = 934
+  case url // = 935
+  case useDeterministicOrdering // = 936
+  case utf8 // = 937
+  case utf8Ptr // = 938
+  case utf8ToDouble // = 939
+  case utf8Validation // = 940
+  case utf8View // = 941
+  case v // = 942
+  case value // = 943
+  case valueField // = 944
+  case values // = 945
+  case valueType // = 946
+  case `var` // = 947
+  case verification // = 948
+  case verificationState // = 949
+  case version // = 950
+  case versionString // = 951
+  case visitExtensionFields // = 952
+  case visitExtensionFieldsAsMessageSet // = 953
+  case visitMapField // = 954
+  case visitor // = 955
+  case visitPacked // = 956
+  case visitPackedBoolField // = 957
+  case visitPackedDoubleField // = 958
+  case visitPackedEnumField // = 959
+  case visitPackedFixed32Field // = 960
+  case visitPackedFixed64Field // = 961
+  case visitPackedFloatField // = 962
+  case visitPackedInt32Field // = 963
+  case visitPackedInt64Field // = 964
+  case visitPackedSfixed32Field // = 965
+  case visitPackedSfixed64Field // = 966
+  case visitPackedSint32Field // = 967
+  case visitPackedSint64Field // = 968
+  case visitPackedUint32Field // = 969
+  case visitPackedUint64Field // = 970
+  case visitRepeated // = 971
+  case visitRepeatedBoolField // = 972
+  case visitRepeatedBytesField // = 973
+  case visitRepeatedDoubleField // = 974
+  case visitRepeatedEnumField // = 975
+  case visitRepeatedFixed32Field // = 976
+  case visitRepeatedFixed64Field // = 977
+  case visitRepeatedFloatField // = 978
+  case visitRepeatedGroupField // = 979
+  case visitRepeatedInt32Field // = 980
+  case visitRepeatedInt64Field // = 981
+  case visitRepeatedMessageField // = 982
+  case visitRepeatedSfixed32Field // = 983
+  case visitRepeatedSfixed64Field // = 984
+  case visitRepeatedSint32Field // = 985
+  case visitRepeatedSint64Field // = 986
+  case visitRepeatedStringField // = 987
+  case visitRepeatedUint32Field // = 988
+  case visitRepeatedUint64Field // = 989
+  case visitSingular // = 990
+  case visitSingularBoolField // = 991
+  case visitSingularBytesField // = 992
+  case visitSingularDoubleField // = 993
+  case visitSingularEnumField // = 994
+  case visitSingularFixed32Field // = 995
+  case visitSingularFixed64Field // = 996
+  case visitSingularFloatField // = 997
+  case visitSingularGroupField // = 998
+  case visitSingularInt32Field // = 999
+  case visitSingularInt64Field // = 1000
+  case visitSingularMessageField // = 1001
+  case visitSingularSfixed32Field // = 1002
+  case visitSingularSfixed64Field // = 1003
+  case visitSingularSint32Field // = 1004
+  case visitSingularSint64Field // = 1005
+  case visitSingularStringField // = 1006
+  case visitSingularUint32Field // = 1007
+  case visitSingularUint64Field // = 1008
+  case visitUnknown // = 1009
+  case wasDecoded // = 1010
+  case weak // = 1011
+  case weakDependency // = 1012
+  case `where` // = 1013
+  case wireFormat // = 1014
+  case with // = 1015
+  case withUnsafeBytes // = 1016
+  case withUnsafeMutableBytes // = 1017
+  case work // = 1018
+  case wrapped // = 1019
+  case wrappedType // = 1020
+  case wrappedValue // = 1021
+  case written // = 1022
+  case yday // = 1023
   case UNRECOGNIZED(Int)
 
   init() {
@@ -1148,926 +1155,933 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 94: self = .clearEditionIntroduced
     case 95: self = .clearEditionRemoved
     case 96: self = .clearEnd
-    case 97: self = .clearEnumType
-    case 98: self = .clearExtendee
-    case 99: self = .clearExtensionValue
-    case 100: self = .clearFeatures
-    case 101: self = .clearFeatureSupport
-    case 102: self = .clearFieldPresence
-    case 103: self = .clearFixedFeatures
-    case 104: self = .clearFullName
-    case 105: self = .clearGoPackage
-    case 106: self = .clearIdempotencyLevel
-    case 107: self = .clearIdentifierValue
-    case 108: self = .clearInputType
-    case 109: self = .clearIsExtension
-    case 110: self = .clearJavaGenerateEqualsAndHash
-    case 111: self = .clearJavaGenericServices
-    case 112: self = .clearJavaMultipleFiles
-    case 113: self = .clearJavaOuterClassname
-    case 114: self = .clearJavaPackage
-    case 115: self = .clearJavaStringCheckUtf8
-    case 116: self = .clearJsonFormat
-    case 117: self = .clearJsonName
-    case 118: self = .clearJstype
-    case 119: self = .clearLabel
-    case 120: self = .clearLazy
-    case 121: self = .clearLeadingComments
-    case 122: self = .clearMapEntry
-    case 123: self = .clearMaximumEdition
-    case 124: self = .clearMessageEncoding
-    case 125: self = .clearMessageSetWireFormat
-    case 126: self = .clearMinimumEdition
-    case 127: self = .clearName
-    case 128: self = .clearNamePart
-    case 129: self = .clearNegativeIntValue
-    case 130: self = .clearNoStandardDescriptorAccessor
-    case 131: self = .clearNumber
-    case 132: self = .clearObjcClassPrefix
-    case 133: self = .clearOneofIndex
-    case 134: self = .clearOptimizeFor
-    case 135: self = .clearOptions
-    case 136: self = .clearOutputType
-    case 137: self = .clearOverridableFeatures
-    case 138: self = .clearPackage
-    case 139: self = .clearPacked
-    case 140: self = .clearPhpClassPrefix
-    case 141: self = .clearPhpMetadataNamespace
-    case 142: self = .clearPhpNamespace
-    case 143: self = .clearPositiveIntValue
-    case 144: self = .clearProto3Optional
-    case 145: self = .clearPyGenericServices
-    case 146: self = .clearRepeated
-    case 147: self = .clearRepeatedFieldEncoding
-    case 148: self = .clearReserved
-    case 149: self = .clearRetention
-    case 150: self = .clearRubyPackage
-    case 151: self = .clearSemantic
-    case 152: self = .clearServerStreaming
-    case 153: self = .clearSourceCodeInfo
-    case 154: self = .clearSourceContext
-    case 155: self = .clearSourceFile
-    case 156: self = .clearStart
-    case 157: self = .clearStringValue
-    case 158: self = .clearSwiftPrefix
-    case 159: self = .clearSyntax
-    case 160: self = .clearTrailingComments
-    case 161: self = .clearType
-    case 162: self = .clearTypeName
-    case 163: self = .clearUnverifiedLazy
-    case 164: self = .clearUtf8Validation
-    case 165: self = .clearValue
-    case 166: self = .clearVerification
-    case 167: self = .clearWeak
-    case 168: self = .clientStreaming
-    case 169: self = .code
-    case 170: self = .codePoint
-    case 171: self = .codeUnits
-    case 172: self = .collection
-    case 173: self = .com
-    case 174: self = .comma
-    case 175: self = .consumedBytes
-    case 176: self = .contains
-    case 177: self = .contentsOf
-    case 178: self = .contiguousBytes
-    case 179: self = .copy
-    case 180: self = .count
-    case 181: self = .countVarintsInBuffer
-    case 182: self = .csharpNamespace
-    case 183: self = .ctype
-    case 184: self = .customCodable
-    case 185: self = .customDebugStringConvertible
-    case 186: self = .customStringConvertible
-    case 187: self = .d
-    case 188: self = .data
-    case 189: self = .dataResult
-    case 190: self = .date
-    case 191: self = .daySec
-    case 192: self = .daysSinceEpoch
-    case 193: self = .debugDescription_
-    case 194: self = .debugRedact
-    case 195: self = .declaration
-    case 196: self = .decoded
-    case 197: self = .decodedFromJsonnull
-    case 198: self = .decodeExtensionField
-    case 199: self = .decodeExtensionFieldsAsMessageSet
-    case 200: self = .decodeJson
-    case 201: self = .decodeMapField
-    case 202: self = .decodeMessage
-    case 203: self = .decoder
-    case 204: self = .decodeRepeated
-    case 205: self = .decodeRepeatedBoolField
-    case 206: self = .decodeRepeatedBytesField
-    case 207: self = .decodeRepeatedDoubleField
-    case 208: self = .decodeRepeatedEnumField
-    case 209: self = .decodeRepeatedFixed32Field
-    case 210: self = .decodeRepeatedFixed64Field
-    case 211: self = .decodeRepeatedFloatField
-    case 212: self = .decodeRepeatedGroupField
-    case 213: self = .decodeRepeatedInt32Field
-    case 214: self = .decodeRepeatedInt64Field
-    case 215: self = .decodeRepeatedMessageField
-    case 216: self = .decodeRepeatedSfixed32Field
-    case 217: self = .decodeRepeatedSfixed64Field
-    case 218: self = .decodeRepeatedSint32Field
-    case 219: self = .decodeRepeatedSint64Field
-    case 220: self = .decodeRepeatedStringField
-    case 221: self = .decodeRepeatedUint32Field
-    case 222: self = .decodeRepeatedUint64Field
-    case 223: self = .decodeSingular
-    case 224: self = .decodeSingularBoolField
-    case 225: self = .decodeSingularBytesField
-    case 226: self = .decodeSingularDoubleField
-    case 227: self = .decodeSingularEnumField
-    case 228: self = .decodeSingularFixed32Field
-    case 229: self = .decodeSingularFixed64Field
-    case 230: self = .decodeSingularFloatField
-    case 231: self = .decodeSingularGroupField
-    case 232: self = .decodeSingularInt32Field
-    case 233: self = .decodeSingularInt64Field
-    case 234: self = .decodeSingularMessageField
-    case 235: self = .decodeSingularSfixed32Field
-    case 236: self = .decodeSingularSfixed64Field
-    case 237: self = .decodeSingularSint32Field
-    case 238: self = .decodeSingularSint64Field
-    case 239: self = .decodeSingularStringField
-    case 240: self = .decodeSingularUint32Field
-    case 241: self = .decodeSingularUint64Field
-    case 242: self = .decodeTextFormat
-    case 243: self = .defaultAnyTypeUrlprefix
-    case 244: self = .defaults
-    case 245: self = .defaultValue
-    case 246: self = .dependency
-    case 247: self = .deprecated
-    case 248: self = .deprecatedLegacyJsonFieldConflicts
-    case 249: self = .deprecationWarning
-    case 250: self = .description_
-    case 251: self = .descriptorProto
-    case 252: self = .dictionary
-    case 253: self = .dictionaryLiteral
-    case 254: self = .digit
-    case 255: self = .digit0
-    case 256: self = .digit1
-    case 257: self = .digitCount
-    case 258: self = .digits
-    case 259: self = .digitValue
-    case 260: self = .discardableResult
-    case 261: self = .discardUnknownFields
-    case 262: self = .double
-    case 263: self = .doubleValue
-    case 264: self = .duration
-    case 265: self = .e
-    case 266: self = .edition
-    case 267: self = .editionDefault
-    case 268: self = .editionDefaults
-    case 269: self = .editionDeprecated
-    case 270: self = .editionIntroduced
-    case 271: self = .editionRemoved
-    case 272: self = .element
-    case 273: self = .elements
-    case 274: self = .else
-    case 275: self = .emitExtensionFieldName
-    case 276: self = .emitFieldName
-    case 277: self = .emitFieldNumber
-    case 278: self = .empty
-    case 279: self = .emptyData
-    case 280: self = .encodeAsBytes
-    case 281: self = .encoded
-    case 282: self = .encodedJsonstring
-    case 283: self = .encodedSize
-    case 284: self = .encodeField
-    case 285: self = .encoder
-    case 286: self = .end
-    case 287: self = .endArray
-    case 288: self = .endMessageField
-    case 289: self = .endObject
-    case 290: self = .endRegularField
-    case 291: self = .enum
-    case 292: self = .enumDescriptorProto
-    case 293: self = .enumOptions
-    case 294: self = .enumReservedRange
-    case 295: self = .enumType
-    case 296: self = .enumvalue
-    case 297: self = .enumValueDescriptorProto
-    case 298: self = .enumValueOptions
-    case 299: self = .equatable
-    case 300: self = .error
-    case 301: self = .expressibleByArrayLiteral
-    case 302: self = .expressibleByDictionaryLiteral
-    case 303: self = .ext
-    case 304: self = .extDecoder
-    case 305: self = .extendedGraphemeClusterLiteral
-    case 306: self = .extendedGraphemeClusterLiteralType
-    case 307: self = .extendee
-    case 308: self = .extensibleMessage
-    case 309: self = .extension
-    case 310: self = .extensionField
-    case 311: self = .extensionFieldNumber
-    case 312: self = .extensionFieldValueSet
-    case 313: self = .extensionMap
-    case 314: self = .extensionRange
-    case 315: self = .extensionRangeOptions
-    case 316: self = .extensions
-    case 317: self = .extras
-    case 318: self = .f
-    case 319: self = .false
-    case 320: self = .features
-    case 321: self = .featureSet
-    case 322: self = .featureSetDefaults
-    case 323: self = .featureSetEditionDefault
-    case 324: self = .featureSupport
-    case 325: self = .field
-    case 326: self = .fieldData
-    case 327: self = .fieldDescriptorProto
-    case 328: self = .fieldMask
-    case 329: self = .fieldMaskError
-    case 330: self = .fieldName
-    case 331: self = .fieldNameCount
-    case 332: self = .fieldNum
-    case 333: self = .fieldNumber
-    case 334: self = .fieldNumberForProto
-    case 335: self = .fieldOptions
-    case 336: self = .fieldPresence
-    case 337: self = .fields
-    case 338: self = .fieldSize
-    case 339: self = .fieldTag
-    case 340: self = .fieldType
-    case 341: self = .file
-    case 342: self = .fileDescriptorProto
-    case 343: self = .fileDescriptorSet
-    case 344: self = .fileName
-    case 345: self = .fileOptions
-    case 346: self = .filter
-    case 347: self = .final
-    case 348: self = .finiteOnly
-    case 349: self = .first
-    case 350: self = .firstItem
-    case 351: self = .fixedFeatures
-    case 352: self = .float
-    case 353: self = .floatLiteral
-    case 354: self = .floatLiteralType
-    case 355: self = .floatValue
-    case 356: self = .for
-    case 357: self = .forMessageName
-    case 358: self = .formUnion
-    case 359: self = .forReadingFrom
-    case 360: self = .forTypeURL
-    case 361: self = .forwardParser
-    case 362: self = .forWritingInto
-    case 363: self = .from
-    case 364: self = .fromAscii2
-    case 365: self = .fromAscii4
-    case 366: self = .fromByteOffset
-    case 367: self = .fromHexDigit
-    case 368: self = .fullName
-    case 369: self = .func
-    case 370: self = .function
-    case 371: self = .g
-    case 372: self = .generatedCodeInfo
-    case 373: self = .get
-    case 374: self = .getExtensionValue
-    case 375: self = .googleapis
-    case 376: self = .googleProtobufAny
-    case 377: self = .googleProtobufApi
-    case 378: self = .googleProtobufBoolValue
-    case 379: self = .googleProtobufBytesValue
-    case 380: self = .googleProtobufDescriptorProto
-    case 381: self = .googleProtobufDoubleValue
-    case 382: self = .googleProtobufDuration
-    case 383: self = .googleProtobufEdition
-    case 384: self = .googleProtobufEmpty
-    case 385: self = .googleProtobufEnum
-    case 386: self = .googleProtobufEnumDescriptorProto
-    case 387: self = .googleProtobufEnumOptions
-    case 388: self = .googleProtobufEnumValue
-    case 389: self = .googleProtobufEnumValueDescriptorProto
-    case 390: self = .googleProtobufEnumValueOptions
-    case 391: self = .googleProtobufExtensionRangeOptions
-    case 392: self = .googleProtobufFeatureSet
-    case 393: self = .googleProtobufFeatureSetDefaults
-    case 394: self = .googleProtobufField
-    case 395: self = .googleProtobufFieldDescriptorProto
-    case 396: self = .googleProtobufFieldMask
-    case 397: self = .googleProtobufFieldOptions
-    case 398: self = .googleProtobufFileDescriptorProto
-    case 399: self = .googleProtobufFileDescriptorSet
-    case 400: self = .googleProtobufFileOptions
-    case 401: self = .googleProtobufFloatValue
-    case 402: self = .googleProtobufGeneratedCodeInfo
-    case 403: self = .googleProtobufInt32Value
-    case 404: self = .googleProtobufInt64Value
-    case 405: self = .googleProtobufListValue
-    case 406: self = .googleProtobufMessageOptions
-    case 407: self = .googleProtobufMethod
-    case 408: self = .googleProtobufMethodDescriptorProto
-    case 409: self = .googleProtobufMethodOptions
-    case 410: self = .googleProtobufMixin
-    case 411: self = .googleProtobufNullValue
-    case 412: self = .googleProtobufOneofDescriptorProto
-    case 413: self = .googleProtobufOneofOptions
-    case 414: self = .googleProtobufOption
-    case 415: self = .googleProtobufServiceDescriptorProto
-    case 416: self = .googleProtobufServiceOptions
-    case 417: self = .googleProtobufSourceCodeInfo
-    case 418: self = .googleProtobufSourceContext
-    case 419: self = .googleProtobufStringValue
-    case 420: self = .googleProtobufStruct
-    case 421: self = .googleProtobufSyntax
-    case 422: self = .googleProtobufTimestamp
-    case 423: self = .googleProtobufType
-    case 424: self = .googleProtobufUint32Value
-    case 425: self = .googleProtobufUint64Value
-    case 426: self = .googleProtobufUninterpretedOption
-    case 427: self = .googleProtobufValue
-    case 428: self = .goPackage
-    case 429: self = .group
-    case 430: self = .groupFieldNumberStack
-    case 431: self = .groupSize
-    case 432: self = .guard
-    case 433: self = .hadOneofValue
-    case 434: self = .handleConflictingOneOf
-    case 435: self = .hasAggregateValue
-    case 436: self = .hasAllowAlias
-    case 437: self = .hasBegin
-    case 438: self = .hasCcEnableArenas
-    case 439: self = .hasCcGenericServices
-    case 440: self = .hasClientStreaming
-    case 441: self = .hasCsharpNamespace
-    case 442: self = .hasCtype
-    case 443: self = .hasDebugRedact
-    case 444: self = .hasDefaultValue
-    case 445: self = .hasDeprecated
-    case 446: self = .hasDeprecatedLegacyJsonFieldConflicts
-    case 447: self = .hasDeprecationWarning
-    case 448: self = .hasDoubleValue
-    case 449: self = .hasEdition
-    case 450: self = .hasEditionDeprecated
-    case 451: self = .hasEditionIntroduced
-    case 452: self = .hasEditionRemoved
-    case 453: self = .hasEnd
-    case 454: self = .hasEnumType
-    case 455: self = .hasExtendee
-    case 456: self = .hasExtensionValue
-    case 457: self = .hasFeatures
-    case 458: self = .hasFeatureSupport
-    case 459: self = .hasFieldPresence
-    case 460: self = .hasFixedFeatures
-    case 461: self = .hasFullName
-    case 462: self = .hasGoPackage
-    case 463: self = .hash
-    case 464: self = .hashable
-    case 465: self = .hasher
-    case 466: self = .hashVisitor
-    case 467: self = .hasIdempotencyLevel
-    case 468: self = .hasIdentifierValue
-    case 469: self = .hasInputType
-    case 470: self = .hasIsExtension
-    case 471: self = .hasJavaGenerateEqualsAndHash
-    case 472: self = .hasJavaGenericServices
-    case 473: self = .hasJavaMultipleFiles
-    case 474: self = .hasJavaOuterClassname
-    case 475: self = .hasJavaPackage
-    case 476: self = .hasJavaStringCheckUtf8
-    case 477: self = .hasJsonFormat
-    case 478: self = .hasJsonName
-    case 479: self = .hasJstype
-    case 480: self = .hasLabel
-    case 481: self = .hasLazy
-    case 482: self = .hasLeadingComments
-    case 483: self = .hasMapEntry
-    case 484: self = .hasMaximumEdition
-    case 485: self = .hasMessageEncoding
-    case 486: self = .hasMessageSetWireFormat
-    case 487: self = .hasMinimumEdition
-    case 488: self = .hasName
-    case 489: self = .hasNamePart
-    case 490: self = .hasNegativeIntValue
-    case 491: self = .hasNoStandardDescriptorAccessor
-    case 492: self = .hasNumber
-    case 493: self = .hasObjcClassPrefix
-    case 494: self = .hasOneofIndex
-    case 495: self = .hasOptimizeFor
-    case 496: self = .hasOptions
-    case 497: self = .hasOutputType
-    case 498: self = .hasOverridableFeatures
-    case 499: self = .hasPackage
-    case 500: self = .hasPacked
-    case 501: self = .hasPhpClassPrefix
-    case 502: self = .hasPhpMetadataNamespace
-    case 503: self = .hasPhpNamespace
-    case 504: self = .hasPositiveIntValue
-    case 505: self = .hasProto3Optional
-    case 506: self = .hasPyGenericServices
-    case 507: self = .hasRepeated
-    case 508: self = .hasRepeatedFieldEncoding
-    case 509: self = .hasReserved
-    case 510: self = .hasRetention
-    case 511: self = .hasRubyPackage
-    case 512: self = .hasSemantic
-    case 513: self = .hasServerStreaming
-    case 514: self = .hasSourceCodeInfo
-    case 515: self = .hasSourceContext
-    case 516: self = .hasSourceFile
-    case 517: self = .hasStart
-    case 518: self = .hasStringValue
-    case 519: self = .hasSwiftPrefix
-    case 520: self = .hasSyntax
-    case 521: self = .hasTrailingComments
-    case 522: self = .hasType
-    case 523: self = .hasTypeName
-    case 524: self = .hasUnverifiedLazy
-    case 525: self = .hasUtf8Validation
-    case 526: self = .hasValue
-    case 527: self = .hasVerification
-    case 528: self = .hasWeak
-    case 529: self = .hour
-    case 530: self = .i
-    case 531: self = .idempotencyLevel
-    case 532: self = .identifierValue
-    case 533: self = .if
-    case 534: self = .ignoreUnknownExtensionFields
-    case 535: self = .ignoreUnknownFields
-    case 536: self = .index
-    case 537: self = .init_
-    case 538: self = .inout
-    case 539: self = .inputType
-    case 540: self = .insert
-    case 541: self = .int
-    case 542: self = .int32
-    case 543: self = .int32Value
-    case 544: self = .int64
-    case 545: self = .int64Value
-    case 546: self = .int8
-    case 547: self = .integerLiteral
-    case 548: self = .integerLiteralType
-    case 549: self = .intern
-    case 550: self = .internal
-    case 551: self = .internalState
-    case 552: self = .intersect
-    case 553: self = .into
-    case 554: self = .ints
-    case 555: self = .isA
-    case 556: self = .isEqual
-    case 557: self = .isEqualTo
-    case 558: self = .isExtension
-    case 559: self = .isInitialized
-    case 560: self = .isNegative
-    case 561: self = .isPathValid
-    case 562: self = .isValid
-    case 563: self = .itemTagsEncodedSize
-    case 564: self = .iterator
-    case 565: self = .javaGenerateEqualsAndHash
-    case 566: self = .javaGenericServices
-    case 567: self = .javaMultipleFiles
-    case 568: self = .javaOuterClassname
-    case 569: self = .javaPackage
-    case 570: self = .javaStringCheckUtf8
-    case 571: self = .jsondecoder
-    case 572: self = .jsondecodingError
-    case 573: self = .jsondecodingOptions
-    case 574: self = .jsonEncoder
-    case 575: self = .jsonencodingError
-    case 576: self = .jsonencodingOptions
-    case 577: self = .jsonencodingVisitor
-    case 578: self = .jsonFormat
-    case 579: self = .jsonmapEncodingVisitor
-    case 580: self = .jsonName
-    case 581: self = .jsonPath
-    case 582: self = .jsonPaths
-    case 583: self = .jsonscanner
-    case 584: self = .jsonString
-    case 585: self = .jsonText
-    case 586: self = .jsonUtf8Bytes
-    case 587: self = .jsonUtf8Data
-    case 588: self = .jstype
-    case 589: self = .k
-    case 590: self = .kChunkSize
-    case 591: self = .key
-    case 592: self = .keyField
-    case 593: self = .keyFieldOpt
-    case 594: self = .keyType
-    case 595: self = .kind
-    case 596: self = .l
-    case 597: self = .label
-    case 598: self = .lazy
-    case 599: self = .leadingComments
-    case 600: self = .leadingDetachedComments
-    case 601: self = .length
-    case 602: self = .lessThan
-    case 603: self = .let
-    case 604: self = .lhs
-    case 605: self = .line
-    case 606: self = .list
-    case 607: self = .listOfMessages
-    case 608: self = .listValue
-    case 609: self = .littleEndian
-    case 610: self = .load
-    case 611: self = .localHasher
-    case 612: self = .location
-    case 613: self = .m
-    case 614: self = .major
-    case 615: self = .makeAsyncIterator
-    case 616: self = .makeIterator
-    case 617: self = .malformedLength
-    case 618: self = .mapEntry
-    case 619: self = .mapKeyType
-    case 620: self = .mapToMessages
-    case 621: self = .mapValueType
-    case 622: self = .mapVisitor
-    case 623: self = .mask
-    case 624: self = .maximumEdition
-    case 625: self = .mdayStart
-    case 626: self = .merge
-    case 627: self = .mergeOptions
-    case 628: self = .message
-    case 629: self = .messageDepthLimit
-    case 630: self = .messageEncoding
-    case 631: self = .messageExtension
-    case 632: self = .messageImplementationBase
-    case 633: self = .messageOptions
-    case 634: self = .messageSet
-    case 635: self = .messageSetWireFormat
-    case 636: self = .messageSize
-    case 637: self = .messageType
-    case 638: self = .method
-    case 639: self = .methodDescriptorProto
-    case 640: self = .methodOptions
-    case 641: self = .methods
-    case 642: self = .min
-    case 643: self = .minimumEdition
-    case 644: self = .minor
-    case 645: self = .mixin
-    case 646: self = .mixins
-    case 647: self = .modify
-    case 648: self = .month
-    case 649: self = .msgExtension
-    case 650: self = .mutating
-    case 651: self = .n
-    case 652: self = .name
-    case 653: self = .nameDescription
-    case 654: self = .nameMap
-    case 655: self = .namePart
-    case 656: self = .names
-    case 657: self = .nanos
-    case 658: self = .negativeIntValue
-    case 659: self = .nestedType
-    case 660: self = .newExtensible
-    case 661: self = .newL
-    case 662: self = .newList
-    case 663: self = .newMessage
-    case 664: self = .newValue
-    case 665: self = .next
-    case 666: self = .nextByte
-    case 667: self = .nextFieldNumber
-    case 668: self = .nextVarInt
-    case 669: self = .nil
-    case 670: self = .nilLiteral
-    case 671: self = .noBytesAvailable
-    case 672: self = .noStandardDescriptorAccessor
-    case 673: self = .nullValue
-    case 674: self = .number
-    case 675: self = .numberValue
-    case 676: self = .objcClassPrefix
-    case 677: self = .of
-    case 678: self = .oneofDecl
-    case 679: self = .oneofDescriptorProto
-    case 680: self = .oneofIndex
-    case 681: self = .oneofOptions
-    case 682: self = .oneofs
-    case 683: self = .oneOfKind
-    case 684: self = .optimizeFor
-    case 685: self = .optimizeMode
-    case 686: self = .option
-    case 687: self = .optionalEnumExtensionField
-    case 688: self = .optionalExtensionField
-    case 689: self = .optionalGroupExtensionField
-    case 690: self = .optionalMessageExtensionField
-    case 691: self = .optionRetention
-    case 692: self = .options
-    case 693: self = .optionTargetType
-    case 694: self = .other
-    case 695: self = .others
-    case 696: self = .out
-    case 697: self = .outputType
-    case 698: self = .overridableFeatures
-    case 699: self = .p
-    case 700: self = .package
-    case 701: self = .packed
-    case 702: self = .packedEnumExtensionField
-    case 703: self = .packedExtensionField
-    case 704: self = .padding
-    case 705: self = .parent
-    case 706: self = .parse
-    case 707: self = .partial
-    case 708: self = .path
-    case 709: self = .pathDecoder
-    case 710: self = .pathDecodingError
-    case 711: self = .paths
-    case 712: self = .pathVisitor
-    case 713: self = .payload
-    case 714: self = .payloadSize
-    case 715: self = .phpClassPrefix
-    case 716: self = .phpMetadataNamespace
-    case 717: self = .phpNamespace
-    case 718: self = .pos
-    case 719: self = .positiveIntValue
-    case 720: self = .prefix
-    case 721: self = .preserveProtoFieldNames
-    case 722: self = .preTraverse
-    case 723: self = .prevPath
-    case 724: self = .printUnknownFields
-    case 725: self = .proto2
-    case 726: self = .proto3DefaultValue
-    case 727: self = .proto3Optional
-    case 728: self = .protobufApiversionCheck
-    case 729: self = .protobufApiversion2
-    case 730: self = .protobufBool
-    case 731: self = .protobufBytes
-    case 732: self = .protobufDouble
-    case 733: self = .protobufEnumMap
-    case 734: self = .protobufExtension
-    case 735: self = .protobufFixed32
-    case 736: self = .protobufFixed64
-    case 737: self = .protobufFloat
-    case 738: self = .protobufInt32
-    case 739: self = .protobufInt64
-    case 740: self = .protobufMap
-    case 741: self = .protobufMessageMap
-    case 742: self = .protobufSfixed32
-    case 743: self = .protobufSfixed64
-    case 744: self = .protobufSint32
-    case 745: self = .protobufSint64
-    case 746: self = .protobufString
-    case 747: self = .protobufUint32
-    case 748: self = .protobufUint64
-    case 749: self = .protobufExtensionFieldValues
-    case 750: self = .protobufFieldNumber
-    case 751: self = .protobufGeneratedIsEqualTo
-    case 752: self = .protobufNameMap
-    case 753: self = .protobufNewField
-    case 754: self = .protobufPackage
-    case 755: self = .protocol
-    case 756: self = .protoFieldName
-    case 757: self = .protoMessageName
-    case 758: self = .protoNameProviding
-    case 759: self = .protoPaths
-    case 760: self = .public
-    case 761: self = .publicDependency
-    case 762: self = .putBoolValue
-    case 763: self = .putBytesValue
-    case 764: self = .putDoubleValue
-    case 765: self = .putEnumValue
-    case 766: self = .putFixedUint32
-    case 767: self = .putFixedUint64
-    case 768: self = .putFloatValue
-    case 769: self = .putInt64
-    case 770: self = .putStringValue
-    case 771: self = .putUint64
-    case 772: self = .putUint64Hex
-    case 773: self = .putVarInt
-    case 774: self = .putZigZagVarInt
-    case 775: self = .pyGenericServices
-    case 776: self = .r
-    case 777: self = .rawChars
-    case 778: self = .rawRepresentable
-    case 779: self = .rawValue_
-    case 780: self = .read4HexDigits
-    case 781: self = .readBytes
-    case 782: self = .register
-    case 783: self = .removingAllFieldsOf
-    case 784: self = .repeated
-    case 785: self = .repeatedEnumExtensionField
-    case 786: self = .repeatedExtensionField
-    case 787: self = .repeatedFieldEncoding
-    case 788: self = .repeatedGroupExtensionField
-    case 789: self = .repeatedMessageExtensionField
-    case 790: self = .repeating
-    case 791: self = .replaceRepeatedFields
-    case 792: self = .requestStreaming
-    case 793: self = .requestTypeURL
-    case 794: self = .requiredSize
-    case 795: self = .responseStreaming
-    case 796: self = .responseTypeURL
-    case 797: self = .result
-    case 798: self = .retention
-    case 799: self = .rethrows
-    case 800: self = .return
-    case 801: self = .returnType
-    case 802: self = .revision
-    case 803: self = .rhs
-    case 804: self = .root
-    case 805: self = .rubyPackage
-    case 806: self = .s
-    case 807: self = .sawBackslash
-    case 808: self = .sawSection4Characters
-    case 809: self = .sawSection5Characters
-    case 810: self = .scan
-    case 811: self = .scanner
-    case 812: self = .seconds
-    case 813: self = .self_
-    case 814: self = .semantic
-    case 815: self = .sendable
-    case 816: self = .separator
-    case 817: self = .serialize
-    case 818: self = .serializedBytes
-    case 819: self = .serializedData
-    case 820: self = .serializedSize
-    case 821: self = .serverStreaming
-    case 822: self = .service
-    case 823: self = .serviceDescriptorProto
-    case 824: self = .serviceOptions
-    case 825: self = .set
-    case 826: self = .setExtensionValue
-    case 827: self = .shift
-    case 828: self = .simpleExtensionMap
-    case 829: self = .size
-    case 830: self = .sizer
-    case 831: self = .source
-    case 832: self = .sourceCodeInfo
-    case 833: self = .sourceContext
-    case 834: self = .sourceEncoding
-    case 835: self = .sourceFile
-    case 836: self = .sourceLocation
-    case 837: self = .span
-    case 838: self = .split
-    case 839: self = .start
-    case 840: self = .startArray
-    case 841: self = .startArrayObject
-    case 842: self = .startField
-    case 843: self = .startIndex
-    case 844: self = .startMessageField
-    case 845: self = .startObject
-    case 846: self = .startRegularField
-    case 847: self = .state
-    case 848: self = .static
-    case 849: self = .staticString
-    case 850: self = .storage
-    case 851: self = .string
-    case 852: self = .stringLiteral
-    case 853: self = .stringLiteralType
-    case 854: self = .stringResult
-    case 855: self = .stringValue
-    case 856: self = .struct
-    case 857: self = .structValue
-    case 858: self = .subDecoder
-    case 859: self = .subscript
-    case 860: self = .subtract
-    case 861: self = .subVisitor
-    case 862: self = .swift
-    case 863: self = .swiftPrefix
-    case 864: self = .swiftProtobufContiguousBytes
-    case 865: self = .swiftProtobufError
-    case 866: self = .syntax
-    case 867: self = .t
-    case 868: self = .tag
-    case 869: self = .targets
-    case 870: self = .terminator
-    case 871: self = .testDecoder
-    case 872: self = .text
-    case 873: self = .textDecoder
-    case 874: self = .textFormatDecoder
-    case 875: self = .textFormatDecodingError
-    case 876: self = .textFormatDecodingOptions
-    case 877: self = .textFormatEncodingOptions
-    case 878: self = .textFormatEncodingVisitor
-    case 879: self = .textFormatString
-    case 880: self = .throwOrIgnore
-    case 881: self = .throws
-    case 882: self = .timeInterval
-    case 883: self = .timeIntervalSince1970
-    case 884: self = .timeIntervalSinceReferenceDate
-    case 885: self = .timestamp
-    case 886: self = .tmp
-    case 887: self = .tooLarge
-    case 888: self = .total
-    case 889: self = .totalArrayDepth
-    case 890: self = .totalSize
-    case 891: self = .trailingComments
-    case 892: self = .traverse
-    case 893: self = .trim
-    case 894: self = .true
-    case 895: self = .try
-    case 896: self = .type
-    case 897: self = .typealias
-    case 898: self = .typeEnum
-    case 899: self = .typeName
-    case 900: self = .typePrefix
-    case 901: self = .typeStart
-    case 902: self = .typeUnknown
-    case 903: self = .typeURL
-    case 904: self = .uint32
-    case 905: self = .uint32Value
-    case 906: self = .uint64
-    case 907: self = .uint64Value
-    case 908: self = .uint8
-    case 909: self = .unchecked
-    case 910: self = .unicodeScalarLiteral
-    case 911: self = .unicodeScalarLiteralType
-    case 912: self = .unicodeScalars
-    case 913: self = .unicodeScalarView
-    case 914: self = .uninterpretedOption
-    case 915: self = .union
-    case 916: self = .uniqueStorage
-    case 917: self = .unknown
-    case 918: self = .unknownFields
-    case 919: self = .unknownStorage
-    case 920: self = .unpackTo
-    case 921: self = .unsafeBufferPointer
-    case 922: self = .unsafeMutablePointer
-    case 923: self = .unsafeMutableRawBufferPointer
-    case 924: self = .unsafeRawBufferPointer
-    case 925: self = .unsafeRawPointer
-    case 926: self = .unverifiedLazy
-    case 927: self = .updatedOptions
-    case 928: self = .url
-    case 929: self = .useDeterministicOrdering
-    case 930: self = .utf8
-    case 931: self = .utf8Ptr
-    case 932: self = .utf8ToDouble
-    case 933: self = .utf8Validation
-    case 934: self = .utf8View
-    case 935: self = .v
-    case 936: self = .value
-    case 937: self = .valueField
-    case 938: self = .values
-    case 939: self = .valueType
-    case 940: self = .var
-    case 941: self = .verification
-    case 942: self = .verificationState
-    case 943: self = .version
-    case 944: self = .versionString
-    case 945: self = .visitExtensionFields
-    case 946: self = .visitExtensionFieldsAsMessageSet
-    case 947: self = .visitMapField
-    case 948: self = .visitor
-    case 949: self = .visitPacked
-    case 950: self = .visitPackedBoolField
-    case 951: self = .visitPackedDoubleField
-    case 952: self = .visitPackedEnumField
-    case 953: self = .visitPackedFixed32Field
-    case 954: self = .visitPackedFixed64Field
-    case 955: self = .visitPackedFloatField
-    case 956: self = .visitPackedInt32Field
-    case 957: self = .visitPackedInt64Field
-    case 958: self = .visitPackedSfixed32Field
-    case 959: self = .visitPackedSfixed64Field
-    case 960: self = .visitPackedSint32Field
-    case 961: self = .visitPackedSint64Field
-    case 962: self = .visitPackedUint32Field
-    case 963: self = .visitPackedUint64Field
-    case 964: self = .visitRepeated
-    case 965: self = .visitRepeatedBoolField
-    case 966: self = .visitRepeatedBytesField
-    case 967: self = .visitRepeatedDoubleField
-    case 968: self = .visitRepeatedEnumField
-    case 969: self = .visitRepeatedFixed32Field
-    case 970: self = .visitRepeatedFixed64Field
-    case 971: self = .visitRepeatedFloatField
-    case 972: self = .visitRepeatedGroupField
-    case 973: self = .visitRepeatedInt32Field
-    case 974: self = .visitRepeatedInt64Field
-    case 975: self = .visitRepeatedMessageField
-    case 976: self = .visitRepeatedSfixed32Field
-    case 977: self = .visitRepeatedSfixed64Field
-    case 978: self = .visitRepeatedSint32Field
-    case 979: self = .visitRepeatedSint64Field
-    case 980: self = .visitRepeatedStringField
-    case 981: self = .visitRepeatedUint32Field
-    case 982: self = .visitRepeatedUint64Field
-    case 983: self = .visitSingular
-    case 984: self = .visitSingularBoolField
-    case 985: self = .visitSingularBytesField
-    case 986: self = .visitSingularDoubleField
-    case 987: self = .visitSingularEnumField
-    case 988: self = .visitSingularFixed32Field
-    case 989: self = .visitSingularFixed64Field
-    case 990: self = .visitSingularFloatField
-    case 991: self = .visitSingularGroupField
-    case 992: self = .visitSingularInt32Field
-    case 993: self = .visitSingularInt64Field
-    case 994: self = .visitSingularMessageField
-    case 995: self = .visitSingularSfixed32Field
-    case 996: self = .visitSingularSfixed64Field
-    case 997: self = .visitSingularSint32Field
-    case 998: self = .visitSingularSint64Field
-    case 999: self = .visitSingularStringField
-    case 1000: self = .visitSingularUint32Field
-    case 1001: self = .visitSingularUint64Field
-    case 1002: self = .visitUnknown
-    case 1003: self = .wasDecoded
-    case 1004: self = .weak
-    case 1005: self = .weakDependency
-    case 1006: self = .where
-    case 1007: self = .wireFormat
-    case 1008: self = .with
-    case 1009: self = .withUnsafeBytes
-    case 1010: self = .withUnsafeMutableBytes
-    case 1011: self = .work
-    case 1012: self = .wrapped
-    case 1013: self = .wrappedType
-    case 1014: self = .wrappedValue
-    case 1015: self = .written
-    case 1016: self = .yday
+    case 97: self = .clearEnforceNamingStyle
+    case 98: self = .clearEnumType
+    case 99: self = .clearExtendee
+    case 100: self = .clearExtensionValue
+    case 101: self = .clearFeatures
+    case 102: self = .clearFeatureSupport
+    case 103: self = .clearFieldPresence
+    case 104: self = .clearFixedFeatures
+    case 105: self = .clearFullName
+    case 106: self = .clearGoPackage
+    case 107: self = .clearIdempotencyLevel
+    case 108: self = .clearIdentifierValue
+    case 109: self = .clearInputType
+    case 110: self = .clearIsExtension
+    case 111: self = .clearJavaGenerateEqualsAndHash
+    case 112: self = .clearJavaGenericServices
+    case 113: self = .clearJavaMultipleFiles
+    case 114: self = .clearJavaOuterClassname
+    case 115: self = .clearJavaPackage
+    case 116: self = .clearJavaStringCheckUtf8
+    case 117: self = .clearJsonFormat
+    case 118: self = .clearJsonName
+    case 119: self = .clearJstype
+    case 120: self = .clearLabel
+    case 121: self = .clearLazy
+    case 122: self = .clearLeadingComments
+    case 123: self = .clearMapEntry
+    case 124: self = .clearMaximumEdition
+    case 125: self = .clearMessageEncoding
+    case 126: self = .clearMessageSetWireFormat
+    case 127: self = .clearMinimumEdition
+    case 128: self = .clearName
+    case 129: self = .clearNamePart
+    case 130: self = .clearNegativeIntValue
+    case 131: self = .clearNoStandardDescriptorAccessor
+    case 132: self = .clearNumber
+    case 133: self = .clearObjcClassPrefix
+    case 134: self = .clearOneofIndex
+    case 135: self = .clearOptimizeFor
+    case 136: self = .clearOptions
+    case 137: self = .clearOutputType
+    case 138: self = .clearOverridableFeatures
+    case 139: self = .clearPackage
+    case 140: self = .clearPacked
+    case 141: self = .clearPhpClassPrefix
+    case 142: self = .clearPhpMetadataNamespace
+    case 143: self = .clearPhpNamespace
+    case 144: self = .clearPositiveIntValue
+    case 145: self = .clearProto3Optional
+    case 146: self = .clearPyGenericServices
+    case 147: self = .clearRepeated
+    case 148: self = .clearRepeatedFieldEncoding
+    case 149: self = .clearReserved
+    case 150: self = .clearRetention
+    case 151: self = .clearRubyPackage
+    case 152: self = .clearSemantic
+    case 153: self = .clearServerStreaming
+    case 154: self = .clearSourceCodeInfo
+    case 155: self = .clearSourceContext
+    case 156: self = .clearSourceFile
+    case 157: self = .clearStart
+    case 158: self = .clearStringValue
+    case 159: self = .clearSwiftPrefix
+    case 160: self = .clearSyntax
+    case 161: self = .clearTrailingComments
+    case 162: self = .clearType
+    case 163: self = .clearTypeName
+    case 164: self = .clearUnverifiedLazy
+    case 165: self = .clearUtf8Validation
+    case 166: self = .clearValue
+    case 167: self = .clearVerification
+    case 168: self = .clearWeak
+    case 169: self = .clientStreaming
+    case 170: self = .code
+    case 171: self = .codePoint
+    case 172: self = .codeUnits
+    case 173: self = .collection
+    case 174: self = .com
+    case 175: self = .comma
+    case 176: self = .consumedBytes
+    case 177: self = .contains
+    case 178: self = .contentsOf
+    case 179: self = .contiguousBytes
+    case 180: self = .copy
+    case 181: self = .count
+    case 182: self = .countVarintsInBuffer
+    case 183: self = .csharpNamespace
+    case 184: self = .ctype
+    case 185: self = .customCodable
+    case 186: self = .customDebugStringConvertible
+    case 187: self = .customStringConvertible
+    case 188: self = .d
+    case 189: self = .data
+    case 190: self = .dataResult
+    case 191: self = .date
+    case 192: self = .daySec
+    case 193: self = .daysSinceEpoch
+    case 194: self = .debugDescription_
+    case 195: self = .debugRedact
+    case 196: self = .declaration
+    case 197: self = .decoded
+    case 198: self = .decodedFromJsonnull
+    case 199: self = .decodeExtensionField
+    case 200: self = .decodeExtensionFieldsAsMessageSet
+    case 201: self = .decodeJson
+    case 202: self = .decodeMapField
+    case 203: self = .decodeMessage
+    case 204: self = .decoder
+    case 205: self = .decodeRepeated
+    case 206: self = .decodeRepeatedBoolField
+    case 207: self = .decodeRepeatedBytesField
+    case 208: self = .decodeRepeatedDoubleField
+    case 209: self = .decodeRepeatedEnumField
+    case 210: self = .decodeRepeatedFixed32Field
+    case 211: self = .decodeRepeatedFixed64Field
+    case 212: self = .decodeRepeatedFloatField
+    case 213: self = .decodeRepeatedGroupField
+    case 214: self = .decodeRepeatedInt32Field
+    case 215: self = .decodeRepeatedInt64Field
+    case 216: self = .decodeRepeatedMessageField
+    case 217: self = .decodeRepeatedSfixed32Field
+    case 218: self = .decodeRepeatedSfixed64Field
+    case 219: self = .decodeRepeatedSint32Field
+    case 220: self = .decodeRepeatedSint64Field
+    case 221: self = .decodeRepeatedStringField
+    case 222: self = .decodeRepeatedUint32Field
+    case 223: self = .decodeRepeatedUint64Field
+    case 224: self = .decodeSingular
+    case 225: self = .decodeSingularBoolField
+    case 226: self = .decodeSingularBytesField
+    case 227: self = .decodeSingularDoubleField
+    case 228: self = .decodeSingularEnumField
+    case 229: self = .decodeSingularFixed32Field
+    case 230: self = .decodeSingularFixed64Field
+    case 231: self = .decodeSingularFloatField
+    case 232: self = .decodeSingularGroupField
+    case 233: self = .decodeSingularInt32Field
+    case 234: self = .decodeSingularInt64Field
+    case 235: self = .decodeSingularMessageField
+    case 236: self = .decodeSingularSfixed32Field
+    case 237: self = .decodeSingularSfixed64Field
+    case 238: self = .decodeSingularSint32Field
+    case 239: self = .decodeSingularSint64Field
+    case 240: self = .decodeSingularStringField
+    case 241: self = .decodeSingularUint32Field
+    case 242: self = .decodeSingularUint64Field
+    case 243: self = .decodeTextFormat
+    case 244: self = .defaultAnyTypeUrlprefix
+    case 245: self = .defaults
+    case 246: self = .defaultValue
+    case 247: self = .dependency
+    case 248: self = .deprecated
+    case 249: self = .deprecatedLegacyJsonFieldConflicts
+    case 250: self = .deprecationWarning
+    case 251: self = .description_
+    case 252: self = .descriptorProto
+    case 253: self = .dictionary
+    case 254: self = .dictionaryLiteral
+    case 255: self = .digit
+    case 256: self = .digit0
+    case 257: self = .digit1
+    case 258: self = .digitCount
+    case 259: self = .digits
+    case 260: self = .digitValue
+    case 261: self = .discardableResult
+    case 262: self = .discardUnknownFields
+    case 263: self = .double
+    case 264: self = .doubleValue
+    case 265: self = .duration
+    case 266: self = .e
+    case 267: self = .edition
+    case 268: self = .editionDefault
+    case 269: self = .editionDefaults
+    case 270: self = .editionDeprecated
+    case 271: self = .editionIntroduced
+    case 272: self = .editionRemoved
+    case 273: self = .element
+    case 274: self = .elements
+    case 275: self = .else
+    case 276: self = .emitExtensionFieldName
+    case 277: self = .emitFieldName
+    case 278: self = .emitFieldNumber
+    case 279: self = .empty
+    case 280: self = .emptyAnyTypeURL
+    case 281: self = .emptyData
+    case 282: self = .encodeAsBytes
+    case 283: self = .encoded
+    case 284: self = .encodedJsonstring
+    case 285: self = .encodedSize
+    case 286: self = .encodeField
+    case 287: self = .encoder
+    case 288: self = .end
+    case 289: self = .endArray
+    case 290: self = .endMessageField
+    case 291: self = .endObject
+    case 292: self = .endRegularField
+    case 293: self = .enforceNamingStyle
+    case 294: self = .enum
+    case 295: self = .enumDescriptorProto
+    case 296: self = .enumOptions
+    case 297: self = .enumReservedRange
+    case 298: self = .enumType
+    case 299: self = .enumvalue
+    case 300: self = .enumValueDescriptorProto
+    case 301: self = .enumValueOptions
+    case 302: self = .equatable
+    case 303: self = .error
+    case 304: self = .expressibleByArrayLiteral
+    case 305: self = .expressibleByDictionaryLiteral
+    case 306: self = .ext
+    case 307: self = .extDecoder
+    case 308: self = .extendedGraphemeClusterLiteral
+    case 309: self = .extendedGraphemeClusterLiteralType
+    case 310: self = .extendee
+    case 311: self = .extensibleMessage
+    case 312: self = .extension
+    case 313: self = .extensionField
+    case 314: self = .extensionFieldNumber
+    case 315: self = .extensionFieldValueSet
+    case 316: self = .extensionMap
+    case 317: self = .extensionRange
+    case 318: self = .extensionRangeOptions
+    case 319: self = .extensions
+    case 320: self = .extras
+    case 321: self = .f
+    case 322: self = .false
+    case 323: self = .features
+    case 324: self = .featureSet
+    case 325: self = .featureSetDefaults
+    case 326: self = .featureSetEditionDefault
+    case 327: self = .featureSupport
+    case 328: self = .field
+    case 329: self = .fieldData
+    case 330: self = .fieldDescriptorProto
+    case 331: self = .fieldMask
+    case 332: self = .fieldMaskError
+    case 333: self = .fieldName
+    case 334: self = .fieldNameCount
+    case 335: self = .fieldNum
+    case 336: self = .fieldNumber
+    case 337: self = .fieldNumberForProto
+    case 338: self = .fieldOptions
+    case 339: self = .fieldPresence
+    case 340: self = .fields
+    case 341: self = .fieldSize
+    case 342: self = .fieldTag
+    case 343: self = .fieldType
+    case 344: self = .file
+    case 345: self = .fileDescriptorProto
+    case 346: self = .fileDescriptorSet
+    case 347: self = .fileName
+    case 348: self = .fileOptions
+    case 349: self = .filter
+    case 350: self = .final
+    case 351: self = .finiteOnly
+    case 352: self = .first
+    case 353: self = .firstItem
+    case 354: self = .fixedFeatures
+    case 355: self = .float
+    case 356: self = .floatLiteral
+    case 357: self = .floatLiteralType
+    case 358: self = .floatValue
+    case 359: self = .for
+    case 360: self = .forMessageName
+    case 361: self = .formUnion
+    case 362: self = .forReadingFrom
+    case 363: self = .forTypeURL
+    case 364: self = .forwardParser
+    case 365: self = .forWritingInto
+    case 366: self = .from
+    case 367: self = .fromAscii2
+    case 368: self = .fromAscii4
+    case 369: self = .fromByteOffset
+    case 370: self = .fromHexDigit
+    case 371: self = .fullName
+    case 372: self = .func
+    case 373: self = .function
+    case 374: self = .g
+    case 375: self = .generatedCodeInfo
+    case 376: self = .get
+    case 377: self = .getExtensionValue
+    case 378: self = .googleapis
+    case 379: self = .googleProtobufAny
+    case 380: self = .googleProtobufApi
+    case 381: self = .googleProtobufBoolValue
+    case 382: self = .googleProtobufBytesValue
+    case 383: self = .googleProtobufDescriptorProto
+    case 384: self = .googleProtobufDoubleValue
+    case 385: self = .googleProtobufDuration
+    case 386: self = .googleProtobufEdition
+    case 387: self = .googleProtobufEmpty
+    case 388: self = .googleProtobufEnum
+    case 389: self = .googleProtobufEnumDescriptorProto
+    case 390: self = .googleProtobufEnumOptions
+    case 391: self = .googleProtobufEnumValue
+    case 392: self = .googleProtobufEnumValueDescriptorProto
+    case 393: self = .googleProtobufEnumValueOptions
+    case 394: self = .googleProtobufExtensionRangeOptions
+    case 395: self = .googleProtobufFeatureSet
+    case 396: self = .googleProtobufFeatureSetDefaults
+    case 397: self = .googleProtobufField
+    case 398: self = .googleProtobufFieldDescriptorProto
+    case 399: self = .googleProtobufFieldMask
+    case 400: self = .googleProtobufFieldOptions
+    case 401: self = .googleProtobufFileDescriptorProto
+    case 402: self = .googleProtobufFileDescriptorSet
+    case 403: self = .googleProtobufFileOptions
+    case 404: self = .googleProtobufFloatValue
+    case 405: self = .googleProtobufGeneratedCodeInfo
+    case 406: self = .googleProtobufInt32Value
+    case 407: self = .googleProtobufInt64Value
+    case 408: self = .googleProtobufListValue
+    case 409: self = .googleProtobufMessageOptions
+    case 410: self = .googleProtobufMethod
+    case 411: self = .googleProtobufMethodDescriptorProto
+    case 412: self = .googleProtobufMethodOptions
+    case 413: self = .googleProtobufMixin
+    case 414: self = .googleProtobufNullValue
+    case 415: self = .googleProtobufOneofDescriptorProto
+    case 416: self = .googleProtobufOneofOptions
+    case 417: self = .googleProtobufOption
+    case 418: self = .googleProtobufServiceDescriptorProto
+    case 419: self = .googleProtobufServiceOptions
+    case 420: self = .googleProtobufSourceCodeInfo
+    case 421: self = .googleProtobufSourceContext
+    case 422: self = .googleProtobufStringValue
+    case 423: self = .googleProtobufStruct
+    case 424: self = .googleProtobufSyntax
+    case 425: self = .googleProtobufTimestamp
+    case 426: self = .googleProtobufType
+    case 427: self = .googleProtobufUint32Value
+    case 428: self = .googleProtobufUint64Value
+    case 429: self = .googleProtobufUninterpretedOption
+    case 430: self = .googleProtobufValue
+    case 431: self = .goPackage
+    case 432: self = .group
+    case 433: self = .groupFieldNumberStack
+    case 434: self = .groupSize
+    case 435: self = .guard
+    case 436: self = .hadOneofValue
+    case 437: self = .handleConflictingOneOf
+    case 438: self = .hasAggregateValue
+    case 439: self = .hasAllowAlias
+    case 440: self = .hasBegin
+    case 441: self = .hasCcEnableArenas
+    case 442: self = .hasCcGenericServices
+    case 443: self = .hasClientStreaming
+    case 444: self = .hasCsharpNamespace
+    case 445: self = .hasCtype
+    case 446: self = .hasDebugRedact
+    case 447: self = .hasDefaultValue
+    case 448: self = .hasDeprecated
+    case 449: self = .hasDeprecatedLegacyJsonFieldConflicts
+    case 450: self = .hasDeprecationWarning
+    case 451: self = .hasDoubleValue
+    case 452: self = .hasEdition
+    case 453: self = .hasEditionDeprecated
+    case 454: self = .hasEditionIntroduced
+    case 455: self = .hasEditionRemoved
+    case 456: self = .hasEnd
+    case 457: self = .hasEnforceNamingStyle
+    case 458: self = .hasEnumType
+    case 459: self = .hasExtendee
+    case 460: self = .hasExtensionValue
+    case 461: self = .hasFeatures
+    case 462: self = .hasFeatureSupport
+    case 463: self = .hasFieldPresence
+    case 464: self = .hasFixedFeatures
+    case 465: self = .hasFullName
+    case 466: self = .hasGoPackage
+    case 467: self = .hash
+    case 468: self = .hashable
+    case 469: self = .hasher
+    case 470: self = .hashVisitor
+    case 471: self = .hasIdempotencyLevel
+    case 472: self = .hasIdentifierValue
+    case 473: self = .hasInputType
+    case 474: self = .hasIsExtension
+    case 475: self = .hasJavaGenerateEqualsAndHash
+    case 476: self = .hasJavaGenericServices
+    case 477: self = .hasJavaMultipleFiles
+    case 478: self = .hasJavaOuterClassname
+    case 479: self = .hasJavaPackage
+    case 480: self = .hasJavaStringCheckUtf8
+    case 481: self = .hasJsonFormat
+    case 482: self = .hasJsonName
+    case 483: self = .hasJstype
+    case 484: self = .hasLabel
+    case 485: self = .hasLazy
+    case 486: self = .hasLeadingComments
+    case 487: self = .hasMapEntry
+    case 488: self = .hasMaximumEdition
+    case 489: self = .hasMessageEncoding
+    case 490: self = .hasMessageSetWireFormat
+    case 491: self = .hasMinimumEdition
+    case 492: self = .hasName
+    case 493: self = .hasNamePart
+    case 494: self = .hasNegativeIntValue
+    case 495: self = .hasNoStandardDescriptorAccessor
+    case 496: self = .hasNumber
+    case 497: self = .hasObjcClassPrefix
+    case 498: self = .hasOneofIndex
+    case 499: self = .hasOptimizeFor
+    case 500: self = .hasOptions
+    case 501: self = .hasOutputType
+    case 502: self = .hasOverridableFeatures
+    case 503: self = .hasPackage
+    case 504: self = .hasPacked
+    case 505: self = .hasPhpClassPrefix
+    case 506: self = .hasPhpMetadataNamespace
+    case 507: self = .hasPhpNamespace
+    case 508: self = .hasPositiveIntValue
+    case 509: self = .hasProto3Optional
+    case 510: self = .hasPyGenericServices
+    case 511: self = .hasRepeated
+    case 512: self = .hasRepeatedFieldEncoding
+    case 513: self = .hasReserved
+    case 514: self = .hasRetention
+    case 515: self = .hasRubyPackage
+    case 516: self = .hasSemantic
+    case 517: self = .hasServerStreaming
+    case 518: self = .hasSourceCodeInfo
+    case 519: self = .hasSourceContext
+    case 520: self = .hasSourceFile
+    case 521: self = .hasStart
+    case 522: self = .hasStringValue
+    case 523: self = .hasSwiftPrefix
+    case 524: self = .hasSyntax
+    case 525: self = .hasTrailingComments
+    case 526: self = .hasType
+    case 527: self = .hasTypeName
+    case 528: self = .hasUnverifiedLazy
+    case 529: self = .hasUtf8Validation
+    case 530: self = .hasValue
+    case 531: self = .hasVerification
+    case 532: self = .hasWeak
+    case 533: self = .hour
+    case 534: self = .i
+    case 535: self = .idempotencyLevel
+    case 536: self = .identifierValue
+    case 537: self = .if
+    case 538: self = .ignoreUnknownExtensionFields
+    case 539: self = .ignoreUnknownFields
+    case 540: self = .index
+    case 541: self = .init_
+    case 542: self = .inout
+    case 543: self = .inputType
+    case 544: self = .insert
+    case 545: self = .int
+    case 546: self = .int32
+    case 547: self = .int32Value
+    case 548: self = .int64
+    case 549: self = .int64Value
+    case 550: self = .int8
+    case 551: self = .integerLiteral
+    case 552: self = .integerLiteralType
+    case 553: self = .intern
+    case 554: self = .internal
+    case 555: self = .internalState
+    case 556: self = .intersect
+    case 557: self = .into
+    case 558: self = .ints
+    case 559: self = .invalidAnyTypeURL
+    case 560: self = .isA
+    case 561: self = .isEqual
+    case 562: self = .isEqualTo
+    case 563: self = .isExtension
+    case 564: self = .isInitialized
+    case 565: self = .isNegative
+    case 566: self = .isPathValid
+    case 567: self = .isValid
+    case 568: self = .itemTagsEncodedSize
+    case 569: self = .iterator
+    case 570: self = .javaGenerateEqualsAndHash
+    case 571: self = .javaGenericServices
+    case 572: self = .javaMultipleFiles
+    case 573: self = .javaOuterClassname
+    case 574: self = .javaPackage
+    case 575: self = .javaStringCheckUtf8
+    case 576: self = .jsondecoder
+    case 577: self = .jsondecoding
+    case 578: self = .jsondecodingError
+    case 579: self = .jsondecodingOptions
+    case 580: self = .jsonEncoder
+    case 581: self = .jsonencoding
+    case 582: self = .jsonencodingError
+    case 583: self = .jsonencodingOptions
+    case 584: self = .jsonencodingVisitor
+    case 585: self = .jsonFormat
+    case 586: self = .jsonmapEncodingVisitor
+    case 587: self = .jsonName
+    case 588: self = .jsonPath
+    case 589: self = .jsonPaths
+    case 590: self = .jsonscanner
+    case 591: self = .jsonString
+    case 592: self = .jsonText
+    case 593: self = .jsonUtf8Bytes
+    case 594: self = .jsonUtf8Data
+    case 595: self = .jstype
+    case 596: self = .k
+    case 597: self = .kChunkSize
+    case 598: self = .key
+    case 599: self = .keyField
+    case 600: self = .keyFieldOpt
+    case 601: self = .keyType
+    case 602: self = .kind
+    case 603: self = .l
+    case 604: self = .label
+    case 605: self = .lazy
+    case 606: self = .leadingComments
+    case 607: self = .leadingDetachedComments
+    case 608: self = .length
+    case 609: self = .lessThan
+    case 610: self = .let
+    case 611: self = .lhs
+    case 612: self = .line
+    case 613: self = .list
+    case 614: self = .listOfMessages
+    case 615: self = .listValue
+    case 616: self = .littleEndian
+    case 617: self = .load
+    case 618: self = .localHasher
+    case 619: self = .location
+    case 620: self = .m
+    case 621: self = .major
+    case 622: self = .makeAsyncIterator
+    case 623: self = .makeIterator
+    case 624: self = .malformedLength
+    case 625: self = .mapEntry
+    case 626: self = .mapKeyType
+    case 627: self = .mapToMessages
+    case 628: self = .mapValueType
+    case 629: self = .mapVisitor
+    case 630: self = .mask
+    case 631: self = .maximumEdition
+    case 632: self = .mdayStart
+    case 633: self = .merge
+    case 634: self = .mergeOptions
+    case 635: self = .message
+    case 636: self = .messageDepthLimit
+    case 637: self = .messageEncoding
+    case 638: self = .messageExtension
+    case 639: self = .messageImplementationBase
+    case 640: self = .messageOptions
+    case 641: self = .messageSet
+    case 642: self = .messageSetWireFormat
+    case 643: self = .messageSize
+    case 644: self = .messageType
+    case 645: self = .method
+    case 646: self = .methodDescriptorProto
+    case 647: self = .methodOptions
+    case 648: self = .methods
+    case 649: self = .min
+    case 650: self = .minimumEdition
+    case 651: self = .minor
+    case 652: self = .mixin
+    case 653: self = .mixins
+    case 654: self = .modify
+    case 655: self = .month
+    case 656: self = .msgExtension
+    case 657: self = .mutating
+    case 658: self = .n
+    case 659: self = .name
+    case 660: self = .nameDescription
+    case 661: self = .nameMap
+    case 662: self = .namePart
+    case 663: self = .names
+    case 664: self = .nanos
+    case 665: self = .negativeIntValue
+    case 666: self = .nestedType
+    case 667: self = .newExtensible
+    case 668: self = .newL
+    case 669: self = .newList
+    case 670: self = .newMessage
+    case 671: self = .newValue
+    case 672: self = .next
+    case 673: self = .nextByte
+    case 674: self = .nextFieldNumber
+    case 675: self = .nextVarInt
+    case 676: self = .nil
+    case 677: self = .nilLiteral
+    case 678: self = .noBytesAvailable
+    case 679: self = .noStandardDescriptorAccessor
+    case 680: self = .nullValue
+    case 681: self = .number
+    case 682: self = .numberValue
+    case 683: self = .objcClassPrefix
+    case 684: self = .of
+    case 685: self = .oneofDecl
+    case 686: self = .oneofDescriptorProto
+    case 687: self = .oneofIndex
+    case 688: self = .oneofOptions
+    case 689: self = .oneofs
+    case 690: self = .oneOfKind
+    case 691: self = .optimizeFor
+    case 692: self = .optimizeMode
+    case 693: self = .option
+    case 694: self = .optionalEnumExtensionField
+    case 695: self = .optionalExtensionField
+    case 696: self = .optionalGroupExtensionField
+    case 697: self = .optionalMessageExtensionField
+    case 698: self = .optionRetention
+    case 699: self = .options
+    case 700: self = .optionTargetType
+    case 701: self = .other
+    case 702: self = .others
+    case 703: self = .out
+    case 704: self = .outputType
+    case 705: self = .overridableFeatures
+    case 706: self = .p
+    case 707: self = .package
+    case 708: self = .packed
+    case 709: self = .packedEnumExtensionField
+    case 710: self = .packedExtensionField
+    case 711: self = .padding
+    case 712: self = .parent
+    case 713: self = .parse
+    case 714: self = .partial
+    case 715: self = .path
+    case 716: self = .pathDecoder
+    case 717: self = .pathDecodingError
+    case 718: self = .paths
+    case 719: self = .pathVisitor
+    case 720: self = .payload
+    case 721: self = .payloadSize
+    case 722: self = .phpClassPrefix
+    case 723: self = .phpMetadataNamespace
+    case 724: self = .phpNamespace
+    case 725: self = .pos
+    case 726: self = .positiveIntValue
+    case 727: self = .prefix
+    case 728: self = .preserveProtoFieldNames
+    case 729: self = .preTraverse
+    case 730: self = .prevPath
+    case 731: self = .printUnknownFields
+    case 732: self = .proto2
+    case 733: self = .proto3DefaultValue
+    case 734: self = .proto3Optional
+    case 735: self = .protobufApiversionCheck
+    case 736: self = .protobufApiversion2
+    case 737: self = .protobufBool
+    case 738: self = .protobufBytes
+    case 739: self = .protobufDouble
+    case 740: self = .protobufEnumMap
+    case 741: self = .protobufExtension
+    case 742: self = .protobufFixed32
+    case 743: self = .protobufFixed64
+    case 744: self = .protobufFloat
+    case 745: self = .protobufInt32
+    case 746: self = .protobufInt64
+    case 747: self = .protobufMap
+    case 748: self = .protobufMessageMap
+    case 749: self = .protobufSfixed32
+    case 750: self = .protobufSfixed64
+    case 751: self = .protobufSint32
+    case 752: self = .protobufSint64
+    case 753: self = .protobufString
+    case 754: self = .protobufUint32
+    case 755: self = .protobufUint64
+    case 756: self = .protobufExtensionFieldValues
+    case 757: self = .protobufFieldNumber
+    case 758: self = .protobufGeneratedIsEqualTo
+    case 759: self = .protobufNameMap
+    case 760: self = .protobufNewField
+    case 761: self = .protobufPackage
+    case 762: self = .protocol
+    case 763: self = .protoFieldName
+    case 764: self = .protoMessageName
+    case 765: self = .protoNameProviding
+    case 766: self = .protoPaths
+    case 767: self = .public
+    case 768: self = .publicDependency
+    case 769: self = .putBoolValue
+    case 770: self = .putBytesValue
+    case 771: self = .putDoubleValue
+    case 772: self = .putEnumValue
+    case 773: self = .putFixedUint32
+    case 774: self = .putFixedUint64
+    case 775: self = .putFloatValue
+    case 776: self = .putInt64
+    case 777: self = .putStringValue
+    case 778: self = .putUint64
+    case 779: self = .putUint64Hex
+    case 780: self = .putVarInt
+    case 781: self = .putZigZagVarInt
+    case 782: self = .pyGenericServices
+    case 783: self = .r
+    case 784: self = .rawChars
+    case 785: self = .rawRepresentable
+    case 786: self = .rawValue_
+    case 787: self = .read4HexDigits
+    case 788: self = .readBytes
+    case 789: self = .register
+    case 790: self = .removingAllFieldsOf
+    case 791: self = .repeated
+    case 792: self = .repeatedEnumExtensionField
+    case 793: self = .repeatedExtensionField
+    case 794: self = .repeatedFieldEncoding
+    case 795: self = .repeatedGroupExtensionField
+    case 796: self = .repeatedMessageExtensionField
+    case 797: self = .repeating
+    case 798: self = .replaceRepeatedFields
+    case 799: self = .requestStreaming
+    case 800: self = .requestTypeURL
+    case 801: self = .requiredSize
+    case 802: self = .responseStreaming
+    case 803: self = .responseTypeURL
+    case 804: self = .result
+    case 805: self = .retention
+    case 806: self = .rethrows
+    case 807: self = .return
+    case 808: self = .returnType
+    case 809: self = .revision
+    case 810: self = .rhs
+    case 811: self = .root
+    case 812: self = .rubyPackage
+    case 813: self = .s
+    case 814: self = .sawBackslash
+    case 815: self = .sawSection4Characters
+    case 816: self = .sawSection5Characters
+    case 817: self = .scan
+    case 818: self = .scanner
+    case 819: self = .seconds
+    case 820: self = .self_
+    case 821: self = .semantic
+    case 822: self = .sendable
+    case 823: self = .separator
+    case 824: self = .serialize
+    case 825: self = .serializedBytes
+    case 826: self = .serializedData
+    case 827: self = .serializedSize
+    case 828: self = .serverStreaming
+    case 829: self = .service
+    case 830: self = .serviceDescriptorProto
+    case 831: self = .serviceOptions
+    case 832: self = .set
+    case 833: self = .setExtensionValue
+    case 834: self = .shift
+    case 835: self = .simpleExtensionMap
+    case 836: self = .size
+    case 837: self = .sizer
+    case 838: self = .source
+    case 839: self = .sourceCodeInfo
+    case 840: self = .sourceContext
+    case 841: self = .sourceEncoding
+    case 842: self = .sourceFile
+    case 843: self = .sourceLocation
+    case 844: self = .span
+    case 845: self = .split
+    case 846: self = .start
+    case 847: self = .startArray
+    case 848: self = .startArrayObject
+    case 849: self = .startField
+    case 850: self = .startIndex
+    case 851: self = .startMessageField
+    case 852: self = .startObject
+    case 853: self = .startRegularField
+    case 854: self = .state
+    case 855: self = .static
+    case 856: self = .staticString
+    case 857: self = .storage
+    case 858: self = .string
+    case 859: self = .stringLiteral
+    case 860: self = .stringLiteralType
+    case 861: self = .stringResult
+    case 862: self = .stringValue
+    case 863: self = .struct
+    case 864: self = .structValue
+    case 865: self = .subDecoder
+    case 866: self = .subscript
+    case 867: self = .subtract
+    case 868: self = .subVisitor
+    case 869: self = .swift
+    case 870: self = .swiftPrefix
+    case 871: self = .swiftProtobufContiguousBytes
+    case 872: self = .swiftProtobufError
+    case 873: self = .syntax
+    case 874: self = .t
+    case 875: self = .tag
+    case 876: self = .targets
+    case 877: self = .terminator
+    case 878: self = .testDecoder
+    case 879: self = .text
+    case 880: self = .textDecoder
+    case 881: self = .textFormatDecoder
+    case 882: self = .textFormatDecodingError
+    case 883: self = .textFormatDecodingOptions
+    case 884: self = .textFormatEncodingOptions
+    case 885: self = .textFormatEncodingVisitor
+    case 886: self = .textFormatString
+    case 887: self = .throwOrIgnore
+    case 888: self = .throws
+    case 889: self = .timeInterval
+    case 890: self = .timeIntervalSince1970
+    case 891: self = .timeIntervalSinceReferenceDate
+    case 892: self = .timestamp
+    case 893: self = .tmp
+    case 894: self = .tooLarge
+    case 895: self = .total
+    case 896: self = .totalArrayDepth
+    case 897: self = .totalSize
+    case 898: self = .trailingComments
+    case 899: self = .traverse
+    case 900: self = .trim
+    case 901: self = .true
+    case 902: self = .try
+    case 903: self = .type
+    case 904: self = .typealias
+    case 905: self = .typeEnum
+    case 906: self = .typeName
+    case 907: self = .typePrefix
+    case 908: self = .typeStart
+    case 909: self = .typeUnknown
+    case 910: self = .typeURL
+    case 911: self = .uint32
+    case 912: self = .uint32Value
+    case 913: self = .uint64
+    case 914: self = .uint64Value
+    case 915: self = .uint8
+    case 916: self = .unchecked
+    case 917: self = .unicodeScalarLiteral
+    case 918: self = .unicodeScalarLiteralType
+    case 919: self = .unicodeScalars
+    case 920: self = .unicodeScalarView
+    case 921: self = .uninterpretedOption
+    case 922: self = .union
+    case 923: self = .uniqueStorage
+    case 924: self = .unknown
+    case 925: self = .unknownFields
+    case 926: self = .unknownStorage
+    case 927: self = .unpackTo
+    case 928: self = .unsafeBufferPointer
+    case 929: self = .unsafeMutablePointer
+    case 930: self = .unsafeMutableRawBufferPointer
+    case 931: self = .unsafeRawBufferPointer
+    case 932: self = .unsafeRawPointer
+    case 933: self = .unverifiedLazy
+    case 934: self = .updatedOptions
+    case 935: self = .url
+    case 936: self = .useDeterministicOrdering
+    case 937: self = .utf8
+    case 938: self = .utf8Ptr
+    case 939: self = .utf8ToDouble
+    case 940: self = .utf8Validation
+    case 941: self = .utf8View
+    case 942: self = .v
+    case 943: self = .value
+    case 944: self = .valueField
+    case 945: self = .values
+    case 946: self = .valueType
+    case 947: self = .var
+    case 948: self = .verification
+    case 949: self = .verificationState
+    case 950: self = .version
+    case 951: self = .versionString
+    case 952: self = .visitExtensionFields
+    case 953: self = .visitExtensionFieldsAsMessageSet
+    case 954: self = .visitMapField
+    case 955: self = .visitor
+    case 956: self = .visitPacked
+    case 957: self = .visitPackedBoolField
+    case 958: self = .visitPackedDoubleField
+    case 959: self = .visitPackedEnumField
+    case 960: self = .visitPackedFixed32Field
+    case 961: self = .visitPackedFixed64Field
+    case 962: self = .visitPackedFloatField
+    case 963: self = .visitPackedInt32Field
+    case 964: self = .visitPackedInt64Field
+    case 965: self = .visitPackedSfixed32Field
+    case 966: self = .visitPackedSfixed64Field
+    case 967: self = .visitPackedSint32Field
+    case 968: self = .visitPackedSint64Field
+    case 969: self = .visitPackedUint32Field
+    case 970: self = .visitPackedUint64Field
+    case 971: self = .visitRepeated
+    case 972: self = .visitRepeatedBoolField
+    case 973: self = .visitRepeatedBytesField
+    case 974: self = .visitRepeatedDoubleField
+    case 975: self = .visitRepeatedEnumField
+    case 976: self = .visitRepeatedFixed32Field
+    case 977: self = .visitRepeatedFixed64Field
+    case 978: self = .visitRepeatedFloatField
+    case 979: self = .visitRepeatedGroupField
+    case 980: self = .visitRepeatedInt32Field
+    case 981: self = .visitRepeatedInt64Field
+    case 982: self = .visitRepeatedMessageField
+    case 983: self = .visitRepeatedSfixed32Field
+    case 984: self = .visitRepeatedSfixed64Field
+    case 985: self = .visitRepeatedSint32Field
+    case 986: self = .visitRepeatedSint64Field
+    case 987: self = .visitRepeatedStringField
+    case 988: self = .visitRepeatedUint32Field
+    case 989: self = .visitRepeatedUint64Field
+    case 990: self = .visitSingular
+    case 991: self = .visitSingularBoolField
+    case 992: self = .visitSingularBytesField
+    case 993: self = .visitSingularDoubleField
+    case 994: self = .visitSingularEnumField
+    case 995: self = .visitSingularFixed32Field
+    case 996: self = .visitSingularFixed64Field
+    case 997: self = .visitSingularFloatField
+    case 998: self = .visitSingularGroupField
+    case 999: self = .visitSingularInt32Field
+    case 1000: self = .visitSingularInt64Field
+    case 1001: self = .visitSingularMessageField
+    case 1002: self = .visitSingularSfixed32Field
+    case 1003: self = .visitSingularSfixed64Field
+    case 1004: self = .visitSingularSint32Field
+    case 1005: self = .visitSingularSint64Field
+    case 1006: self = .visitSingularStringField
+    case 1007: self = .visitSingularUint32Field
+    case 1008: self = .visitSingularUint64Field
+    case 1009: self = .visitUnknown
+    case 1010: self = .wasDecoded
+    case 1011: self = .weak
+    case 1012: self = .weakDependency
+    case 1013: self = .where
+    case 1014: self = .wireFormat
+    case 1015: self = .with
+    case 1016: self = .withUnsafeBytes
+    case 1017: self = .withUnsafeMutableBytes
+    case 1018: self = .work
+    case 1019: self = .wrapped
+    case 1020: self = .wrappedType
+    case 1021: self = .wrappedValue
+    case 1022: self = .written
+    case 1023: self = .yday
     default: self = .UNRECOGNIZED(rawValue)
     }
   }
@@ -2171,932 +2185,939 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .clearEditionIntroduced: return 94
     case .clearEditionRemoved: return 95
     case .clearEnd: return 96
-    case .clearEnumType: return 97
-    case .clearExtendee: return 98
-    case .clearExtensionValue: return 99
-    case .clearFeatures: return 100
-    case .clearFeatureSupport: return 101
-    case .clearFieldPresence: return 102
-    case .clearFixedFeatures: return 103
-    case .clearFullName: return 104
-    case .clearGoPackage: return 105
-    case .clearIdempotencyLevel: return 106
-    case .clearIdentifierValue: return 107
-    case .clearInputType: return 108
-    case .clearIsExtension: return 109
-    case .clearJavaGenerateEqualsAndHash: return 110
-    case .clearJavaGenericServices: return 111
-    case .clearJavaMultipleFiles: return 112
-    case .clearJavaOuterClassname: return 113
-    case .clearJavaPackage: return 114
-    case .clearJavaStringCheckUtf8: return 115
-    case .clearJsonFormat: return 116
-    case .clearJsonName: return 117
-    case .clearJstype: return 118
-    case .clearLabel: return 119
-    case .clearLazy: return 120
-    case .clearLeadingComments: return 121
-    case .clearMapEntry: return 122
-    case .clearMaximumEdition: return 123
-    case .clearMessageEncoding: return 124
-    case .clearMessageSetWireFormat: return 125
-    case .clearMinimumEdition: return 126
-    case .clearName: return 127
-    case .clearNamePart: return 128
-    case .clearNegativeIntValue: return 129
-    case .clearNoStandardDescriptorAccessor: return 130
-    case .clearNumber: return 131
-    case .clearObjcClassPrefix: return 132
-    case .clearOneofIndex: return 133
-    case .clearOptimizeFor: return 134
-    case .clearOptions: return 135
-    case .clearOutputType: return 136
-    case .clearOverridableFeatures: return 137
-    case .clearPackage: return 138
-    case .clearPacked: return 139
-    case .clearPhpClassPrefix: return 140
-    case .clearPhpMetadataNamespace: return 141
-    case .clearPhpNamespace: return 142
-    case .clearPositiveIntValue: return 143
-    case .clearProto3Optional: return 144
-    case .clearPyGenericServices: return 145
-    case .clearRepeated: return 146
-    case .clearRepeatedFieldEncoding: return 147
-    case .clearReserved: return 148
-    case .clearRetention: return 149
-    case .clearRubyPackage: return 150
-    case .clearSemantic: return 151
-    case .clearServerStreaming: return 152
-    case .clearSourceCodeInfo: return 153
-    case .clearSourceContext: return 154
-    case .clearSourceFile: return 155
-    case .clearStart: return 156
-    case .clearStringValue: return 157
-    case .clearSwiftPrefix: return 158
-    case .clearSyntax: return 159
-    case .clearTrailingComments: return 160
-    case .clearType: return 161
-    case .clearTypeName: return 162
-    case .clearUnverifiedLazy: return 163
-    case .clearUtf8Validation: return 164
-    case .clearValue: return 165
-    case .clearVerification: return 166
-    case .clearWeak: return 167
-    case .clientStreaming: return 168
-    case .code: return 169
-    case .codePoint: return 170
-    case .codeUnits: return 171
-    case .collection: return 172
-    case .com: return 173
-    case .comma: return 174
-    case .consumedBytes: return 175
-    case .contains: return 176
-    case .contentsOf: return 177
-    case .contiguousBytes: return 178
-    case .copy: return 179
-    case .count: return 180
-    case .countVarintsInBuffer: return 181
-    case .csharpNamespace: return 182
-    case .ctype: return 183
-    case .customCodable: return 184
-    case .customDebugStringConvertible: return 185
-    case .customStringConvertible: return 186
-    case .d: return 187
-    case .data: return 188
-    case .dataResult: return 189
-    case .date: return 190
-    case .daySec: return 191
-    case .daysSinceEpoch: return 192
-    case .debugDescription_: return 193
-    case .debugRedact: return 194
-    case .declaration: return 195
-    case .decoded: return 196
-    case .decodedFromJsonnull: return 197
-    case .decodeExtensionField: return 198
-    case .decodeExtensionFieldsAsMessageSet: return 199
-    case .decodeJson: return 200
-    case .decodeMapField: return 201
-    case .decodeMessage: return 202
-    case .decoder: return 203
-    case .decodeRepeated: return 204
-    case .decodeRepeatedBoolField: return 205
-    case .decodeRepeatedBytesField: return 206
-    case .decodeRepeatedDoubleField: return 207
-    case .decodeRepeatedEnumField: return 208
-    case .decodeRepeatedFixed32Field: return 209
-    case .decodeRepeatedFixed64Field: return 210
-    case .decodeRepeatedFloatField: return 211
-    case .decodeRepeatedGroupField: return 212
-    case .decodeRepeatedInt32Field: return 213
-    case .decodeRepeatedInt64Field: return 214
-    case .decodeRepeatedMessageField: return 215
-    case .decodeRepeatedSfixed32Field: return 216
-    case .decodeRepeatedSfixed64Field: return 217
-    case .decodeRepeatedSint32Field: return 218
-    case .decodeRepeatedSint64Field: return 219
-    case .decodeRepeatedStringField: return 220
-    case .decodeRepeatedUint32Field: return 221
-    case .decodeRepeatedUint64Field: return 222
-    case .decodeSingular: return 223
-    case .decodeSingularBoolField: return 224
-    case .decodeSingularBytesField: return 225
-    case .decodeSingularDoubleField: return 226
-    case .decodeSingularEnumField: return 227
-    case .decodeSingularFixed32Field: return 228
-    case .decodeSingularFixed64Field: return 229
-    case .decodeSingularFloatField: return 230
-    case .decodeSingularGroupField: return 231
-    case .decodeSingularInt32Field: return 232
-    case .decodeSingularInt64Field: return 233
-    case .decodeSingularMessageField: return 234
-    case .decodeSingularSfixed32Field: return 235
-    case .decodeSingularSfixed64Field: return 236
-    case .decodeSingularSint32Field: return 237
-    case .decodeSingularSint64Field: return 238
-    case .decodeSingularStringField: return 239
-    case .decodeSingularUint32Field: return 240
-    case .decodeSingularUint64Field: return 241
-    case .decodeTextFormat: return 242
-    case .defaultAnyTypeUrlprefix: return 243
-    case .defaults: return 244
-    case .defaultValue: return 245
-    case .dependency: return 246
-    case .deprecated: return 247
-    case .deprecatedLegacyJsonFieldConflicts: return 248
-    case .deprecationWarning: return 249
-    case .description_: return 250
-    case .descriptorProto: return 251
-    case .dictionary: return 252
-    case .dictionaryLiteral: return 253
-    case .digit: return 254
-    case .digit0: return 255
-    case .digit1: return 256
-    case .digitCount: return 257
-    case .digits: return 258
-    case .digitValue: return 259
-    case .discardableResult: return 260
-    case .discardUnknownFields: return 261
-    case .double: return 262
-    case .doubleValue: return 263
-    case .duration: return 264
-    case .e: return 265
-    case .edition: return 266
-    case .editionDefault: return 267
-    case .editionDefaults: return 268
-    case .editionDeprecated: return 269
-    case .editionIntroduced: return 270
-    case .editionRemoved: return 271
-    case .element: return 272
-    case .elements: return 273
-    case .else: return 274
-    case .emitExtensionFieldName: return 275
-    case .emitFieldName: return 276
-    case .emitFieldNumber: return 277
-    case .empty: return 278
-    case .emptyData: return 279
-    case .encodeAsBytes: return 280
-    case .encoded: return 281
-    case .encodedJsonstring: return 282
-    case .encodedSize: return 283
-    case .encodeField: return 284
-    case .encoder: return 285
-    case .end: return 286
-    case .endArray: return 287
-    case .endMessageField: return 288
-    case .endObject: return 289
-    case .endRegularField: return 290
-    case .enum: return 291
-    case .enumDescriptorProto: return 292
-    case .enumOptions: return 293
-    case .enumReservedRange: return 294
-    case .enumType: return 295
-    case .enumvalue: return 296
-    case .enumValueDescriptorProto: return 297
-    case .enumValueOptions: return 298
-    case .equatable: return 299
-    case .error: return 300
-    case .expressibleByArrayLiteral: return 301
-    case .expressibleByDictionaryLiteral: return 302
-    case .ext: return 303
-    case .extDecoder: return 304
-    case .extendedGraphemeClusterLiteral: return 305
-    case .extendedGraphemeClusterLiteralType: return 306
-    case .extendee: return 307
-    case .extensibleMessage: return 308
-    case .extension: return 309
-    case .extensionField: return 310
-    case .extensionFieldNumber: return 311
-    case .extensionFieldValueSet: return 312
-    case .extensionMap: return 313
-    case .extensionRange: return 314
-    case .extensionRangeOptions: return 315
-    case .extensions: return 316
-    case .extras: return 317
-    case .f: return 318
-    case .false: return 319
-    case .features: return 320
-    case .featureSet: return 321
-    case .featureSetDefaults: return 322
-    case .featureSetEditionDefault: return 323
-    case .featureSupport: return 324
-    case .field: return 325
-    case .fieldData: return 326
-    case .fieldDescriptorProto: return 327
-    case .fieldMask: return 328
-    case .fieldMaskError: return 329
-    case .fieldName: return 330
-    case .fieldNameCount: return 331
-    case .fieldNum: return 332
-    case .fieldNumber: return 333
-    case .fieldNumberForProto: return 334
-    case .fieldOptions: return 335
-    case .fieldPresence: return 336
-    case .fields: return 337
-    case .fieldSize: return 338
-    case .fieldTag: return 339
-    case .fieldType: return 340
-    case .file: return 341
-    case .fileDescriptorProto: return 342
-    case .fileDescriptorSet: return 343
-    case .fileName: return 344
-    case .fileOptions: return 345
-    case .filter: return 346
-    case .final: return 347
-    case .finiteOnly: return 348
-    case .first: return 349
-    case .firstItem: return 350
-    case .fixedFeatures: return 351
-    case .float: return 352
-    case .floatLiteral: return 353
-    case .floatLiteralType: return 354
-    case .floatValue: return 355
-    case .for: return 356
-    case .forMessageName: return 357
-    case .formUnion: return 358
-    case .forReadingFrom: return 359
-    case .forTypeURL: return 360
-    case .forwardParser: return 361
-    case .forWritingInto: return 362
-    case .from: return 363
-    case .fromAscii2: return 364
-    case .fromAscii4: return 365
-    case .fromByteOffset: return 366
-    case .fromHexDigit: return 367
-    case .fullName: return 368
-    case .func: return 369
-    case .function: return 370
-    case .g: return 371
-    case .generatedCodeInfo: return 372
-    case .get: return 373
-    case .getExtensionValue: return 374
-    case .googleapis: return 375
-    case .googleProtobufAny: return 376
-    case .googleProtobufApi: return 377
-    case .googleProtobufBoolValue: return 378
-    case .googleProtobufBytesValue: return 379
-    case .googleProtobufDescriptorProto: return 380
-    case .googleProtobufDoubleValue: return 381
-    case .googleProtobufDuration: return 382
-    case .googleProtobufEdition: return 383
-    case .googleProtobufEmpty: return 384
-    case .googleProtobufEnum: return 385
-    case .googleProtobufEnumDescriptorProto: return 386
-    case .googleProtobufEnumOptions: return 387
-    case .googleProtobufEnumValue: return 388
-    case .googleProtobufEnumValueDescriptorProto: return 389
-    case .googleProtobufEnumValueOptions: return 390
-    case .googleProtobufExtensionRangeOptions: return 391
-    case .googleProtobufFeatureSet: return 392
-    case .googleProtobufFeatureSetDefaults: return 393
-    case .googleProtobufField: return 394
-    case .googleProtobufFieldDescriptorProto: return 395
-    case .googleProtobufFieldMask: return 396
-    case .googleProtobufFieldOptions: return 397
-    case .googleProtobufFileDescriptorProto: return 398
-    case .googleProtobufFileDescriptorSet: return 399
-    case .googleProtobufFileOptions: return 400
-    case .googleProtobufFloatValue: return 401
-    case .googleProtobufGeneratedCodeInfo: return 402
-    case .googleProtobufInt32Value: return 403
-    case .googleProtobufInt64Value: return 404
-    case .googleProtobufListValue: return 405
-    case .googleProtobufMessageOptions: return 406
-    case .googleProtobufMethod: return 407
-    case .googleProtobufMethodDescriptorProto: return 408
-    case .googleProtobufMethodOptions: return 409
-    case .googleProtobufMixin: return 410
-    case .googleProtobufNullValue: return 411
-    case .googleProtobufOneofDescriptorProto: return 412
-    case .googleProtobufOneofOptions: return 413
-    case .googleProtobufOption: return 414
-    case .googleProtobufServiceDescriptorProto: return 415
-    case .googleProtobufServiceOptions: return 416
-    case .googleProtobufSourceCodeInfo: return 417
-    case .googleProtobufSourceContext: return 418
-    case .googleProtobufStringValue: return 419
-    case .googleProtobufStruct: return 420
-    case .googleProtobufSyntax: return 421
-    case .googleProtobufTimestamp: return 422
-    case .googleProtobufType: return 423
-    case .googleProtobufUint32Value: return 424
-    case .googleProtobufUint64Value: return 425
-    case .googleProtobufUninterpretedOption: return 426
-    case .googleProtobufValue: return 427
-    case .goPackage: return 428
-    case .group: return 429
-    case .groupFieldNumberStack: return 430
-    case .groupSize: return 431
-    case .guard: return 432
-    case .hadOneofValue: return 433
-    case .handleConflictingOneOf: return 434
-    case .hasAggregateValue: return 435
-    case .hasAllowAlias: return 436
-    case .hasBegin: return 437
-    case .hasCcEnableArenas: return 438
-    case .hasCcGenericServices: return 439
-    case .hasClientStreaming: return 440
-    case .hasCsharpNamespace: return 441
-    case .hasCtype: return 442
-    case .hasDebugRedact: return 443
-    case .hasDefaultValue: return 444
-    case .hasDeprecated: return 445
-    case .hasDeprecatedLegacyJsonFieldConflicts: return 446
-    case .hasDeprecationWarning: return 447
-    case .hasDoubleValue: return 448
-    case .hasEdition: return 449
-    case .hasEditionDeprecated: return 450
-    case .hasEditionIntroduced: return 451
-    case .hasEditionRemoved: return 452
-    case .hasEnd: return 453
-    case .hasEnumType: return 454
-    case .hasExtendee: return 455
-    case .hasExtensionValue: return 456
-    case .hasFeatures: return 457
-    case .hasFeatureSupport: return 458
-    case .hasFieldPresence: return 459
-    case .hasFixedFeatures: return 460
-    case .hasFullName: return 461
-    case .hasGoPackage: return 462
-    case .hash: return 463
-    case .hashable: return 464
-    case .hasher: return 465
-    case .hashVisitor: return 466
-    case .hasIdempotencyLevel: return 467
-    case .hasIdentifierValue: return 468
-    case .hasInputType: return 469
-    case .hasIsExtension: return 470
-    case .hasJavaGenerateEqualsAndHash: return 471
-    case .hasJavaGenericServices: return 472
-    case .hasJavaMultipleFiles: return 473
-    case .hasJavaOuterClassname: return 474
-    case .hasJavaPackage: return 475
-    case .hasJavaStringCheckUtf8: return 476
-    case .hasJsonFormat: return 477
-    case .hasJsonName: return 478
-    case .hasJstype: return 479
-    case .hasLabel: return 480
-    case .hasLazy: return 481
-    case .hasLeadingComments: return 482
-    case .hasMapEntry: return 483
-    case .hasMaximumEdition: return 484
-    case .hasMessageEncoding: return 485
-    case .hasMessageSetWireFormat: return 486
-    case .hasMinimumEdition: return 487
-    case .hasName: return 488
-    case .hasNamePart: return 489
-    case .hasNegativeIntValue: return 490
-    case .hasNoStandardDescriptorAccessor: return 491
-    case .hasNumber: return 492
-    case .hasObjcClassPrefix: return 493
-    case .hasOneofIndex: return 494
-    case .hasOptimizeFor: return 495
-    case .hasOptions: return 496
-    case .hasOutputType: return 497
-    case .hasOverridableFeatures: return 498
-    case .hasPackage: return 499
+    case .clearEnforceNamingStyle: return 97
+    case .clearEnumType: return 98
+    case .clearExtendee: return 99
+    case .clearExtensionValue: return 100
+    case .clearFeatures: return 101
+    case .clearFeatureSupport: return 102
+    case .clearFieldPresence: return 103
+    case .clearFixedFeatures: return 104
+    case .clearFullName: return 105
+    case .clearGoPackage: return 106
+    case .clearIdempotencyLevel: return 107
+    case .clearIdentifierValue: return 108
+    case .clearInputType: return 109
+    case .clearIsExtension: return 110
+    case .clearJavaGenerateEqualsAndHash: return 111
+    case .clearJavaGenericServices: return 112
+    case .clearJavaMultipleFiles: return 113
+    case .clearJavaOuterClassname: return 114
+    case .clearJavaPackage: return 115
+    case .clearJavaStringCheckUtf8: return 116
+    case .clearJsonFormat: return 117
+    case .clearJsonName: return 118
+    case .clearJstype: return 119
+    case .clearLabel: return 120
+    case .clearLazy: return 121
+    case .clearLeadingComments: return 122
+    case .clearMapEntry: return 123
+    case .clearMaximumEdition: return 124
+    case .clearMessageEncoding: return 125
+    case .clearMessageSetWireFormat: return 126
+    case .clearMinimumEdition: return 127
+    case .clearName: return 128
+    case .clearNamePart: return 129
+    case .clearNegativeIntValue: return 130
+    case .clearNoStandardDescriptorAccessor: return 131
+    case .clearNumber: return 132
+    case .clearObjcClassPrefix: return 133
+    case .clearOneofIndex: return 134
+    case .clearOptimizeFor: return 135
+    case .clearOptions: return 136
+    case .clearOutputType: return 137
+    case .clearOverridableFeatures: return 138
+    case .clearPackage: return 139
+    case .clearPacked: return 140
+    case .clearPhpClassPrefix: return 141
+    case .clearPhpMetadataNamespace: return 142
+    case .clearPhpNamespace: return 143
+    case .clearPositiveIntValue: return 144
+    case .clearProto3Optional: return 145
+    case .clearPyGenericServices: return 146
+    case .clearRepeated: return 147
+    case .clearRepeatedFieldEncoding: return 148
+    case .clearReserved: return 149
+    case .clearRetention: return 150
+    case .clearRubyPackage: return 151
+    case .clearSemantic: return 152
+    case .clearServerStreaming: return 153
+    case .clearSourceCodeInfo: return 154
+    case .clearSourceContext: return 155
+    case .clearSourceFile: return 156
+    case .clearStart: return 157
+    case .clearStringValue: return 158
+    case .clearSwiftPrefix: return 159
+    case .clearSyntax: return 160
+    case .clearTrailingComments: return 161
+    case .clearType: return 162
+    case .clearTypeName: return 163
+    case .clearUnverifiedLazy: return 164
+    case .clearUtf8Validation: return 165
+    case .clearValue: return 166
+    case .clearVerification: return 167
+    case .clearWeak: return 168
+    case .clientStreaming: return 169
+    case .code: return 170
+    case .codePoint: return 171
+    case .codeUnits: return 172
+    case .collection: return 173
+    case .com: return 174
+    case .comma: return 175
+    case .consumedBytes: return 176
+    case .contains: return 177
+    case .contentsOf: return 178
+    case .contiguousBytes: return 179
+    case .copy: return 180
+    case .count: return 181
+    case .countVarintsInBuffer: return 182
+    case .csharpNamespace: return 183
+    case .ctype: return 184
+    case .customCodable: return 185
+    case .customDebugStringConvertible: return 186
+    case .customStringConvertible: return 187
+    case .d: return 188
+    case .data: return 189
+    case .dataResult: return 190
+    case .date: return 191
+    case .daySec: return 192
+    case .daysSinceEpoch: return 193
+    case .debugDescription_: return 194
+    case .debugRedact: return 195
+    case .declaration: return 196
+    case .decoded: return 197
+    case .decodedFromJsonnull: return 198
+    case .decodeExtensionField: return 199
+    case .decodeExtensionFieldsAsMessageSet: return 200
+    case .decodeJson: return 201
+    case .decodeMapField: return 202
+    case .decodeMessage: return 203
+    case .decoder: return 204
+    case .decodeRepeated: return 205
+    case .decodeRepeatedBoolField: return 206
+    case .decodeRepeatedBytesField: return 207
+    case .decodeRepeatedDoubleField: return 208
+    case .decodeRepeatedEnumField: return 209
+    case .decodeRepeatedFixed32Field: return 210
+    case .decodeRepeatedFixed64Field: return 211
+    case .decodeRepeatedFloatField: return 212
+    case .decodeRepeatedGroupField: return 213
+    case .decodeRepeatedInt32Field: return 214
+    case .decodeRepeatedInt64Field: return 215
+    case .decodeRepeatedMessageField: return 216
+    case .decodeRepeatedSfixed32Field: return 217
+    case .decodeRepeatedSfixed64Field: return 218
+    case .decodeRepeatedSint32Field: return 219
+    case .decodeRepeatedSint64Field: return 220
+    case .decodeRepeatedStringField: return 221
+    case .decodeRepeatedUint32Field: return 222
+    case .decodeRepeatedUint64Field: return 223
+    case .decodeSingular: return 224
+    case .decodeSingularBoolField: return 225
+    case .decodeSingularBytesField: return 226
+    case .decodeSingularDoubleField: return 227
+    case .decodeSingularEnumField: return 228
+    case .decodeSingularFixed32Field: return 229
+    case .decodeSingularFixed64Field: return 230
+    case .decodeSingularFloatField: return 231
+    case .decodeSingularGroupField: return 232
+    case .decodeSingularInt32Field: return 233
+    case .decodeSingularInt64Field: return 234
+    case .decodeSingularMessageField: return 235
+    case .decodeSingularSfixed32Field: return 236
+    case .decodeSingularSfixed64Field: return 237
+    case .decodeSingularSint32Field: return 238
+    case .decodeSingularSint64Field: return 239
+    case .decodeSingularStringField: return 240
+    case .decodeSingularUint32Field: return 241
+    case .decodeSingularUint64Field: return 242
+    case .decodeTextFormat: return 243
+    case .defaultAnyTypeUrlprefix: return 244
+    case .defaults: return 245
+    case .defaultValue: return 246
+    case .dependency: return 247
+    case .deprecated: return 248
+    case .deprecatedLegacyJsonFieldConflicts: return 249
+    case .deprecationWarning: return 250
+    case .description_: return 251
+    case .descriptorProto: return 252
+    case .dictionary: return 253
+    case .dictionaryLiteral: return 254
+    case .digit: return 255
+    case .digit0: return 256
+    case .digit1: return 257
+    case .digitCount: return 258
+    case .digits: return 259
+    case .digitValue: return 260
+    case .discardableResult: return 261
+    case .discardUnknownFields: return 262
+    case .double: return 263
+    case .doubleValue: return 264
+    case .duration: return 265
+    case .e: return 266
+    case .edition: return 267
+    case .editionDefault: return 268
+    case .editionDefaults: return 269
+    case .editionDeprecated: return 270
+    case .editionIntroduced: return 271
+    case .editionRemoved: return 272
+    case .element: return 273
+    case .elements: return 274
+    case .else: return 275
+    case .emitExtensionFieldName: return 276
+    case .emitFieldName: return 277
+    case .emitFieldNumber: return 278
+    case .empty: return 279
+    case .emptyAnyTypeURL: return 280
+    case .emptyData: return 281
+    case .encodeAsBytes: return 282
+    case .encoded: return 283
+    case .encodedJsonstring: return 284
+    case .encodedSize: return 285
+    case .encodeField: return 286
+    case .encoder: return 287
+    case .end: return 288
+    case .endArray: return 289
+    case .endMessageField: return 290
+    case .endObject: return 291
+    case .endRegularField: return 292
+    case .enforceNamingStyle: return 293
+    case .enum: return 294
+    case .enumDescriptorProto: return 295
+    case .enumOptions: return 296
+    case .enumReservedRange: return 297
+    case .enumType: return 298
+    case .enumvalue: return 299
+    case .enumValueDescriptorProto: return 300
+    case .enumValueOptions: return 301
+    case .equatable: return 302
+    case .error: return 303
+    case .expressibleByArrayLiteral: return 304
+    case .expressibleByDictionaryLiteral: return 305
+    case .ext: return 306
+    case .extDecoder: return 307
+    case .extendedGraphemeClusterLiteral: return 308
+    case .extendedGraphemeClusterLiteralType: return 309
+    case .extendee: return 310
+    case .extensibleMessage: return 311
+    case .extension: return 312
+    case .extensionField: return 313
+    case .extensionFieldNumber: return 314
+    case .extensionFieldValueSet: return 315
+    case .extensionMap: return 316
+    case .extensionRange: return 317
+    case .extensionRangeOptions: return 318
+    case .extensions: return 319
+    case .extras: return 320
+    case .f: return 321
+    case .false: return 322
+    case .features: return 323
+    case .featureSet: return 324
+    case .featureSetDefaults: return 325
+    case .featureSetEditionDefault: return 326
+    case .featureSupport: return 327
+    case .field: return 328
+    case .fieldData: return 329
+    case .fieldDescriptorProto: return 330
+    case .fieldMask: return 331
+    case .fieldMaskError: return 332
+    case .fieldName: return 333
+    case .fieldNameCount: return 334
+    case .fieldNum: return 335
+    case .fieldNumber: return 336
+    case .fieldNumberForProto: return 337
+    case .fieldOptions: return 338
+    case .fieldPresence: return 339
+    case .fields: return 340
+    case .fieldSize: return 341
+    case .fieldTag: return 342
+    case .fieldType: return 343
+    case .file: return 344
+    case .fileDescriptorProto: return 345
+    case .fileDescriptorSet: return 346
+    case .fileName: return 347
+    case .fileOptions: return 348
+    case .filter: return 349
+    case .final: return 350
+    case .finiteOnly: return 351
+    case .first: return 352
+    case .firstItem: return 353
+    case .fixedFeatures: return 354
+    case .float: return 355
+    case .floatLiteral: return 356
+    case .floatLiteralType: return 357
+    case .floatValue: return 358
+    case .for: return 359
+    case .forMessageName: return 360
+    case .formUnion: return 361
+    case .forReadingFrom: return 362
+    case .forTypeURL: return 363
+    case .forwardParser: return 364
+    case .forWritingInto: return 365
+    case .from: return 366
+    case .fromAscii2: return 367
+    case .fromAscii4: return 368
+    case .fromByteOffset: return 369
+    case .fromHexDigit: return 370
+    case .fullName: return 371
+    case .func: return 372
+    case .function: return 373
+    case .g: return 374
+    case .generatedCodeInfo: return 375
+    case .get: return 376
+    case .getExtensionValue: return 377
+    case .googleapis: return 378
+    case .googleProtobufAny: return 379
+    case .googleProtobufApi: return 380
+    case .googleProtobufBoolValue: return 381
+    case .googleProtobufBytesValue: return 382
+    case .googleProtobufDescriptorProto: return 383
+    case .googleProtobufDoubleValue: return 384
+    case .googleProtobufDuration: return 385
+    case .googleProtobufEdition: return 386
+    case .googleProtobufEmpty: return 387
+    case .googleProtobufEnum: return 388
+    case .googleProtobufEnumDescriptorProto: return 389
+    case .googleProtobufEnumOptions: return 390
+    case .googleProtobufEnumValue: return 391
+    case .googleProtobufEnumValueDescriptorProto: return 392
+    case .googleProtobufEnumValueOptions: return 393
+    case .googleProtobufExtensionRangeOptions: return 394
+    case .googleProtobufFeatureSet: return 395
+    case .googleProtobufFeatureSetDefaults: return 396
+    case .googleProtobufField: return 397
+    case .googleProtobufFieldDescriptorProto: return 398
+    case .googleProtobufFieldMask: return 399
+    case .googleProtobufFieldOptions: return 400
+    case .googleProtobufFileDescriptorProto: return 401
+    case .googleProtobufFileDescriptorSet: return 402
+    case .googleProtobufFileOptions: return 403
+    case .googleProtobufFloatValue: return 404
+    case .googleProtobufGeneratedCodeInfo: return 405
+    case .googleProtobufInt32Value: return 406
+    case .googleProtobufInt64Value: return 407
+    case .googleProtobufListValue: return 408
+    case .googleProtobufMessageOptions: return 409
+    case .googleProtobufMethod: return 410
+    case .googleProtobufMethodDescriptorProto: return 411
+    case .googleProtobufMethodOptions: return 412
+    case .googleProtobufMixin: return 413
+    case .googleProtobufNullValue: return 414
+    case .googleProtobufOneofDescriptorProto: return 415
+    case .googleProtobufOneofOptions: return 416
+    case .googleProtobufOption: return 417
+    case .googleProtobufServiceDescriptorProto: return 418
+    case .googleProtobufServiceOptions: return 419
+    case .googleProtobufSourceCodeInfo: return 420
+    case .googleProtobufSourceContext: return 421
+    case .googleProtobufStringValue: return 422
+    case .googleProtobufStruct: return 423
+    case .googleProtobufSyntax: return 424
+    case .googleProtobufTimestamp: return 425
+    case .googleProtobufType: return 426
+    case .googleProtobufUint32Value: return 427
+    case .googleProtobufUint64Value: return 428
+    case .googleProtobufUninterpretedOption: return 429
+    case .googleProtobufValue: return 430
+    case .goPackage: return 431
+    case .group: return 432
+    case .groupFieldNumberStack: return 433
+    case .groupSize: return 434
+    case .guard: return 435
+    case .hadOneofValue: return 436
+    case .handleConflictingOneOf: return 437
+    case .hasAggregateValue: return 438
+    case .hasAllowAlias: return 439
+    case .hasBegin: return 440
+    case .hasCcEnableArenas: return 441
+    case .hasCcGenericServices: return 442
+    case .hasClientStreaming: return 443
+    case .hasCsharpNamespace: return 444
+    case .hasCtype: return 445
+    case .hasDebugRedact: return 446
+    case .hasDefaultValue: return 447
+    case .hasDeprecated: return 448
+    case .hasDeprecatedLegacyJsonFieldConflicts: return 449
+    case .hasDeprecationWarning: return 450
+    case .hasDoubleValue: return 451
+    case .hasEdition: return 452
+    case .hasEditionDeprecated: return 453
+    case .hasEditionIntroduced: return 454
+    case .hasEditionRemoved: return 455
+    case .hasEnd: return 456
+    case .hasEnforceNamingStyle: return 457
+    case .hasEnumType: return 458
+    case .hasExtendee: return 459
+    case .hasExtensionValue: return 460
+    case .hasFeatures: return 461
+    case .hasFeatureSupport: return 462
+    case .hasFieldPresence: return 463
+    case .hasFixedFeatures: return 464
+    case .hasFullName: return 465
+    case .hasGoPackage: return 466
+    case .hash: return 467
+    case .hashable: return 468
+    case .hasher: return 469
+    case .hashVisitor: return 470
+    case .hasIdempotencyLevel: return 471
+    case .hasIdentifierValue: return 472
+    case .hasInputType: return 473
+    case .hasIsExtension: return 474
+    case .hasJavaGenerateEqualsAndHash: return 475
+    case .hasJavaGenericServices: return 476
+    case .hasJavaMultipleFiles: return 477
+    case .hasJavaOuterClassname: return 478
+    case .hasJavaPackage: return 479
+    case .hasJavaStringCheckUtf8: return 480
+    case .hasJsonFormat: return 481
+    case .hasJsonName: return 482
+    case .hasJstype: return 483
+    case .hasLabel: return 484
+    case .hasLazy: return 485
+    case .hasLeadingComments: return 486
+    case .hasMapEntry: return 487
+    case .hasMaximumEdition: return 488
+    case .hasMessageEncoding: return 489
+    case .hasMessageSetWireFormat: return 490
+    case .hasMinimumEdition: return 491
+    case .hasName: return 492
+    case .hasNamePart: return 493
+    case .hasNegativeIntValue: return 494
+    case .hasNoStandardDescriptorAccessor: return 495
+    case .hasNumber: return 496
+    case .hasObjcClassPrefix: return 497
+    case .hasOneofIndex: return 498
+    case .hasOptimizeFor: return 499
     default: break
     }
     switch self {
-    case .hasPacked: return 500
-    case .hasPhpClassPrefix: return 501
-    case .hasPhpMetadataNamespace: return 502
-    case .hasPhpNamespace: return 503
-    case .hasPositiveIntValue: return 504
-    case .hasProto3Optional: return 505
-    case .hasPyGenericServices: return 506
-    case .hasRepeated: return 507
-    case .hasRepeatedFieldEncoding: return 508
-    case .hasReserved: return 509
-    case .hasRetention: return 510
-    case .hasRubyPackage: return 511
-    case .hasSemantic: return 512
-    case .hasServerStreaming: return 513
-    case .hasSourceCodeInfo: return 514
-    case .hasSourceContext: return 515
-    case .hasSourceFile: return 516
-    case .hasStart: return 517
-    case .hasStringValue: return 518
-    case .hasSwiftPrefix: return 519
-    case .hasSyntax: return 520
-    case .hasTrailingComments: return 521
-    case .hasType: return 522
-    case .hasTypeName: return 523
-    case .hasUnverifiedLazy: return 524
-    case .hasUtf8Validation: return 525
-    case .hasValue: return 526
-    case .hasVerification: return 527
-    case .hasWeak: return 528
-    case .hour: return 529
-    case .i: return 530
-    case .idempotencyLevel: return 531
-    case .identifierValue: return 532
-    case .if: return 533
-    case .ignoreUnknownExtensionFields: return 534
-    case .ignoreUnknownFields: return 535
-    case .index: return 536
-    case .init_: return 537
-    case .inout: return 538
-    case .inputType: return 539
-    case .insert: return 540
-    case .int: return 541
-    case .int32: return 542
-    case .int32Value: return 543
-    case .int64: return 544
-    case .int64Value: return 545
-    case .int8: return 546
-    case .integerLiteral: return 547
-    case .integerLiteralType: return 548
-    case .intern: return 549
-    case .internal: return 550
-    case .internalState: return 551
-    case .intersect: return 552
-    case .into: return 553
-    case .ints: return 554
-    case .isA: return 555
-    case .isEqual: return 556
-    case .isEqualTo: return 557
-    case .isExtension: return 558
-    case .isInitialized: return 559
-    case .isNegative: return 560
-    case .isPathValid: return 561
-    case .isValid: return 562
-    case .itemTagsEncodedSize: return 563
-    case .iterator: return 564
-    case .javaGenerateEqualsAndHash: return 565
-    case .javaGenericServices: return 566
-    case .javaMultipleFiles: return 567
-    case .javaOuterClassname: return 568
-    case .javaPackage: return 569
-    case .javaStringCheckUtf8: return 570
-    case .jsondecoder: return 571
-    case .jsondecodingError: return 572
-    case .jsondecodingOptions: return 573
-    case .jsonEncoder: return 574
-    case .jsonencodingError: return 575
-    case .jsonencodingOptions: return 576
-    case .jsonencodingVisitor: return 577
-    case .jsonFormat: return 578
-    case .jsonmapEncodingVisitor: return 579
-    case .jsonName: return 580
-    case .jsonPath: return 581
-    case .jsonPaths: return 582
-    case .jsonscanner: return 583
-    case .jsonString: return 584
-    case .jsonText: return 585
-    case .jsonUtf8Bytes: return 586
-    case .jsonUtf8Data: return 587
-    case .jstype: return 588
-    case .k: return 589
-    case .kChunkSize: return 590
-    case .key: return 591
-    case .keyField: return 592
-    case .keyFieldOpt: return 593
-    case .keyType: return 594
-    case .kind: return 595
-    case .l: return 596
-    case .label: return 597
-    case .lazy: return 598
-    case .leadingComments: return 599
-    case .leadingDetachedComments: return 600
-    case .length: return 601
-    case .lessThan: return 602
-    case .let: return 603
-    case .lhs: return 604
-    case .line: return 605
-    case .list: return 606
-    case .listOfMessages: return 607
-    case .listValue: return 608
-    case .littleEndian: return 609
-    case .load: return 610
-    case .localHasher: return 611
-    case .location: return 612
-    case .m: return 613
-    case .major: return 614
-    case .makeAsyncIterator: return 615
-    case .makeIterator: return 616
-    case .malformedLength: return 617
-    case .mapEntry: return 618
-    case .mapKeyType: return 619
-    case .mapToMessages: return 620
-    case .mapValueType: return 621
-    case .mapVisitor: return 622
-    case .mask: return 623
-    case .maximumEdition: return 624
-    case .mdayStart: return 625
-    case .merge: return 626
-    case .mergeOptions: return 627
-    case .message: return 628
-    case .messageDepthLimit: return 629
-    case .messageEncoding: return 630
-    case .messageExtension: return 631
-    case .messageImplementationBase: return 632
-    case .messageOptions: return 633
-    case .messageSet: return 634
-    case .messageSetWireFormat: return 635
-    case .messageSize: return 636
-    case .messageType: return 637
-    case .method: return 638
-    case .methodDescriptorProto: return 639
-    case .methodOptions: return 640
-    case .methods: return 641
-    case .min: return 642
-    case .minimumEdition: return 643
-    case .minor: return 644
-    case .mixin: return 645
-    case .mixins: return 646
-    case .modify: return 647
-    case .month: return 648
-    case .msgExtension: return 649
-    case .mutating: return 650
-    case .n: return 651
-    case .name: return 652
-    case .nameDescription: return 653
-    case .nameMap: return 654
-    case .namePart: return 655
-    case .names: return 656
-    case .nanos: return 657
-    case .negativeIntValue: return 658
-    case .nestedType: return 659
-    case .newExtensible: return 660
-    case .newL: return 661
-    case .newList: return 662
-    case .newMessage: return 663
-    case .newValue: return 664
-    case .next: return 665
-    case .nextByte: return 666
-    case .nextFieldNumber: return 667
-    case .nextVarInt: return 668
-    case .nil: return 669
-    case .nilLiteral: return 670
-    case .noBytesAvailable: return 671
-    case .noStandardDescriptorAccessor: return 672
-    case .nullValue: return 673
-    case .number: return 674
-    case .numberValue: return 675
-    case .objcClassPrefix: return 676
-    case .of: return 677
-    case .oneofDecl: return 678
-    case .oneofDescriptorProto: return 679
-    case .oneofIndex: return 680
-    case .oneofOptions: return 681
-    case .oneofs: return 682
-    case .oneOfKind: return 683
-    case .optimizeFor: return 684
-    case .optimizeMode: return 685
-    case .option: return 686
-    case .optionalEnumExtensionField: return 687
-    case .optionalExtensionField: return 688
-    case .optionalGroupExtensionField: return 689
-    case .optionalMessageExtensionField: return 690
-    case .optionRetention: return 691
-    case .options: return 692
-    case .optionTargetType: return 693
-    case .other: return 694
-    case .others: return 695
-    case .out: return 696
-    case .outputType: return 697
-    case .overridableFeatures: return 698
-    case .p: return 699
-    case .package: return 700
-    case .packed: return 701
-    case .packedEnumExtensionField: return 702
-    case .packedExtensionField: return 703
-    case .padding: return 704
-    case .parent: return 705
-    case .parse: return 706
-    case .partial: return 707
-    case .path: return 708
-    case .pathDecoder: return 709
-    case .pathDecodingError: return 710
-    case .paths: return 711
-    case .pathVisitor: return 712
-    case .payload: return 713
-    case .payloadSize: return 714
-    case .phpClassPrefix: return 715
-    case .phpMetadataNamespace: return 716
-    case .phpNamespace: return 717
-    case .pos: return 718
-    case .positiveIntValue: return 719
-    case .prefix: return 720
-    case .preserveProtoFieldNames: return 721
-    case .preTraverse: return 722
-    case .prevPath: return 723
-    case .printUnknownFields: return 724
-    case .proto2: return 725
-    case .proto3DefaultValue: return 726
-    case .proto3Optional: return 727
-    case .protobufApiversionCheck: return 728
-    case .protobufApiversion2: return 729
-    case .protobufBool: return 730
-    case .protobufBytes: return 731
-    case .protobufDouble: return 732
-    case .protobufEnumMap: return 733
-    case .protobufExtension: return 734
-    case .protobufFixed32: return 735
-    case .protobufFixed64: return 736
-    case .protobufFloat: return 737
-    case .protobufInt32: return 738
-    case .protobufInt64: return 739
-    case .protobufMap: return 740
-    case .protobufMessageMap: return 741
-    case .protobufSfixed32: return 742
-    case .protobufSfixed64: return 743
-    case .protobufSint32: return 744
-    case .protobufSint64: return 745
-    case .protobufString: return 746
-    case .protobufUint32: return 747
-    case .protobufUint64: return 748
-    case .protobufExtensionFieldValues: return 749
-    case .protobufFieldNumber: return 750
-    case .protobufGeneratedIsEqualTo: return 751
-    case .protobufNameMap: return 752
-    case .protobufNewField: return 753
-    case .protobufPackage: return 754
-    case .protocol: return 755
-    case .protoFieldName: return 756
-    case .protoMessageName: return 757
-    case .protoNameProviding: return 758
-    case .protoPaths: return 759
-    case .public: return 760
-    case .publicDependency: return 761
-    case .putBoolValue: return 762
-    case .putBytesValue: return 763
-    case .putDoubleValue: return 764
-    case .putEnumValue: return 765
-    case .putFixedUint32: return 766
-    case .putFixedUint64: return 767
-    case .putFloatValue: return 768
-    case .putInt64: return 769
-    case .putStringValue: return 770
-    case .putUint64: return 771
-    case .putUint64Hex: return 772
-    case .putVarInt: return 773
-    case .putZigZagVarInt: return 774
-    case .pyGenericServices: return 775
-    case .r: return 776
-    case .rawChars: return 777
-    case .rawRepresentable: return 778
-    case .rawValue_: return 779
-    case .read4HexDigits: return 780
-    case .readBytes: return 781
-    case .register: return 782
-    case .removingAllFieldsOf: return 783
-    case .repeated: return 784
-    case .repeatedEnumExtensionField: return 785
-    case .repeatedExtensionField: return 786
-    case .repeatedFieldEncoding: return 787
-    case .repeatedGroupExtensionField: return 788
-    case .repeatedMessageExtensionField: return 789
-    case .repeating: return 790
-    case .replaceRepeatedFields: return 791
-    case .requestStreaming: return 792
-    case .requestTypeURL: return 793
-    case .requiredSize: return 794
-    case .responseStreaming: return 795
-    case .responseTypeURL: return 796
-    case .result: return 797
-    case .retention: return 798
-    case .rethrows: return 799
-    case .return: return 800
-    case .returnType: return 801
-    case .revision: return 802
-    case .rhs: return 803
-    case .root: return 804
-    case .rubyPackage: return 805
-    case .s: return 806
-    case .sawBackslash: return 807
-    case .sawSection4Characters: return 808
-    case .sawSection5Characters: return 809
-    case .scan: return 810
-    case .scanner: return 811
-    case .seconds: return 812
-    case .self_: return 813
-    case .semantic: return 814
-    case .sendable: return 815
-    case .separator: return 816
-    case .serialize: return 817
-    case .serializedBytes: return 818
-    case .serializedData: return 819
-    case .serializedSize: return 820
-    case .serverStreaming: return 821
-    case .service: return 822
-    case .serviceDescriptorProto: return 823
-    case .serviceOptions: return 824
-    case .set: return 825
-    case .setExtensionValue: return 826
-    case .shift: return 827
-    case .simpleExtensionMap: return 828
-    case .size: return 829
-    case .sizer: return 830
-    case .source: return 831
-    case .sourceCodeInfo: return 832
-    case .sourceContext: return 833
-    case .sourceEncoding: return 834
-    case .sourceFile: return 835
-    case .sourceLocation: return 836
-    case .span: return 837
-    case .split: return 838
-    case .start: return 839
-    case .startArray: return 840
-    case .startArrayObject: return 841
-    case .startField: return 842
-    case .startIndex: return 843
-    case .startMessageField: return 844
-    case .startObject: return 845
-    case .startRegularField: return 846
-    case .state: return 847
-    case .static: return 848
-    case .staticString: return 849
-    case .storage: return 850
-    case .string: return 851
-    case .stringLiteral: return 852
-    case .stringLiteralType: return 853
-    case .stringResult: return 854
-    case .stringValue: return 855
-    case .struct: return 856
-    case .structValue: return 857
-    case .subDecoder: return 858
-    case .subscript: return 859
-    case .subtract: return 860
-    case .subVisitor: return 861
-    case .swift: return 862
-    case .swiftPrefix: return 863
-    case .swiftProtobufContiguousBytes: return 864
-    case .swiftProtobufError: return 865
-    case .syntax: return 866
-    case .t: return 867
-    case .tag: return 868
-    case .targets: return 869
-    case .terminator: return 870
-    case .testDecoder: return 871
-    case .text: return 872
-    case .textDecoder: return 873
-    case .textFormatDecoder: return 874
-    case .textFormatDecodingError: return 875
-    case .textFormatDecodingOptions: return 876
-    case .textFormatEncodingOptions: return 877
-    case .textFormatEncodingVisitor: return 878
-    case .textFormatString: return 879
-    case .throwOrIgnore: return 880
-    case .throws: return 881
-    case .timeInterval: return 882
-    case .timeIntervalSince1970: return 883
-    case .timeIntervalSinceReferenceDate: return 884
-    case .timestamp: return 885
-    case .tmp: return 886
-    case .tooLarge: return 887
-    case .total: return 888
-    case .totalArrayDepth: return 889
-    case .totalSize: return 890
-    case .trailingComments: return 891
-    case .traverse: return 892
-    case .trim: return 893
-    case .true: return 894
-    case .try: return 895
-    case .type: return 896
-    case .typealias: return 897
-    case .typeEnum: return 898
-    case .typeName: return 899
-    case .typePrefix: return 900
-    case .typeStart: return 901
-    case .typeUnknown: return 902
-    case .typeURL: return 903
-    case .uint32: return 904
-    case .uint32Value: return 905
-    case .uint64: return 906
-    case .uint64Value: return 907
-    case .uint8: return 908
-    case .unchecked: return 909
-    case .unicodeScalarLiteral: return 910
-    case .unicodeScalarLiteralType: return 911
-    case .unicodeScalars: return 912
-    case .unicodeScalarView: return 913
-    case .uninterpretedOption: return 914
-    case .union: return 915
-    case .uniqueStorage: return 916
-    case .unknown: return 917
-    case .unknownFields: return 918
-    case .unknownStorage: return 919
-    case .unpackTo: return 920
-    case .unsafeBufferPointer: return 921
-    case .unsafeMutablePointer: return 922
-    case .unsafeMutableRawBufferPointer: return 923
-    case .unsafeRawBufferPointer: return 924
-    case .unsafeRawPointer: return 925
-    case .unverifiedLazy: return 926
-    case .updatedOptions: return 927
-    case .url: return 928
-    case .useDeterministicOrdering: return 929
-    case .utf8: return 930
-    case .utf8Ptr: return 931
-    case .utf8ToDouble: return 932
-    case .utf8Validation: return 933
-    case .utf8View: return 934
-    case .v: return 935
-    case .value: return 936
-    case .valueField: return 937
-    case .values: return 938
-    case .valueType: return 939
-    case .var: return 940
-    case .verification: return 941
-    case .verificationState: return 942
-    case .version: return 943
-    case .versionString: return 944
-    case .visitExtensionFields: return 945
-    case .visitExtensionFieldsAsMessageSet: return 946
-    case .visitMapField: return 947
-    case .visitor: return 948
-    case .visitPacked: return 949
-    case .visitPackedBoolField: return 950
-    case .visitPackedDoubleField: return 951
-    case .visitPackedEnumField: return 952
-    case .visitPackedFixed32Field: return 953
-    case .visitPackedFixed64Field: return 954
-    case .visitPackedFloatField: return 955
-    case .visitPackedInt32Field: return 956
-    case .visitPackedInt64Field: return 957
-    case .visitPackedSfixed32Field: return 958
-    case .visitPackedSfixed64Field: return 959
-    case .visitPackedSint32Field: return 960
-    case .visitPackedSint64Field: return 961
-    case .visitPackedUint32Field: return 962
-    case .visitPackedUint64Field: return 963
-    case .visitRepeated: return 964
-    case .visitRepeatedBoolField: return 965
-    case .visitRepeatedBytesField: return 966
-    case .visitRepeatedDoubleField: return 967
-    case .visitRepeatedEnumField: return 968
-    case .visitRepeatedFixed32Field: return 969
-    case .visitRepeatedFixed64Field: return 970
-    case .visitRepeatedFloatField: return 971
-    case .visitRepeatedGroupField: return 972
-    case .visitRepeatedInt32Field: return 973
-    case .visitRepeatedInt64Field: return 974
-    case .visitRepeatedMessageField: return 975
-    case .visitRepeatedSfixed32Field: return 976
-    case .visitRepeatedSfixed64Field: return 977
-    case .visitRepeatedSint32Field: return 978
-    case .visitRepeatedSint64Field: return 979
-    case .visitRepeatedStringField: return 980
-    case .visitRepeatedUint32Field: return 981
-    case .visitRepeatedUint64Field: return 982
-    case .visitSingular: return 983
-    case .visitSingularBoolField: return 984
-    case .visitSingularBytesField: return 985
-    case .visitSingularDoubleField: return 986
-    case .visitSingularEnumField: return 987
-    case .visitSingularFixed32Field: return 988
-    case .visitSingularFixed64Field: return 989
-    case .visitSingularFloatField: return 990
-    case .visitSingularGroupField: return 991
-    case .visitSingularInt32Field: return 992
-    case .visitSingularInt64Field: return 993
-    case .visitSingularMessageField: return 994
-    case .visitSingularSfixed32Field: return 995
-    case .visitSingularSfixed64Field: return 996
-    case .visitSingularSint32Field: return 997
-    case .visitSingularSint64Field: return 998
-    case .visitSingularStringField: return 999
+    case .hasOptions: return 500
+    case .hasOutputType: return 501
+    case .hasOverridableFeatures: return 502
+    case .hasPackage: return 503
+    case .hasPacked: return 504
+    case .hasPhpClassPrefix: return 505
+    case .hasPhpMetadataNamespace: return 506
+    case .hasPhpNamespace: return 507
+    case .hasPositiveIntValue: return 508
+    case .hasProto3Optional: return 509
+    case .hasPyGenericServices: return 510
+    case .hasRepeated: return 511
+    case .hasRepeatedFieldEncoding: return 512
+    case .hasReserved: return 513
+    case .hasRetention: return 514
+    case .hasRubyPackage: return 515
+    case .hasSemantic: return 516
+    case .hasServerStreaming: return 517
+    case .hasSourceCodeInfo: return 518
+    case .hasSourceContext: return 519
+    case .hasSourceFile: return 520
+    case .hasStart: return 521
+    case .hasStringValue: return 522
+    case .hasSwiftPrefix: return 523
+    case .hasSyntax: return 524
+    case .hasTrailingComments: return 525
+    case .hasType: return 526
+    case .hasTypeName: return 527
+    case .hasUnverifiedLazy: return 528
+    case .hasUtf8Validation: return 529
+    case .hasValue: return 530
+    case .hasVerification: return 531
+    case .hasWeak: return 532
+    case .hour: return 533
+    case .i: return 534
+    case .idempotencyLevel: return 535
+    case .identifierValue: return 536
+    case .if: return 537
+    case .ignoreUnknownExtensionFields: return 538
+    case .ignoreUnknownFields: return 539
+    case .index: return 540
+    case .init_: return 541
+    case .inout: return 542
+    case .inputType: return 543
+    case .insert: return 544
+    case .int: return 545
+    case .int32: return 546
+    case .int32Value: return 547
+    case .int64: return 548
+    case .int64Value: return 549
+    case .int8: return 550
+    case .integerLiteral: return 551
+    case .integerLiteralType: return 552
+    case .intern: return 553
+    case .internal: return 554
+    case .internalState: return 555
+    case .intersect: return 556
+    case .into: return 557
+    case .ints: return 558
+    case .invalidAnyTypeURL: return 559
+    case .isA: return 560
+    case .isEqual: return 561
+    case .isEqualTo: return 562
+    case .isExtension: return 563
+    case .isInitialized: return 564
+    case .isNegative: return 565
+    case .isPathValid: return 566
+    case .isValid: return 567
+    case .itemTagsEncodedSize: return 568
+    case .iterator: return 569
+    case .javaGenerateEqualsAndHash: return 570
+    case .javaGenericServices: return 571
+    case .javaMultipleFiles: return 572
+    case .javaOuterClassname: return 573
+    case .javaPackage: return 574
+    case .javaStringCheckUtf8: return 575
+    case .jsondecoder: return 576
+    case .jsondecoding: return 577
+    case .jsondecodingError: return 578
+    case .jsondecodingOptions: return 579
+    case .jsonEncoder: return 580
+    case .jsonencoding: return 581
+    case .jsonencodingError: return 582
+    case .jsonencodingOptions: return 583
+    case .jsonencodingVisitor: return 584
+    case .jsonFormat: return 585
+    case .jsonmapEncodingVisitor: return 586
+    case .jsonName: return 587
+    case .jsonPath: return 588
+    case .jsonPaths: return 589
+    case .jsonscanner: return 590
+    case .jsonString: return 591
+    case .jsonText: return 592
+    case .jsonUtf8Bytes: return 593
+    case .jsonUtf8Data: return 594
+    case .jstype: return 595
+    case .k: return 596
+    case .kChunkSize: return 597
+    case .key: return 598
+    case .keyField: return 599
+    case .keyFieldOpt: return 600
+    case .keyType: return 601
+    case .kind: return 602
+    case .l: return 603
+    case .label: return 604
+    case .lazy: return 605
+    case .leadingComments: return 606
+    case .leadingDetachedComments: return 607
+    case .length: return 608
+    case .lessThan: return 609
+    case .let: return 610
+    case .lhs: return 611
+    case .line: return 612
+    case .list: return 613
+    case .listOfMessages: return 614
+    case .listValue: return 615
+    case .littleEndian: return 616
+    case .load: return 617
+    case .localHasher: return 618
+    case .location: return 619
+    case .m: return 620
+    case .major: return 621
+    case .makeAsyncIterator: return 622
+    case .makeIterator: return 623
+    case .malformedLength: return 624
+    case .mapEntry: return 625
+    case .mapKeyType: return 626
+    case .mapToMessages: return 627
+    case .mapValueType: return 628
+    case .mapVisitor: return 629
+    case .mask: return 630
+    case .maximumEdition: return 631
+    case .mdayStart: return 632
+    case .merge: return 633
+    case .mergeOptions: return 634
+    case .message: return 635
+    case .messageDepthLimit: return 636
+    case .messageEncoding: return 637
+    case .messageExtension: return 638
+    case .messageImplementationBase: return 639
+    case .messageOptions: return 640
+    case .messageSet: return 641
+    case .messageSetWireFormat: return 642
+    case .messageSize: return 643
+    case .messageType: return 644
+    case .method: return 645
+    case .methodDescriptorProto: return 646
+    case .methodOptions: return 647
+    case .methods: return 648
+    case .min: return 649
+    case .minimumEdition: return 650
+    case .minor: return 651
+    case .mixin: return 652
+    case .mixins: return 653
+    case .modify: return 654
+    case .month: return 655
+    case .msgExtension: return 656
+    case .mutating: return 657
+    case .n: return 658
+    case .name: return 659
+    case .nameDescription: return 660
+    case .nameMap: return 661
+    case .namePart: return 662
+    case .names: return 663
+    case .nanos: return 664
+    case .negativeIntValue: return 665
+    case .nestedType: return 666
+    case .newExtensible: return 667
+    case .newL: return 668
+    case .newList: return 669
+    case .newMessage: return 670
+    case .newValue: return 671
+    case .next: return 672
+    case .nextByte: return 673
+    case .nextFieldNumber: return 674
+    case .nextVarInt: return 675
+    case .nil: return 676
+    case .nilLiteral: return 677
+    case .noBytesAvailable: return 678
+    case .noStandardDescriptorAccessor: return 679
+    case .nullValue: return 680
+    case .number: return 681
+    case .numberValue: return 682
+    case .objcClassPrefix: return 683
+    case .of: return 684
+    case .oneofDecl: return 685
+    case .oneofDescriptorProto: return 686
+    case .oneofIndex: return 687
+    case .oneofOptions: return 688
+    case .oneofs: return 689
+    case .oneOfKind: return 690
+    case .optimizeFor: return 691
+    case .optimizeMode: return 692
+    case .option: return 693
+    case .optionalEnumExtensionField: return 694
+    case .optionalExtensionField: return 695
+    case .optionalGroupExtensionField: return 696
+    case .optionalMessageExtensionField: return 697
+    case .optionRetention: return 698
+    case .options: return 699
+    case .optionTargetType: return 700
+    case .other: return 701
+    case .others: return 702
+    case .out: return 703
+    case .outputType: return 704
+    case .overridableFeatures: return 705
+    case .p: return 706
+    case .package: return 707
+    case .packed: return 708
+    case .packedEnumExtensionField: return 709
+    case .packedExtensionField: return 710
+    case .padding: return 711
+    case .parent: return 712
+    case .parse: return 713
+    case .partial: return 714
+    case .path: return 715
+    case .pathDecoder: return 716
+    case .pathDecodingError: return 717
+    case .paths: return 718
+    case .pathVisitor: return 719
+    case .payload: return 720
+    case .payloadSize: return 721
+    case .phpClassPrefix: return 722
+    case .phpMetadataNamespace: return 723
+    case .phpNamespace: return 724
+    case .pos: return 725
+    case .positiveIntValue: return 726
+    case .prefix: return 727
+    case .preserveProtoFieldNames: return 728
+    case .preTraverse: return 729
+    case .prevPath: return 730
+    case .printUnknownFields: return 731
+    case .proto2: return 732
+    case .proto3DefaultValue: return 733
+    case .proto3Optional: return 734
+    case .protobufApiversionCheck: return 735
+    case .protobufApiversion2: return 736
+    case .protobufBool: return 737
+    case .protobufBytes: return 738
+    case .protobufDouble: return 739
+    case .protobufEnumMap: return 740
+    case .protobufExtension: return 741
+    case .protobufFixed32: return 742
+    case .protobufFixed64: return 743
+    case .protobufFloat: return 744
+    case .protobufInt32: return 745
+    case .protobufInt64: return 746
+    case .protobufMap: return 747
+    case .protobufMessageMap: return 748
+    case .protobufSfixed32: return 749
+    case .protobufSfixed64: return 750
+    case .protobufSint32: return 751
+    case .protobufSint64: return 752
+    case .protobufString: return 753
+    case .protobufUint32: return 754
+    case .protobufUint64: return 755
+    case .protobufExtensionFieldValues: return 756
+    case .protobufFieldNumber: return 757
+    case .protobufGeneratedIsEqualTo: return 758
+    case .protobufNameMap: return 759
+    case .protobufNewField: return 760
+    case .protobufPackage: return 761
+    case .protocol: return 762
+    case .protoFieldName: return 763
+    case .protoMessageName: return 764
+    case .protoNameProviding: return 765
+    case .protoPaths: return 766
+    case .public: return 767
+    case .publicDependency: return 768
+    case .putBoolValue: return 769
+    case .putBytesValue: return 770
+    case .putDoubleValue: return 771
+    case .putEnumValue: return 772
+    case .putFixedUint32: return 773
+    case .putFixedUint64: return 774
+    case .putFloatValue: return 775
+    case .putInt64: return 776
+    case .putStringValue: return 777
+    case .putUint64: return 778
+    case .putUint64Hex: return 779
+    case .putVarInt: return 780
+    case .putZigZagVarInt: return 781
+    case .pyGenericServices: return 782
+    case .r: return 783
+    case .rawChars: return 784
+    case .rawRepresentable: return 785
+    case .rawValue_: return 786
+    case .read4HexDigits: return 787
+    case .readBytes: return 788
+    case .register: return 789
+    case .removingAllFieldsOf: return 790
+    case .repeated: return 791
+    case .repeatedEnumExtensionField: return 792
+    case .repeatedExtensionField: return 793
+    case .repeatedFieldEncoding: return 794
+    case .repeatedGroupExtensionField: return 795
+    case .repeatedMessageExtensionField: return 796
+    case .repeating: return 797
+    case .replaceRepeatedFields: return 798
+    case .requestStreaming: return 799
+    case .requestTypeURL: return 800
+    case .requiredSize: return 801
+    case .responseStreaming: return 802
+    case .responseTypeURL: return 803
+    case .result: return 804
+    case .retention: return 805
+    case .rethrows: return 806
+    case .return: return 807
+    case .returnType: return 808
+    case .revision: return 809
+    case .rhs: return 810
+    case .root: return 811
+    case .rubyPackage: return 812
+    case .s: return 813
+    case .sawBackslash: return 814
+    case .sawSection4Characters: return 815
+    case .sawSection5Characters: return 816
+    case .scan: return 817
+    case .scanner: return 818
+    case .seconds: return 819
+    case .self_: return 820
+    case .semantic: return 821
+    case .sendable: return 822
+    case .separator: return 823
+    case .serialize: return 824
+    case .serializedBytes: return 825
+    case .serializedData: return 826
+    case .serializedSize: return 827
+    case .serverStreaming: return 828
+    case .service: return 829
+    case .serviceDescriptorProto: return 830
+    case .serviceOptions: return 831
+    case .set: return 832
+    case .setExtensionValue: return 833
+    case .shift: return 834
+    case .simpleExtensionMap: return 835
+    case .size: return 836
+    case .sizer: return 837
+    case .source: return 838
+    case .sourceCodeInfo: return 839
+    case .sourceContext: return 840
+    case .sourceEncoding: return 841
+    case .sourceFile: return 842
+    case .sourceLocation: return 843
+    case .span: return 844
+    case .split: return 845
+    case .start: return 846
+    case .startArray: return 847
+    case .startArrayObject: return 848
+    case .startField: return 849
+    case .startIndex: return 850
+    case .startMessageField: return 851
+    case .startObject: return 852
+    case .startRegularField: return 853
+    case .state: return 854
+    case .static: return 855
+    case .staticString: return 856
+    case .storage: return 857
+    case .string: return 858
+    case .stringLiteral: return 859
+    case .stringLiteralType: return 860
+    case .stringResult: return 861
+    case .stringValue: return 862
+    case .struct: return 863
+    case .structValue: return 864
+    case .subDecoder: return 865
+    case .subscript: return 866
+    case .subtract: return 867
+    case .subVisitor: return 868
+    case .swift: return 869
+    case .swiftPrefix: return 870
+    case .swiftProtobufContiguousBytes: return 871
+    case .swiftProtobufError: return 872
+    case .syntax: return 873
+    case .t: return 874
+    case .tag: return 875
+    case .targets: return 876
+    case .terminator: return 877
+    case .testDecoder: return 878
+    case .text: return 879
+    case .textDecoder: return 880
+    case .textFormatDecoder: return 881
+    case .textFormatDecodingError: return 882
+    case .textFormatDecodingOptions: return 883
+    case .textFormatEncodingOptions: return 884
+    case .textFormatEncodingVisitor: return 885
+    case .textFormatString: return 886
+    case .throwOrIgnore: return 887
+    case .throws: return 888
+    case .timeInterval: return 889
+    case .timeIntervalSince1970: return 890
+    case .timeIntervalSinceReferenceDate: return 891
+    case .timestamp: return 892
+    case .tmp: return 893
+    case .tooLarge: return 894
+    case .total: return 895
+    case .totalArrayDepth: return 896
+    case .totalSize: return 897
+    case .trailingComments: return 898
+    case .traverse: return 899
+    case .trim: return 900
+    case .true: return 901
+    case .try: return 902
+    case .type: return 903
+    case .typealias: return 904
+    case .typeEnum: return 905
+    case .typeName: return 906
+    case .typePrefix: return 907
+    case .typeStart: return 908
+    case .typeUnknown: return 909
+    case .typeURL: return 910
+    case .uint32: return 911
+    case .uint32Value: return 912
+    case .uint64: return 913
+    case .uint64Value: return 914
+    case .uint8: return 915
+    case .unchecked: return 916
+    case .unicodeScalarLiteral: return 917
+    case .unicodeScalarLiteralType: return 918
+    case .unicodeScalars: return 919
+    case .unicodeScalarView: return 920
+    case .uninterpretedOption: return 921
+    case .union: return 922
+    case .uniqueStorage: return 923
+    case .unknown: return 924
+    case .unknownFields: return 925
+    case .unknownStorage: return 926
+    case .unpackTo: return 927
+    case .unsafeBufferPointer: return 928
+    case .unsafeMutablePointer: return 929
+    case .unsafeMutableRawBufferPointer: return 930
+    case .unsafeRawBufferPointer: return 931
+    case .unsafeRawPointer: return 932
+    case .unverifiedLazy: return 933
+    case .updatedOptions: return 934
+    case .url: return 935
+    case .useDeterministicOrdering: return 936
+    case .utf8: return 937
+    case .utf8Ptr: return 938
+    case .utf8ToDouble: return 939
+    case .utf8Validation: return 940
+    case .utf8View: return 941
+    case .v: return 942
+    case .value: return 943
+    case .valueField: return 944
+    case .values: return 945
+    case .valueType: return 946
+    case .var: return 947
+    case .verification: return 948
+    case .verificationState: return 949
+    case .version: return 950
+    case .versionString: return 951
+    case .visitExtensionFields: return 952
+    case .visitExtensionFieldsAsMessageSet: return 953
+    case .visitMapField: return 954
+    case .visitor: return 955
+    case .visitPacked: return 956
+    case .visitPackedBoolField: return 957
+    case .visitPackedDoubleField: return 958
+    case .visitPackedEnumField: return 959
+    case .visitPackedFixed32Field: return 960
+    case .visitPackedFixed64Field: return 961
+    case .visitPackedFloatField: return 962
+    case .visitPackedInt32Field: return 963
+    case .visitPackedInt64Field: return 964
+    case .visitPackedSfixed32Field: return 965
+    case .visitPackedSfixed64Field: return 966
+    case .visitPackedSint32Field: return 967
+    case .visitPackedSint64Field: return 968
+    case .visitPackedUint32Field: return 969
+    case .visitPackedUint64Field: return 970
+    case .visitRepeated: return 971
+    case .visitRepeatedBoolField: return 972
+    case .visitRepeatedBytesField: return 973
+    case .visitRepeatedDoubleField: return 974
+    case .visitRepeatedEnumField: return 975
+    case .visitRepeatedFixed32Field: return 976
+    case .visitRepeatedFixed64Field: return 977
+    case .visitRepeatedFloatField: return 978
+    case .visitRepeatedGroupField: return 979
+    case .visitRepeatedInt32Field: return 980
+    case .visitRepeatedInt64Field: return 981
+    case .visitRepeatedMessageField: return 982
+    case .visitRepeatedSfixed32Field: return 983
+    case .visitRepeatedSfixed64Field: return 984
+    case .visitRepeatedSint32Field: return 985
+    case .visitRepeatedSint64Field: return 986
+    case .visitRepeatedStringField: return 987
+    case .visitRepeatedUint32Field: return 988
+    case .visitRepeatedUint64Field: return 989
+    case .visitSingular: return 990
+    case .visitSingularBoolField: return 991
+    case .visitSingularBytesField: return 992
+    case .visitSingularDoubleField: return 993
+    case .visitSingularEnumField: return 994
+    case .visitSingularFixed32Field: return 995
+    case .visitSingularFixed64Field: return 996
+    case .visitSingularFloatField: return 997
+    case .visitSingularGroupField: return 998
+    case .visitSingularInt32Field: return 999
     default: break
     }
     switch self {
-    case .visitSingularUint32Field: return 1000
-    case .visitSingularUint64Field: return 1001
-    case .visitUnknown: return 1002
-    case .wasDecoded: return 1003
-    case .weak: return 1004
-    case .weakDependency: return 1005
-    case .where: return 1006
-    case .wireFormat: return 1007
-    case .with: return 1008
-    case .withUnsafeBytes: return 1009
-    case .withUnsafeMutableBytes: return 1010
-    case .work: return 1011
-    case .wrapped: return 1012
-    case .wrappedType: return 1013
-    case .wrappedValue: return 1014
-    case .written: return 1015
-    case .yday: return 1016
+    case .visitSingularInt64Field: return 1000
+    case .visitSingularMessageField: return 1001
+    case .visitSingularSfixed32Field: return 1002
+    case .visitSingularSfixed64Field: return 1003
+    case .visitSingularSint32Field: return 1004
+    case .visitSingularSint64Field: return 1005
+    case .visitSingularStringField: return 1006
+    case .visitSingularUint32Field: return 1007
+    case .visitSingularUint64Field: return 1008
+    case .visitUnknown: return 1009
+    case .wasDecoded: return 1010
+    case .weak: return 1011
+    case .weakDependency: return 1012
+    case .where: return 1013
+    case .wireFormat: return 1014
+    case .with: return 1015
+    case .withUnsafeBytes: return 1016
+    case .withUnsafeMutableBytes: return 1017
+    case .work: return 1018
+    case .wrapped: return 1019
+    case .wrappedType: return 1020
+    case .wrappedValue: return 1021
+    case .written: return 1022
+    case .yday: return 1023
     case .UNRECOGNIZED(let i): return i
     default: break
     }
@@ -3205,6 +3226,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .clearEditionIntroduced,
     .clearEditionRemoved,
     .clearEnd,
+    .clearEnforceNamingStyle,
     .clearEnumType,
     .clearExtendee,
     .clearExtensionValue,
@@ -3387,6 +3409,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .emitFieldName,
     .emitFieldNumber,
     .empty,
+    .emptyAnyTypeURL,
     .emptyData,
     .encodeAsBytes,
     .encoded,
@@ -3399,6 +3422,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .endMessageField,
     .endObject,
     .endRegularField,
+    .enforceNamingStyle,
     .enum,
     .enumDescriptorProto,
     .enumOptions,
@@ -3562,6 +3586,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .hasEditionIntroduced,
     .hasEditionRemoved,
     .hasEnd,
+    .hasEnforceNamingStyle,
     .hasEnumType,
     .hasExtendee,
     .hasExtensionValue,
@@ -3663,6 +3688,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .intersect,
     .into,
     .ints,
+    .invalidAnyTypeURL,
     .isA,
     .isEqual,
     .isEqualTo,
@@ -3680,9 +3706,11 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .javaPackage,
     .javaStringCheckUtf8,
     .jsondecoder,
+    .jsondecoding,
     .jsondecodingError,
     .jsondecodingOptions,
     .jsonEncoder,
+    .jsonencoding,
     .jsonencodingError,
     .jsonencodingOptions,
     .jsonencodingVisitor,
@@ -4230,925 +4258,932 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     94: .same(proto: "clearEditionIntroduced"),
     95: .same(proto: "clearEditionRemoved"),
     96: .same(proto: "clearEnd"),
-    97: .same(proto: "clearEnumType"),
-    98: .same(proto: "clearExtendee"),
-    99: .same(proto: "clearExtensionValue"),
-    100: .same(proto: "clearFeatures"),
-    101: .same(proto: "clearFeatureSupport"),
-    102: .same(proto: "clearFieldPresence"),
-    103: .same(proto: "clearFixedFeatures"),
-    104: .same(proto: "clearFullName"),
-    105: .same(proto: "clearGoPackage"),
-    106: .same(proto: "clearIdempotencyLevel"),
-    107: .same(proto: "clearIdentifierValue"),
-    108: .same(proto: "clearInputType"),
-    109: .same(proto: "clearIsExtension"),
-    110: .same(proto: "clearJavaGenerateEqualsAndHash"),
-    111: .same(proto: "clearJavaGenericServices"),
-    112: .same(proto: "clearJavaMultipleFiles"),
-    113: .same(proto: "clearJavaOuterClassname"),
-    114: .same(proto: "clearJavaPackage"),
-    115: .same(proto: "clearJavaStringCheckUtf8"),
-    116: .same(proto: "clearJsonFormat"),
-    117: .same(proto: "clearJsonName"),
-    118: .same(proto: "clearJstype"),
-    119: .same(proto: "clearLabel"),
-    120: .same(proto: "clearLazy"),
-    121: .same(proto: "clearLeadingComments"),
-    122: .same(proto: "clearMapEntry"),
-    123: .same(proto: "clearMaximumEdition"),
-    124: .same(proto: "clearMessageEncoding"),
-    125: .same(proto: "clearMessageSetWireFormat"),
-    126: .same(proto: "clearMinimumEdition"),
-    127: .same(proto: "clearName"),
-    128: .same(proto: "clearNamePart"),
-    129: .same(proto: "clearNegativeIntValue"),
-    130: .same(proto: "clearNoStandardDescriptorAccessor"),
-    131: .same(proto: "clearNumber"),
-    132: .same(proto: "clearObjcClassPrefix"),
-    133: .same(proto: "clearOneofIndex"),
-    134: .same(proto: "clearOptimizeFor"),
-    135: .same(proto: "clearOptions"),
-    136: .same(proto: "clearOutputType"),
-    137: .same(proto: "clearOverridableFeatures"),
-    138: .same(proto: "clearPackage"),
-    139: .same(proto: "clearPacked"),
-    140: .same(proto: "clearPhpClassPrefix"),
-    141: .same(proto: "clearPhpMetadataNamespace"),
-    142: .same(proto: "clearPhpNamespace"),
-    143: .same(proto: "clearPositiveIntValue"),
-    144: .same(proto: "clearProto3Optional"),
-    145: .same(proto: "clearPyGenericServices"),
-    146: .same(proto: "clearRepeated"),
-    147: .same(proto: "clearRepeatedFieldEncoding"),
-    148: .same(proto: "clearReserved"),
-    149: .same(proto: "clearRetention"),
-    150: .same(proto: "clearRubyPackage"),
-    151: .same(proto: "clearSemantic"),
-    152: .same(proto: "clearServerStreaming"),
-    153: .same(proto: "clearSourceCodeInfo"),
-    154: .same(proto: "clearSourceContext"),
-    155: .same(proto: "clearSourceFile"),
-    156: .same(proto: "clearStart"),
-    157: .same(proto: "clearStringValue"),
-    158: .same(proto: "clearSwiftPrefix"),
-    159: .same(proto: "clearSyntax"),
-    160: .same(proto: "clearTrailingComments"),
-    161: .same(proto: "clearType"),
-    162: .same(proto: "clearTypeName"),
-    163: .same(proto: "clearUnverifiedLazy"),
-    164: .same(proto: "clearUtf8Validation"),
-    165: .same(proto: "clearValue"),
-    166: .same(proto: "clearVerification"),
-    167: .same(proto: "clearWeak"),
-    168: .same(proto: "clientStreaming"),
-    169: .same(proto: "code"),
-    170: .same(proto: "codePoint"),
-    171: .same(proto: "codeUnits"),
-    172: .same(proto: "Collection"),
-    173: .same(proto: "com"),
-    174: .same(proto: "comma"),
-    175: .same(proto: "consumedBytes"),
-    176: .same(proto: "contains"),
-    177: .same(proto: "contentsOf"),
-    178: .same(proto: "ContiguousBytes"),
-    179: .same(proto: "copy"),
-    180: .same(proto: "count"),
-    181: .same(proto: "countVarintsInBuffer"),
-    182: .same(proto: "csharpNamespace"),
-    183: .same(proto: "ctype"),
-    184: .same(proto: "customCodable"),
-    185: .same(proto: "CustomDebugStringConvertible"),
-    186: .same(proto: "CustomStringConvertible"),
-    187: .same(proto: "d"),
-    188: .same(proto: "Data"),
-    189: .same(proto: "dataResult"),
-    190: .same(proto: "date"),
-    191: .same(proto: "daySec"),
-    192: .same(proto: "daysSinceEpoch"),
-    193: .same(proto: "debugDescription"),
-    194: .same(proto: "debugRedact"),
-    195: .same(proto: "declaration"),
-    196: .same(proto: "decoded"),
-    197: .same(proto: "decodedFromJSONNull"),
-    198: .same(proto: "decodeExtensionField"),
-    199: .same(proto: "decodeExtensionFieldsAsMessageSet"),
-    200: .same(proto: "decodeJSON"),
-    201: .same(proto: "decodeMapField"),
-    202: .same(proto: "decodeMessage"),
-    203: .same(proto: "decoder"),
-    204: .same(proto: "decodeRepeated"),
-    205: .same(proto: "decodeRepeatedBoolField"),
-    206: .same(proto: "decodeRepeatedBytesField"),
-    207: .same(proto: "decodeRepeatedDoubleField"),
-    208: .same(proto: "decodeRepeatedEnumField"),
-    209: .same(proto: "decodeRepeatedFixed32Field"),
-    210: .same(proto: "decodeRepeatedFixed64Field"),
-    211: .same(proto: "decodeRepeatedFloatField"),
-    212: .same(proto: "decodeRepeatedGroupField"),
-    213: .same(proto: "decodeRepeatedInt32Field"),
-    214: .same(proto: "decodeRepeatedInt64Field"),
-    215: .same(proto: "decodeRepeatedMessageField"),
-    216: .same(proto: "decodeRepeatedSFixed32Field"),
-    217: .same(proto: "decodeRepeatedSFixed64Field"),
-    218: .same(proto: "decodeRepeatedSInt32Field"),
-    219: .same(proto: "decodeRepeatedSInt64Field"),
-    220: .same(proto: "decodeRepeatedStringField"),
-    221: .same(proto: "decodeRepeatedUInt32Field"),
-    222: .same(proto: "decodeRepeatedUInt64Field"),
-    223: .same(proto: "decodeSingular"),
-    224: .same(proto: "decodeSingularBoolField"),
-    225: .same(proto: "decodeSingularBytesField"),
-    226: .same(proto: "decodeSingularDoubleField"),
-    227: .same(proto: "decodeSingularEnumField"),
-    228: .same(proto: "decodeSingularFixed32Field"),
-    229: .same(proto: "decodeSingularFixed64Field"),
-    230: .same(proto: "decodeSingularFloatField"),
-    231: .same(proto: "decodeSingularGroupField"),
-    232: .same(proto: "decodeSingularInt32Field"),
-    233: .same(proto: "decodeSingularInt64Field"),
-    234: .same(proto: "decodeSingularMessageField"),
-    235: .same(proto: "decodeSingularSFixed32Field"),
-    236: .same(proto: "decodeSingularSFixed64Field"),
-    237: .same(proto: "decodeSingularSInt32Field"),
-    238: .same(proto: "decodeSingularSInt64Field"),
-    239: .same(proto: "decodeSingularStringField"),
-    240: .same(proto: "decodeSingularUInt32Field"),
-    241: .same(proto: "decodeSingularUInt64Field"),
-    242: .same(proto: "decodeTextFormat"),
-    243: .same(proto: "defaultAnyTypeURLPrefix"),
-    244: .same(proto: "defaults"),
-    245: .same(proto: "defaultValue"),
-    246: .same(proto: "dependency"),
-    247: .same(proto: "deprecated"),
-    248: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
-    249: .same(proto: "deprecationWarning"),
-    250: .same(proto: "description"),
-    251: .same(proto: "DescriptorProto"),
-    252: .same(proto: "Dictionary"),
-    253: .same(proto: "dictionaryLiteral"),
-    254: .same(proto: "digit"),
-    255: .same(proto: "digit0"),
-    256: .same(proto: "digit1"),
-    257: .same(proto: "digitCount"),
-    258: .same(proto: "digits"),
-    259: .same(proto: "digitValue"),
-    260: .same(proto: "discardableResult"),
-    261: .same(proto: "discardUnknownFields"),
-    262: .same(proto: "Double"),
-    263: .same(proto: "doubleValue"),
-    264: .same(proto: "Duration"),
-    265: .same(proto: "E"),
-    266: .same(proto: "edition"),
-    267: .same(proto: "EditionDefault"),
-    268: .same(proto: "editionDefaults"),
-    269: .same(proto: "editionDeprecated"),
-    270: .same(proto: "editionIntroduced"),
-    271: .same(proto: "editionRemoved"),
-    272: .same(proto: "Element"),
-    273: .same(proto: "elements"),
-    274: .same(proto: "else"),
-    275: .same(proto: "emitExtensionFieldName"),
-    276: .same(proto: "emitFieldName"),
-    277: .same(proto: "emitFieldNumber"),
-    278: .same(proto: "Empty"),
-    279: .same(proto: "emptyData"),
-    280: .same(proto: "encodeAsBytes"),
-    281: .same(proto: "encoded"),
-    282: .same(proto: "encodedJSONString"),
-    283: .same(proto: "encodedSize"),
-    284: .same(proto: "encodeField"),
-    285: .same(proto: "encoder"),
-    286: .same(proto: "end"),
-    287: .same(proto: "endArray"),
-    288: .same(proto: "endMessageField"),
-    289: .same(proto: "endObject"),
-    290: .same(proto: "endRegularField"),
-    291: .same(proto: "enum"),
-    292: .same(proto: "EnumDescriptorProto"),
-    293: .same(proto: "EnumOptions"),
-    294: .same(proto: "EnumReservedRange"),
-    295: .same(proto: "enumType"),
-    296: .same(proto: "enumvalue"),
-    297: .same(proto: "EnumValueDescriptorProto"),
-    298: .same(proto: "EnumValueOptions"),
-    299: .same(proto: "Equatable"),
-    300: .same(proto: "Error"),
-    301: .same(proto: "ExpressibleByArrayLiteral"),
-    302: .same(proto: "ExpressibleByDictionaryLiteral"),
-    303: .same(proto: "ext"),
-    304: .same(proto: "extDecoder"),
-    305: .same(proto: "extendedGraphemeClusterLiteral"),
-    306: .same(proto: "ExtendedGraphemeClusterLiteralType"),
-    307: .same(proto: "extendee"),
-    308: .same(proto: "ExtensibleMessage"),
-    309: .same(proto: "extension"),
-    310: .same(proto: "ExtensionField"),
-    311: .same(proto: "extensionFieldNumber"),
-    312: .same(proto: "ExtensionFieldValueSet"),
-    313: .same(proto: "ExtensionMap"),
-    314: .same(proto: "extensionRange"),
-    315: .same(proto: "ExtensionRangeOptions"),
-    316: .same(proto: "extensions"),
-    317: .same(proto: "extras"),
-    318: .same(proto: "F"),
-    319: .same(proto: "false"),
-    320: .same(proto: "features"),
-    321: .same(proto: "FeatureSet"),
-    322: .same(proto: "FeatureSetDefaults"),
-    323: .same(proto: "FeatureSetEditionDefault"),
-    324: .same(proto: "featureSupport"),
-    325: .same(proto: "field"),
-    326: .same(proto: "fieldData"),
-    327: .same(proto: "FieldDescriptorProto"),
-    328: .same(proto: "FieldMask"),
-    329: .same(proto: "FieldMaskError"),
-    330: .same(proto: "fieldName"),
-    331: .same(proto: "fieldNameCount"),
-    332: .same(proto: "fieldNum"),
-    333: .same(proto: "fieldNumber"),
-    334: .same(proto: "fieldNumberForProto"),
-    335: .same(proto: "FieldOptions"),
-    336: .same(proto: "fieldPresence"),
-    337: .same(proto: "fields"),
-    338: .same(proto: "fieldSize"),
-    339: .same(proto: "FieldTag"),
-    340: .same(proto: "FieldType"),
-    341: .same(proto: "file"),
-    342: .same(proto: "FileDescriptorProto"),
-    343: .same(proto: "FileDescriptorSet"),
-    344: .same(proto: "fileName"),
-    345: .same(proto: "FileOptions"),
-    346: .same(proto: "filter"),
-    347: .same(proto: "final"),
-    348: .same(proto: "finiteOnly"),
-    349: .same(proto: "first"),
-    350: .same(proto: "firstItem"),
-    351: .same(proto: "fixedFeatures"),
-    352: .same(proto: "Float"),
-    353: .same(proto: "floatLiteral"),
-    354: .same(proto: "FloatLiteralType"),
-    355: .same(proto: "FloatValue"),
-    356: .same(proto: "for"),
-    357: .same(proto: "forMessageName"),
-    358: .same(proto: "formUnion"),
-    359: .same(proto: "forReadingFrom"),
-    360: .same(proto: "forTypeURL"),
-    361: .same(proto: "ForwardParser"),
-    362: .same(proto: "forWritingInto"),
-    363: .same(proto: "from"),
-    364: .same(proto: "fromAscii2"),
-    365: .same(proto: "fromAscii4"),
-    366: .same(proto: "fromByteOffset"),
-    367: .same(proto: "fromHexDigit"),
-    368: .same(proto: "fullName"),
-    369: .same(proto: "func"),
-    370: .same(proto: "function"),
-    371: .same(proto: "G"),
-    372: .same(proto: "GeneratedCodeInfo"),
-    373: .same(proto: "get"),
-    374: .same(proto: "getExtensionValue"),
-    375: .same(proto: "googleapis"),
-    376: .same(proto: "Google_Protobuf_Any"),
-    377: .same(proto: "Google_Protobuf_Api"),
-    378: .same(proto: "Google_Protobuf_BoolValue"),
-    379: .same(proto: "Google_Protobuf_BytesValue"),
-    380: .same(proto: "Google_Protobuf_DescriptorProto"),
-    381: .same(proto: "Google_Protobuf_DoubleValue"),
-    382: .same(proto: "Google_Protobuf_Duration"),
-    383: .same(proto: "Google_Protobuf_Edition"),
-    384: .same(proto: "Google_Protobuf_Empty"),
-    385: .same(proto: "Google_Protobuf_Enum"),
-    386: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
-    387: .same(proto: "Google_Protobuf_EnumOptions"),
-    388: .same(proto: "Google_Protobuf_EnumValue"),
-    389: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    390: .same(proto: "Google_Protobuf_EnumValueOptions"),
-    391: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    392: .same(proto: "Google_Protobuf_FeatureSet"),
-    393: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
-    394: .same(proto: "Google_Protobuf_Field"),
-    395: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
-    396: .same(proto: "Google_Protobuf_FieldMask"),
-    397: .same(proto: "Google_Protobuf_FieldOptions"),
-    398: .same(proto: "Google_Protobuf_FileDescriptorProto"),
-    399: .same(proto: "Google_Protobuf_FileDescriptorSet"),
-    400: .same(proto: "Google_Protobuf_FileOptions"),
-    401: .same(proto: "Google_Protobuf_FloatValue"),
-    402: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    403: .same(proto: "Google_Protobuf_Int32Value"),
-    404: .same(proto: "Google_Protobuf_Int64Value"),
-    405: .same(proto: "Google_Protobuf_ListValue"),
-    406: .same(proto: "Google_Protobuf_MessageOptions"),
-    407: .same(proto: "Google_Protobuf_Method"),
-    408: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
-    409: .same(proto: "Google_Protobuf_MethodOptions"),
-    410: .same(proto: "Google_Protobuf_Mixin"),
-    411: .same(proto: "Google_Protobuf_NullValue"),
-    412: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
-    413: .same(proto: "Google_Protobuf_OneofOptions"),
-    414: .same(proto: "Google_Protobuf_Option"),
-    415: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    416: .same(proto: "Google_Protobuf_ServiceOptions"),
-    417: .same(proto: "Google_Protobuf_SourceCodeInfo"),
-    418: .same(proto: "Google_Protobuf_SourceContext"),
-    419: .same(proto: "Google_Protobuf_StringValue"),
-    420: .same(proto: "Google_Protobuf_Struct"),
-    421: .same(proto: "Google_Protobuf_Syntax"),
-    422: .same(proto: "Google_Protobuf_Timestamp"),
-    423: .same(proto: "Google_Protobuf_Type"),
-    424: .same(proto: "Google_Protobuf_UInt32Value"),
-    425: .same(proto: "Google_Protobuf_UInt64Value"),
-    426: .same(proto: "Google_Protobuf_UninterpretedOption"),
-    427: .same(proto: "Google_Protobuf_Value"),
-    428: .same(proto: "goPackage"),
-    429: .same(proto: "group"),
-    430: .same(proto: "groupFieldNumberStack"),
-    431: .same(proto: "groupSize"),
-    432: .same(proto: "guard"),
-    433: .same(proto: "hadOneofValue"),
-    434: .same(proto: "handleConflictingOneOf"),
-    435: .same(proto: "hasAggregateValue"),
-    436: .same(proto: "hasAllowAlias"),
-    437: .same(proto: "hasBegin"),
-    438: .same(proto: "hasCcEnableArenas"),
-    439: .same(proto: "hasCcGenericServices"),
-    440: .same(proto: "hasClientStreaming"),
-    441: .same(proto: "hasCsharpNamespace"),
-    442: .same(proto: "hasCtype"),
-    443: .same(proto: "hasDebugRedact"),
-    444: .same(proto: "hasDefaultValue"),
-    445: .same(proto: "hasDeprecated"),
-    446: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
-    447: .same(proto: "hasDeprecationWarning"),
-    448: .same(proto: "hasDoubleValue"),
-    449: .same(proto: "hasEdition"),
-    450: .same(proto: "hasEditionDeprecated"),
-    451: .same(proto: "hasEditionIntroduced"),
-    452: .same(proto: "hasEditionRemoved"),
-    453: .same(proto: "hasEnd"),
-    454: .same(proto: "hasEnumType"),
-    455: .same(proto: "hasExtendee"),
-    456: .same(proto: "hasExtensionValue"),
-    457: .same(proto: "hasFeatures"),
-    458: .same(proto: "hasFeatureSupport"),
-    459: .same(proto: "hasFieldPresence"),
-    460: .same(proto: "hasFixedFeatures"),
-    461: .same(proto: "hasFullName"),
-    462: .same(proto: "hasGoPackage"),
-    463: .same(proto: "hash"),
-    464: .same(proto: "Hashable"),
-    465: .same(proto: "hasher"),
-    466: .same(proto: "HashVisitor"),
-    467: .same(proto: "hasIdempotencyLevel"),
-    468: .same(proto: "hasIdentifierValue"),
-    469: .same(proto: "hasInputType"),
-    470: .same(proto: "hasIsExtension"),
-    471: .same(proto: "hasJavaGenerateEqualsAndHash"),
-    472: .same(proto: "hasJavaGenericServices"),
-    473: .same(proto: "hasJavaMultipleFiles"),
-    474: .same(proto: "hasJavaOuterClassname"),
-    475: .same(proto: "hasJavaPackage"),
-    476: .same(proto: "hasJavaStringCheckUtf8"),
-    477: .same(proto: "hasJsonFormat"),
-    478: .same(proto: "hasJsonName"),
-    479: .same(proto: "hasJstype"),
-    480: .same(proto: "hasLabel"),
-    481: .same(proto: "hasLazy"),
-    482: .same(proto: "hasLeadingComments"),
-    483: .same(proto: "hasMapEntry"),
-    484: .same(proto: "hasMaximumEdition"),
-    485: .same(proto: "hasMessageEncoding"),
-    486: .same(proto: "hasMessageSetWireFormat"),
-    487: .same(proto: "hasMinimumEdition"),
-    488: .same(proto: "hasName"),
-    489: .same(proto: "hasNamePart"),
-    490: .same(proto: "hasNegativeIntValue"),
-    491: .same(proto: "hasNoStandardDescriptorAccessor"),
-    492: .same(proto: "hasNumber"),
-    493: .same(proto: "hasObjcClassPrefix"),
-    494: .same(proto: "hasOneofIndex"),
-    495: .same(proto: "hasOptimizeFor"),
-    496: .same(proto: "hasOptions"),
-    497: .same(proto: "hasOutputType"),
-    498: .same(proto: "hasOverridableFeatures"),
-    499: .same(proto: "hasPackage"),
-    500: .same(proto: "hasPacked"),
-    501: .same(proto: "hasPhpClassPrefix"),
-    502: .same(proto: "hasPhpMetadataNamespace"),
-    503: .same(proto: "hasPhpNamespace"),
-    504: .same(proto: "hasPositiveIntValue"),
-    505: .same(proto: "hasProto3Optional"),
-    506: .same(proto: "hasPyGenericServices"),
-    507: .same(proto: "hasRepeated"),
-    508: .same(proto: "hasRepeatedFieldEncoding"),
-    509: .same(proto: "hasReserved"),
-    510: .same(proto: "hasRetention"),
-    511: .same(proto: "hasRubyPackage"),
-    512: .same(proto: "hasSemantic"),
-    513: .same(proto: "hasServerStreaming"),
-    514: .same(proto: "hasSourceCodeInfo"),
-    515: .same(proto: "hasSourceContext"),
-    516: .same(proto: "hasSourceFile"),
-    517: .same(proto: "hasStart"),
-    518: .same(proto: "hasStringValue"),
-    519: .same(proto: "hasSwiftPrefix"),
-    520: .same(proto: "hasSyntax"),
-    521: .same(proto: "hasTrailingComments"),
-    522: .same(proto: "hasType"),
-    523: .same(proto: "hasTypeName"),
-    524: .same(proto: "hasUnverifiedLazy"),
-    525: .same(proto: "hasUtf8Validation"),
-    526: .same(proto: "hasValue"),
-    527: .same(proto: "hasVerification"),
-    528: .same(proto: "hasWeak"),
-    529: .same(proto: "hour"),
-    530: .same(proto: "i"),
-    531: .same(proto: "idempotencyLevel"),
-    532: .same(proto: "identifierValue"),
-    533: .same(proto: "if"),
-    534: .same(proto: "ignoreUnknownExtensionFields"),
-    535: .same(proto: "ignoreUnknownFields"),
-    536: .same(proto: "index"),
-    537: .same(proto: "init"),
-    538: .same(proto: "inout"),
-    539: .same(proto: "inputType"),
-    540: .same(proto: "insert"),
-    541: .same(proto: "Int"),
-    542: .same(proto: "Int32"),
-    543: .same(proto: "Int32Value"),
-    544: .same(proto: "Int64"),
-    545: .same(proto: "Int64Value"),
-    546: .same(proto: "Int8"),
-    547: .same(proto: "integerLiteral"),
-    548: .same(proto: "IntegerLiteralType"),
-    549: .same(proto: "intern"),
-    550: .same(proto: "Internal"),
-    551: .same(proto: "InternalState"),
-    552: .same(proto: "intersect"),
-    553: .same(proto: "into"),
-    554: .same(proto: "ints"),
-    555: .same(proto: "isA"),
-    556: .same(proto: "isEqual"),
-    557: .same(proto: "isEqualTo"),
-    558: .same(proto: "isExtension"),
-    559: .same(proto: "isInitialized"),
-    560: .same(proto: "isNegative"),
-    561: .same(proto: "isPathValid"),
-    562: .same(proto: "isValid"),
-    563: .same(proto: "itemTagsEncodedSize"),
-    564: .same(proto: "iterator"),
-    565: .same(proto: "javaGenerateEqualsAndHash"),
-    566: .same(proto: "javaGenericServices"),
-    567: .same(proto: "javaMultipleFiles"),
-    568: .same(proto: "javaOuterClassname"),
-    569: .same(proto: "javaPackage"),
-    570: .same(proto: "javaStringCheckUtf8"),
-    571: .same(proto: "JSONDecoder"),
-    572: .same(proto: "JSONDecodingError"),
-    573: .same(proto: "JSONDecodingOptions"),
-    574: .same(proto: "jsonEncoder"),
-    575: .same(proto: "JSONEncodingError"),
-    576: .same(proto: "JSONEncodingOptions"),
-    577: .same(proto: "JSONEncodingVisitor"),
-    578: .same(proto: "jsonFormat"),
-    579: .same(proto: "JSONMapEncodingVisitor"),
-    580: .same(proto: "jsonName"),
-    581: .same(proto: "jsonPath"),
-    582: .same(proto: "jsonPaths"),
-    583: .same(proto: "JSONScanner"),
-    584: .same(proto: "jsonString"),
-    585: .same(proto: "jsonText"),
-    586: .same(proto: "jsonUTF8Bytes"),
-    587: .same(proto: "jsonUTF8Data"),
-    588: .same(proto: "jstype"),
-    589: .same(proto: "k"),
-    590: .same(proto: "kChunkSize"),
-    591: .same(proto: "Key"),
-    592: .same(proto: "keyField"),
-    593: .same(proto: "keyFieldOpt"),
-    594: .same(proto: "KeyType"),
-    595: .same(proto: "kind"),
-    596: .same(proto: "l"),
-    597: .same(proto: "label"),
-    598: .same(proto: "lazy"),
-    599: .same(proto: "leadingComments"),
-    600: .same(proto: "leadingDetachedComments"),
-    601: .same(proto: "length"),
-    602: .same(proto: "lessThan"),
-    603: .same(proto: "let"),
-    604: .same(proto: "lhs"),
-    605: .same(proto: "line"),
-    606: .same(proto: "list"),
-    607: .same(proto: "listOfMessages"),
-    608: .same(proto: "listValue"),
-    609: .same(proto: "littleEndian"),
-    610: .same(proto: "load"),
-    611: .same(proto: "localHasher"),
-    612: .same(proto: "location"),
-    613: .same(proto: "M"),
-    614: .same(proto: "major"),
-    615: .same(proto: "makeAsyncIterator"),
-    616: .same(proto: "makeIterator"),
-    617: .same(proto: "malformedLength"),
-    618: .same(proto: "mapEntry"),
-    619: .same(proto: "MapKeyType"),
-    620: .same(proto: "mapToMessages"),
-    621: .same(proto: "MapValueType"),
-    622: .same(proto: "mapVisitor"),
-    623: .same(proto: "mask"),
-    624: .same(proto: "maximumEdition"),
-    625: .same(proto: "mdayStart"),
-    626: .same(proto: "merge"),
-    627: .same(proto: "MergeOptions"),
-    628: .same(proto: "message"),
-    629: .same(proto: "messageDepthLimit"),
-    630: .same(proto: "messageEncoding"),
-    631: .same(proto: "MessageExtension"),
-    632: .same(proto: "MessageImplementationBase"),
-    633: .same(proto: "MessageOptions"),
-    634: .same(proto: "MessageSet"),
-    635: .same(proto: "messageSetWireFormat"),
-    636: .same(proto: "messageSize"),
-    637: .same(proto: "messageType"),
-    638: .same(proto: "Method"),
-    639: .same(proto: "MethodDescriptorProto"),
-    640: .same(proto: "MethodOptions"),
-    641: .same(proto: "methods"),
-    642: .same(proto: "min"),
-    643: .same(proto: "minimumEdition"),
-    644: .same(proto: "minor"),
-    645: .same(proto: "Mixin"),
-    646: .same(proto: "mixins"),
-    647: .same(proto: "modify"),
-    648: .same(proto: "month"),
-    649: .same(proto: "msgExtension"),
-    650: .same(proto: "mutating"),
-    651: .same(proto: "n"),
-    652: .same(proto: "name"),
-    653: .same(proto: "NameDescription"),
-    654: .same(proto: "NameMap"),
-    655: .same(proto: "NamePart"),
-    656: .same(proto: "names"),
-    657: .same(proto: "nanos"),
-    658: .same(proto: "negativeIntValue"),
-    659: .same(proto: "nestedType"),
-    660: .same(proto: "newExtensible"),
-    661: .same(proto: "newL"),
-    662: .same(proto: "newList"),
-    663: .same(proto: "newMessage"),
-    664: .same(proto: "newValue"),
-    665: .same(proto: "next"),
-    666: .same(proto: "nextByte"),
-    667: .same(proto: "nextFieldNumber"),
-    668: .same(proto: "nextVarInt"),
-    669: .same(proto: "nil"),
-    670: .same(proto: "nilLiteral"),
-    671: .same(proto: "noBytesAvailable"),
-    672: .same(proto: "noStandardDescriptorAccessor"),
-    673: .same(proto: "nullValue"),
-    674: .same(proto: "number"),
-    675: .same(proto: "numberValue"),
-    676: .same(proto: "objcClassPrefix"),
-    677: .same(proto: "of"),
-    678: .same(proto: "oneofDecl"),
-    679: .same(proto: "OneofDescriptorProto"),
-    680: .same(proto: "oneofIndex"),
-    681: .same(proto: "OneofOptions"),
-    682: .same(proto: "oneofs"),
-    683: .same(proto: "OneOf_Kind"),
-    684: .same(proto: "optimizeFor"),
-    685: .same(proto: "OptimizeMode"),
-    686: .same(proto: "Option"),
-    687: .same(proto: "OptionalEnumExtensionField"),
-    688: .same(proto: "OptionalExtensionField"),
-    689: .same(proto: "OptionalGroupExtensionField"),
-    690: .same(proto: "OptionalMessageExtensionField"),
-    691: .same(proto: "OptionRetention"),
-    692: .same(proto: "options"),
-    693: .same(proto: "OptionTargetType"),
-    694: .same(proto: "other"),
-    695: .same(proto: "others"),
-    696: .same(proto: "out"),
-    697: .same(proto: "outputType"),
-    698: .same(proto: "overridableFeatures"),
-    699: .same(proto: "p"),
-    700: .same(proto: "package"),
-    701: .same(proto: "packed"),
-    702: .same(proto: "PackedEnumExtensionField"),
-    703: .same(proto: "PackedExtensionField"),
-    704: .same(proto: "padding"),
-    705: .same(proto: "parent"),
-    706: .same(proto: "parse"),
-    707: .same(proto: "partial"),
-    708: .same(proto: "path"),
-    709: .same(proto: "PathDecoder"),
-    710: .same(proto: "PathDecodingError"),
-    711: .same(proto: "paths"),
-    712: .same(proto: "PathVisitor"),
-    713: .same(proto: "payload"),
-    714: .same(proto: "payloadSize"),
-    715: .same(proto: "phpClassPrefix"),
-    716: .same(proto: "phpMetadataNamespace"),
-    717: .same(proto: "phpNamespace"),
-    718: .same(proto: "pos"),
-    719: .same(proto: "positiveIntValue"),
-    720: .same(proto: "prefix"),
-    721: .same(proto: "preserveProtoFieldNames"),
-    722: .same(proto: "preTraverse"),
-    723: .same(proto: "prevPath"),
-    724: .same(proto: "printUnknownFields"),
-    725: .same(proto: "proto2"),
-    726: .same(proto: "proto3DefaultValue"),
-    727: .same(proto: "proto3Optional"),
-    728: .same(proto: "ProtobufAPIVersionCheck"),
-    729: .same(proto: "ProtobufAPIVersion_2"),
-    730: .same(proto: "ProtobufBool"),
-    731: .same(proto: "ProtobufBytes"),
-    732: .same(proto: "ProtobufDouble"),
-    733: .same(proto: "ProtobufEnumMap"),
-    734: .same(proto: "protobufExtension"),
-    735: .same(proto: "ProtobufFixed32"),
-    736: .same(proto: "ProtobufFixed64"),
-    737: .same(proto: "ProtobufFloat"),
-    738: .same(proto: "ProtobufInt32"),
-    739: .same(proto: "ProtobufInt64"),
-    740: .same(proto: "ProtobufMap"),
-    741: .same(proto: "ProtobufMessageMap"),
-    742: .same(proto: "ProtobufSFixed32"),
-    743: .same(proto: "ProtobufSFixed64"),
-    744: .same(proto: "ProtobufSInt32"),
-    745: .same(proto: "ProtobufSInt64"),
-    746: .same(proto: "ProtobufString"),
-    747: .same(proto: "ProtobufUInt32"),
-    748: .same(proto: "ProtobufUInt64"),
-    749: .same(proto: "protobuf_extensionFieldValues"),
-    750: .same(proto: "protobuf_fieldNumber"),
-    751: .same(proto: "protobuf_generated_isEqualTo"),
-    752: .same(proto: "protobuf_nameMap"),
-    753: .same(proto: "protobuf_newField"),
-    754: .same(proto: "protobuf_package"),
-    755: .same(proto: "protocol"),
-    756: .same(proto: "protoFieldName"),
-    757: .same(proto: "protoMessageName"),
-    758: .same(proto: "ProtoNameProviding"),
-    759: .same(proto: "protoPaths"),
-    760: .same(proto: "public"),
-    761: .same(proto: "publicDependency"),
-    762: .same(proto: "putBoolValue"),
-    763: .same(proto: "putBytesValue"),
-    764: .same(proto: "putDoubleValue"),
-    765: .same(proto: "putEnumValue"),
-    766: .same(proto: "putFixedUInt32"),
-    767: .same(proto: "putFixedUInt64"),
-    768: .same(proto: "putFloatValue"),
-    769: .same(proto: "putInt64"),
-    770: .same(proto: "putStringValue"),
-    771: .same(proto: "putUInt64"),
-    772: .same(proto: "putUInt64Hex"),
-    773: .same(proto: "putVarInt"),
-    774: .same(proto: "putZigZagVarInt"),
-    775: .same(proto: "pyGenericServices"),
-    776: .same(proto: "R"),
-    777: .same(proto: "rawChars"),
-    778: .same(proto: "RawRepresentable"),
-    779: .same(proto: "RawValue"),
-    780: .same(proto: "read4HexDigits"),
-    781: .same(proto: "readBytes"),
-    782: .same(proto: "register"),
-    783: .same(proto: "removingAllFieldsOf"),
-    784: .same(proto: "repeated"),
-    785: .same(proto: "RepeatedEnumExtensionField"),
-    786: .same(proto: "RepeatedExtensionField"),
-    787: .same(proto: "repeatedFieldEncoding"),
-    788: .same(proto: "RepeatedGroupExtensionField"),
-    789: .same(proto: "RepeatedMessageExtensionField"),
-    790: .same(proto: "repeating"),
-    791: .same(proto: "replaceRepeatedFields"),
-    792: .same(proto: "requestStreaming"),
-    793: .same(proto: "requestTypeURL"),
-    794: .same(proto: "requiredSize"),
-    795: .same(proto: "responseStreaming"),
-    796: .same(proto: "responseTypeURL"),
-    797: .same(proto: "result"),
-    798: .same(proto: "retention"),
-    799: .same(proto: "rethrows"),
-    800: .same(proto: "return"),
-    801: .same(proto: "ReturnType"),
-    802: .same(proto: "revision"),
-    803: .same(proto: "rhs"),
-    804: .same(proto: "root"),
-    805: .same(proto: "rubyPackage"),
-    806: .same(proto: "s"),
-    807: .same(proto: "sawBackslash"),
-    808: .same(proto: "sawSection4Characters"),
-    809: .same(proto: "sawSection5Characters"),
-    810: .same(proto: "scan"),
-    811: .same(proto: "scanner"),
-    812: .same(proto: "seconds"),
-    813: .same(proto: "self"),
-    814: .same(proto: "semantic"),
-    815: .same(proto: "Sendable"),
-    816: .same(proto: "separator"),
-    817: .same(proto: "serialize"),
-    818: .same(proto: "serializedBytes"),
-    819: .same(proto: "serializedData"),
-    820: .same(proto: "serializedSize"),
-    821: .same(proto: "serverStreaming"),
-    822: .same(proto: "service"),
-    823: .same(proto: "ServiceDescriptorProto"),
-    824: .same(proto: "ServiceOptions"),
-    825: .same(proto: "set"),
-    826: .same(proto: "setExtensionValue"),
-    827: .same(proto: "shift"),
-    828: .same(proto: "SimpleExtensionMap"),
-    829: .same(proto: "size"),
-    830: .same(proto: "sizer"),
-    831: .same(proto: "source"),
-    832: .same(proto: "sourceCodeInfo"),
-    833: .same(proto: "sourceContext"),
-    834: .same(proto: "sourceEncoding"),
-    835: .same(proto: "sourceFile"),
-    836: .same(proto: "SourceLocation"),
-    837: .same(proto: "span"),
-    838: .same(proto: "split"),
-    839: .same(proto: "start"),
-    840: .same(proto: "startArray"),
-    841: .same(proto: "startArrayObject"),
-    842: .same(proto: "startField"),
-    843: .same(proto: "startIndex"),
-    844: .same(proto: "startMessageField"),
-    845: .same(proto: "startObject"),
-    846: .same(proto: "startRegularField"),
-    847: .same(proto: "state"),
-    848: .same(proto: "static"),
-    849: .same(proto: "StaticString"),
-    850: .same(proto: "storage"),
-    851: .same(proto: "String"),
-    852: .same(proto: "stringLiteral"),
-    853: .same(proto: "StringLiteralType"),
-    854: .same(proto: "stringResult"),
-    855: .same(proto: "stringValue"),
-    856: .same(proto: "struct"),
-    857: .same(proto: "structValue"),
-    858: .same(proto: "subDecoder"),
-    859: .same(proto: "subscript"),
-    860: .same(proto: "subtract"),
-    861: .same(proto: "subVisitor"),
-    862: .same(proto: "Swift"),
-    863: .same(proto: "swiftPrefix"),
-    864: .same(proto: "SwiftProtobufContiguousBytes"),
-    865: .same(proto: "SwiftProtobufError"),
-    866: .same(proto: "syntax"),
-    867: .same(proto: "T"),
-    868: .same(proto: "tag"),
-    869: .same(proto: "targets"),
-    870: .same(proto: "terminator"),
-    871: .same(proto: "testDecoder"),
-    872: .same(proto: "text"),
-    873: .same(proto: "textDecoder"),
-    874: .same(proto: "TextFormatDecoder"),
-    875: .same(proto: "TextFormatDecodingError"),
-    876: .same(proto: "TextFormatDecodingOptions"),
-    877: .same(proto: "TextFormatEncodingOptions"),
-    878: .same(proto: "TextFormatEncodingVisitor"),
-    879: .same(proto: "textFormatString"),
-    880: .same(proto: "throwOrIgnore"),
-    881: .same(proto: "throws"),
-    882: .same(proto: "timeInterval"),
-    883: .same(proto: "timeIntervalSince1970"),
-    884: .same(proto: "timeIntervalSinceReferenceDate"),
-    885: .same(proto: "Timestamp"),
-    886: .same(proto: "tmp"),
-    887: .same(proto: "tooLarge"),
-    888: .same(proto: "total"),
-    889: .same(proto: "totalArrayDepth"),
-    890: .same(proto: "totalSize"),
-    891: .same(proto: "trailingComments"),
-    892: .same(proto: "traverse"),
-    893: .same(proto: "trim"),
-    894: .same(proto: "true"),
-    895: .same(proto: "try"),
-    896: .same(proto: "type"),
-    897: .same(proto: "typealias"),
-    898: .same(proto: "TypeEnum"),
-    899: .same(proto: "typeName"),
-    900: .same(proto: "typePrefix"),
-    901: .same(proto: "typeStart"),
-    902: .same(proto: "typeUnknown"),
-    903: .same(proto: "typeURL"),
-    904: .same(proto: "UInt32"),
-    905: .same(proto: "UInt32Value"),
-    906: .same(proto: "UInt64"),
-    907: .same(proto: "UInt64Value"),
-    908: .same(proto: "UInt8"),
-    909: .same(proto: "unchecked"),
-    910: .same(proto: "unicodeScalarLiteral"),
-    911: .same(proto: "UnicodeScalarLiteralType"),
-    912: .same(proto: "unicodeScalars"),
-    913: .same(proto: "UnicodeScalarView"),
-    914: .same(proto: "uninterpretedOption"),
-    915: .same(proto: "union"),
-    916: .same(proto: "uniqueStorage"),
-    917: .same(proto: "unknown"),
-    918: .same(proto: "unknownFields"),
-    919: .same(proto: "UnknownStorage"),
-    920: .same(proto: "unpackTo"),
-    921: .same(proto: "UnsafeBufferPointer"),
-    922: .same(proto: "UnsafeMutablePointer"),
-    923: .same(proto: "UnsafeMutableRawBufferPointer"),
-    924: .same(proto: "UnsafeRawBufferPointer"),
-    925: .same(proto: "UnsafeRawPointer"),
-    926: .same(proto: "unverifiedLazy"),
-    927: .same(proto: "updatedOptions"),
-    928: .same(proto: "url"),
-    929: .same(proto: "useDeterministicOrdering"),
-    930: .same(proto: "utf8"),
-    931: .same(proto: "utf8Ptr"),
-    932: .same(proto: "utf8ToDouble"),
-    933: .same(proto: "utf8Validation"),
-    934: .same(proto: "UTF8View"),
-    935: .same(proto: "v"),
-    936: .same(proto: "value"),
-    937: .same(proto: "valueField"),
-    938: .same(proto: "values"),
-    939: .same(proto: "ValueType"),
-    940: .same(proto: "var"),
-    941: .same(proto: "verification"),
-    942: .same(proto: "VerificationState"),
-    943: .same(proto: "Version"),
-    944: .same(proto: "versionString"),
-    945: .same(proto: "visitExtensionFields"),
-    946: .same(proto: "visitExtensionFieldsAsMessageSet"),
-    947: .same(proto: "visitMapField"),
-    948: .same(proto: "visitor"),
-    949: .same(proto: "visitPacked"),
-    950: .same(proto: "visitPackedBoolField"),
-    951: .same(proto: "visitPackedDoubleField"),
-    952: .same(proto: "visitPackedEnumField"),
-    953: .same(proto: "visitPackedFixed32Field"),
-    954: .same(proto: "visitPackedFixed64Field"),
-    955: .same(proto: "visitPackedFloatField"),
-    956: .same(proto: "visitPackedInt32Field"),
-    957: .same(proto: "visitPackedInt64Field"),
-    958: .same(proto: "visitPackedSFixed32Field"),
-    959: .same(proto: "visitPackedSFixed64Field"),
-    960: .same(proto: "visitPackedSInt32Field"),
-    961: .same(proto: "visitPackedSInt64Field"),
-    962: .same(proto: "visitPackedUInt32Field"),
-    963: .same(proto: "visitPackedUInt64Field"),
-    964: .same(proto: "visitRepeated"),
-    965: .same(proto: "visitRepeatedBoolField"),
-    966: .same(proto: "visitRepeatedBytesField"),
-    967: .same(proto: "visitRepeatedDoubleField"),
-    968: .same(proto: "visitRepeatedEnumField"),
-    969: .same(proto: "visitRepeatedFixed32Field"),
-    970: .same(proto: "visitRepeatedFixed64Field"),
-    971: .same(proto: "visitRepeatedFloatField"),
-    972: .same(proto: "visitRepeatedGroupField"),
-    973: .same(proto: "visitRepeatedInt32Field"),
-    974: .same(proto: "visitRepeatedInt64Field"),
-    975: .same(proto: "visitRepeatedMessageField"),
-    976: .same(proto: "visitRepeatedSFixed32Field"),
-    977: .same(proto: "visitRepeatedSFixed64Field"),
-    978: .same(proto: "visitRepeatedSInt32Field"),
-    979: .same(proto: "visitRepeatedSInt64Field"),
-    980: .same(proto: "visitRepeatedStringField"),
-    981: .same(proto: "visitRepeatedUInt32Field"),
-    982: .same(proto: "visitRepeatedUInt64Field"),
-    983: .same(proto: "visitSingular"),
-    984: .same(proto: "visitSingularBoolField"),
-    985: .same(proto: "visitSingularBytesField"),
-    986: .same(proto: "visitSingularDoubleField"),
-    987: .same(proto: "visitSingularEnumField"),
-    988: .same(proto: "visitSingularFixed32Field"),
-    989: .same(proto: "visitSingularFixed64Field"),
-    990: .same(proto: "visitSingularFloatField"),
-    991: .same(proto: "visitSingularGroupField"),
-    992: .same(proto: "visitSingularInt32Field"),
-    993: .same(proto: "visitSingularInt64Field"),
-    994: .same(proto: "visitSingularMessageField"),
-    995: .same(proto: "visitSingularSFixed32Field"),
-    996: .same(proto: "visitSingularSFixed64Field"),
-    997: .same(proto: "visitSingularSInt32Field"),
-    998: .same(proto: "visitSingularSInt64Field"),
-    999: .same(proto: "visitSingularStringField"),
-    1000: .same(proto: "visitSingularUInt32Field"),
-    1001: .same(proto: "visitSingularUInt64Field"),
-    1002: .same(proto: "visitUnknown"),
-    1003: .same(proto: "wasDecoded"),
-    1004: .same(proto: "weak"),
-    1005: .same(proto: "weakDependency"),
-    1006: .same(proto: "where"),
-    1007: .same(proto: "wireFormat"),
-    1008: .same(proto: "with"),
-    1009: .same(proto: "withUnsafeBytes"),
-    1010: .same(proto: "withUnsafeMutableBytes"),
-    1011: .same(proto: "work"),
-    1012: .same(proto: "Wrapped"),
-    1013: .same(proto: "WrappedType"),
-    1014: .same(proto: "wrappedValue"),
-    1015: .same(proto: "written"),
-    1016: .same(proto: "yday"),
+    97: .same(proto: "clearEnforceNamingStyle"),
+    98: .same(proto: "clearEnumType"),
+    99: .same(proto: "clearExtendee"),
+    100: .same(proto: "clearExtensionValue"),
+    101: .same(proto: "clearFeatures"),
+    102: .same(proto: "clearFeatureSupport"),
+    103: .same(proto: "clearFieldPresence"),
+    104: .same(proto: "clearFixedFeatures"),
+    105: .same(proto: "clearFullName"),
+    106: .same(proto: "clearGoPackage"),
+    107: .same(proto: "clearIdempotencyLevel"),
+    108: .same(proto: "clearIdentifierValue"),
+    109: .same(proto: "clearInputType"),
+    110: .same(proto: "clearIsExtension"),
+    111: .same(proto: "clearJavaGenerateEqualsAndHash"),
+    112: .same(proto: "clearJavaGenericServices"),
+    113: .same(proto: "clearJavaMultipleFiles"),
+    114: .same(proto: "clearJavaOuterClassname"),
+    115: .same(proto: "clearJavaPackage"),
+    116: .same(proto: "clearJavaStringCheckUtf8"),
+    117: .same(proto: "clearJsonFormat"),
+    118: .same(proto: "clearJsonName"),
+    119: .same(proto: "clearJstype"),
+    120: .same(proto: "clearLabel"),
+    121: .same(proto: "clearLazy"),
+    122: .same(proto: "clearLeadingComments"),
+    123: .same(proto: "clearMapEntry"),
+    124: .same(proto: "clearMaximumEdition"),
+    125: .same(proto: "clearMessageEncoding"),
+    126: .same(proto: "clearMessageSetWireFormat"),
+    127: .same(proto: "clearMinimumEdition"),
+    128: .same(proto: "clearName"),
+    129: .same(proto: "clearNamePart"),
+    130: .same(proto: "clearNegativeIntValue"),
+    131: .same(proto: "clearNoStandardDescriptorAccessor"),
+    132: .same(proto: "clearNumber"),
+    133: .same(proto: "clearObjcClassPrefix"),
+    134: .same(proto: "clearOneofIndex"),
+    135: .same(proto: "clearOptimizeFor"),
+    136: .same(proto: "clearOptions"),
+    137: .same(proto: "clearOutputType"),
+    138: .same(proto: "clearOverridableFeatures"),
+    139: .same(proto: "clearPackage"),
+    140: .same(proto: "clearPacked"),
+    141: .same(proto: "clearPhpClassPrefix"),
+    142: .same(proto: "clearPhpMetadataNamespace"),
+    143: .same(proto: "clearPhpNamespace"),
+    144: .same(proto: "clearPositiveIntValue"),
+    145: .same(proto: "clearProto3Optional"),
+    146: .same(proto: "clearPyGenericServices"),
+    147: .same(proto: "clearRepeated"),
+    148: .same(proto: "clearRepeatedFieldEncoding"),
+    149: .same(proto: "clearReserved"),
+    150: .same(proto: "clearRetention"),
+    151: .same(proto: "clearRubyPackage"),
+    152: .same(proto: "clearSemantic"),
+    153: .same(proto: "clearServerStreaming"),
+    154: .same(proto: "clearSourceCodeInfo"),
+    155: .same(proto: "clearSourceContext"),
+    156: .same(proto: "clearSourceFile"),
+    157: .same(proto: "clearStart"),
+    158: .same(proto: "clearStringValue"),
+    159: .same(proto: "clearSwiftPrefix"),
+    160: .same(proto: "clearSyntax"),
+    161: .same(proto: "clearTrailingComments"),
+    162: .same(proto: "clearType"),
+    163: .same(proto: "clearTypeName"),
+    164: .same(proto: "clearUnverifiedLazy"),
+    165: .same(proto: "clearUtf8Validation"),
+    166: .same(proto: "clearValue"),
+    167: .same(proto: "clearVerification"),
+    168: .same(proto: "clearWeak"),
+    169: .same(proto: "clientStreaming"),
+    170: .same(proto: "code"),
+    171: .same(proto: "codePoint"),
+    172: .same(proto: "codeUnits"),
+    173: .same(proto: "Collection"),
+    174: .same(proto: "com"),
+    175: .same(proto: "comma"),
+    176: .same(proto: "consumedBytes"),
+    177: .same(proto: "contains"),
+    178: .same(proto: "contentsOf"),
+    179: .same(proto: "ContiguousBytes"),
+    180: .same(proto: "copy"),
+    181: .same(proto: "count"),
+    182: .same(proto: "countVarintsInBuffer"),
+    183: .same(proto: "csharpNamespace"),
+    184: .same(proto: "ctype"),
+    185: .same(proto: "customCodable"),
+    186: .same(proto: "CustomDebugStringConvertible"),
+    187: .same(proto: "CustomStringConvertible"),
+    188: .same(proto: "d"),
+    189: .same(proto: "Data"),
+    190: .same(proto: "dataResult"),
+    191: .same(proto: "date"),
+    192: .same(proto: "daySec"),
+    193: .same(proto: "daysSinceEpoch"),
+    194: .same(proto: "debugDescription"),
+    195: .same(proto: "debugRedact"),
+    196: .same(proto: "declaration"),
+    197: .same(proto: "decoded"),
+    198: .same(proto: "decodedFromJSONNull"),
+    199: .same(proto: "decodeExtensionField"),
+    200: .same(proto: "decodeExtensionFieldsAsMessageSet"),
+    201: .same(proto: "decodeJSON"),
+    202: .same(proto: "decodeMapField"),
+    203: .same(proto: "decodeMessage"),
+    204: .same(proto: "decoder"),
+    205: .same(proto: "decodeRepeated"),
+    206: .same(proto: "decodeRepeatedBoolField"),
+    207: .same(proto: "decodeRepeatedBytesField"),
+    208: .same(proto: "decodeRepeatedDoubleField"),
+    209: .same(proto: "decodeRepeatedEnumField"),
+    210: .same(proto: "decodeRepeatedFixed32Field"),
+    211: .same(proto: "decodeRepeatedFixed64Field"),
+    212: .same(proto: "decodeRepeatedFloatField"),
+    213: .same(proto: "decodeRepeatedGroupField"),
+    214: .same(proto: "decodeRepeatedInt32Field"),
+    215: .same(proto: "decodeRepeatedInt64Field"),
+    216: .same(proto: "decodeRepeatedMessageField"),
+    217: .same(proto: "decodeRepeatedSFixed32Field"),
+    218: .same(proto: "decodeRepeatedSFixed64Field"),
+    219: .same(proto: "decodeRepeatedSInt32Field"),
+    220: .same(proto: "decodeRepeatedSInt64Field"),
+    221: .same(proto: "decodeRepeatedStringField"),
+    222: .same(proto: "decodeRepeatedUInt32Field"),
+    223: .same(proto: "decodeRepeatedUInt64Field"),
+    224: .same(proto: "decodeSingular"),
+    225: .same(proto: "decodeSingularBoolField"),
+    226: .same(proto: "decodeSingularBytesField"),
+    227: .same(proto: "decodeSingularDoubleField"),
+    228: .same(proto: "decodeSingularEnumField"),
+    229: .same(proto: "decodeSingularFixed32Field"),
+    230: .same(proto: "decodeSingularFixed64Field"),
+    231: .same(proto: "decodeSingularFloatField"),
+    232: .same(proto: "decodeSingularGroupField"),
+    233: .same(proto: "decodeSingularInt32Field"),
+    234: .same(proto: "decodeSingularInt64Field"),
+    235: .same(proto: "decodeSingularMessageField"),
+    236: .same(proto: "decodeSingularSFixed32Field"),
+    237: .same(proto: "decodeSingularSFixed64Field"),
+    238: .same(proto: "decodeSingularSInt32Field"),
+    239: .same(proto: "decodeSingularSInt64Field"),
+    240: .same(proto: "decodeSingularStringField"),
+    241: .same(proto: "decodeSingularUInt32Field"),
+    242: .same(proto: "decodeSingularUInt64Field"),
+    243: .same(proto: "decodeTextFormat"),
+    244: .same(proto: "defaultAnyTypeURLPrefix"),
+    245: .same(proto: "defaults"),
+    246: .same(proto: "defaultValue"),
+    247: .same(proto: "dependency"),
+    248: .same(proto: "deprecated"),
+    249: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
+    250: .same(proto: "deprecationWarning"),
+    251: .same(proto: "description"),
+    252: .same(proto: "DescriptorProto"),
+    253: .same(proto: "Dictionary"),
+    254: .same(proto: "dictionaryLiteral"),
+    255: .same(proto: "digit"),
+    256: .same(proto: "digit0"),
+    257: .same(proto: "digit1"),
+    258: .same(proto: "digitCount"),
+    259: .same(proto: "digits"),
+    260: .same(proto: "digitValue"),
+    261: .same(proto: "discardableResult"),
+    262: .same(proto: "discardUnknownFields"),
+    263: .same(proto: "Double"),
+    264: .same(proto: "doubleValue"),
+    265: .same(proto: "duration"),
+    266: .same(proto: "E"),
+    267: .same(proto: "edition"),
+    268: .same(proto: "EditionDefault"),
+    269: .same(proto: "editionDefaults"),
+    270: .same(proto: "editionDeprecated"),
+    271: .same(proto: "editionIntroduced"),
+    272: .same(proto: "editionRemoved"),
+    273: .same(proto: "Element"),
+    274: .same(proto: "elements"),
+    275: .same(proto: "else"),
+    276: .same(proto: "emitExtensionFieldName"),
+    277: .same(proto: "emitFieldName"),
+    278: .same(proto: "emitFieldNumber"),
+    279: .same(proto: "Empty"),
+    280: .same(proto: "emptyAnyTypeURL"),
+    281: .same(proto: "emptyData"),
+    282: .same(proto: "encodeAsBytes"),
+    283: .same(proto: "encoded"),
+    284: .same(proto: "encodedJSONString"),
+    285: .same(proto: "encodedSize"),
+    286: .same(proto: "encodeField"),
+    287: .same(proto: "encoder"),
+    288: .same(proto: "end"),
+    289: .same(proto: "endArray"),
+    290: .same(proto: "endMessageField"),
+    291: .same(proto: "endObject"),
+    292: .same(proto: "endRegularField"),
+    293: .same(proto: "enforceNamingStyle"),
+    294: .same(proto: "enum"),
+    295: .same(proto: "EnumDescriptorProto"),
+    296: .same(proto: "EnumOptions"),
+    297: .same(proto: "EnumReservedRange"),
+    298: .same(proto: "enumType"),
+    299: .same(proto: "enumvalue"),
+    300: .same(proto: "EnumValueDescriptorProto"),
+    301: .same(proto: "EnumValueOptions"),
+    302: .same(proto: "Equatable"),
+    303: .same(proto: "Error"),
+    304: .same(proto: "ExpressibleByArrayLiteral"),
+    305: .same(proto: "ExpressibleByDictionaryLiteral"),
+    306: .same(proto: "ext"),
+    307: .same(proto: "extDecoder"),
+    308: .same(proto: "extendedGraphemeClusterLiteral"),
+    309: .same(proto: "ExtendedGraphemeClusterLiteralType"),
+    310: .same(proto: "extendee"),
+    311: .same(proto: "ExtensibleMessage"),
+    312: .same(proto: "extension"),
+    313: .same(proto: "ExtensionField"),
+    314: .same(proto: "extensionFieldNumber"),
+    315: .same(proto: "ExtensionFieldValueSet"),
+    316: .same(proto: "ExtensionMap"),
+    317: .same(proto: "extensionRange"),
+    318: .same(proto: "ExtensionRangeOptions"),
+    319: .same(proto: "extensions"),
+    320: .same(proto: "extras"),
+    321: .same(proto: "F"),
+    322: .same(proto: "false"),
+    323: .same(proto: "features"),
+    324: .same(proto: "FeatureSet"),
+    325: .same(proto: "FeatureSetDefaults"),
+    326: .same(proto: "FeatureSetEditionDefault"),
+    327: .same(proto: "featureSupport"),
+    328: .same(proto: "field"),
+    329: .same(proto: "fieldData"),
+    330: .same(proto: "FieldDescriptorProto"),
+    331: .same(proto: "FieldMask"),
+    332: .same(proto: "FieldMaskError"),
+    333: .same(proto: "fieldName"),
+    334: .same(proto: "fieldNameCount"),
+    335: .same(proto: "fieldNum"),
+    336: .same(proto: "fieldNumber"),
+    337: .same(proto: "fieldNumberForProto"),
+    338: .same(proto: "FieldOptions"),
+    339: .same(proto: "fieldPresence"),
+    340: .same(proto: "fields"),
+    341: .same(proto: "fieldSize"),
+    342: .same(proto: "FieldTag"),
+    343: .same(proto: "FieldType"),
+    344: .same(proto: "file"),
+    345: .same(proto: "FileDescriptorProto"),
+    346: .same(proto: "FileDescriptorSet"),
+    347: .same(proto: "fileName"),
+    348: .same(proto: "FileOptions"),
+    349: .same(proto: "filter"),
+    350: .same(proto: "final"),
+    351: .same(proto: "finiteOnly"),
+    352: .same(proto: "first"),
+    353: .same(proto: "firstItem"),
+    354: .same(proto: "fixedFeatures"),
+    355: .same(proto: "Float"),
+    356: .same(proto: "floatLiteral"),
+    357: .same(proto: "FloatLiteralType"),
+    358: .same(proto: "FloatValue"),
+    359: .same(proto: "for"),
+    360: .same(proto: "forMessageName"),
+    361: .same(proto: "formUnion"),
+    362: .same(proto: "forReadingFrom"),
+    363: .same(proto: "forTypeURL"),
+    364: .same(proto: "ForwardParser"),
+    365: .same(proto: "forWritingInto"),
+    366: .same(proto: "from"),
+    367: .same(proto: "fromAscii2"),
+    368: .same(proto: "fromAscii4"),
+    369: .same(proto: "fromByteOffset"),
+    370: .same(proto: "fromHexDigit"),
+    371: .same(proto: "fullName"),
+    372: .same(proto: "func"),
+    373: .same(proto: "function"),
+    374: .same(proto: "G"),
+    375: .same(proto: "GeneratedCodeInfo"),
+    376: .same(proto: "get"),
+    377: .same(proto: "getExtensionValue"),
+    378: .same(proto: "googleapis"),
+    379: .same(proto: "Google_Protobuf_Any"),
+    380: .same(proto: "Google_Protobuf_Api"),
+    381: .same(proto: "Google_Protobuf_BoolValue"),
+    382: .same(proto: "Google_Protobuf_BytesValue"),
+    383: .same(proto: "Google_Protobuf_DescriptorProto"),
+    384: .same(proto: "Google_Protobuf_DoubleValue"),
+    385: .same(proto: "Google_Protobuf_Duration"),
+    386: .same(proto: "Google_Protobuf_Edition"),
+    387: .same(proto: "Google_Protobuf_Empty"),
+    388: .same(proto: "Google_Protobuf_Enum"),
+    389: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
+    390: .same(proto: "Google_Protobuf_EnumOptions"),
+    391: .same(proto: "Google_Protobuf_EnumValue"),
+    392: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    393: .same(proto: "Google_Protobuf_EnumValueOptions"),
+    394: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    395: .same(proto: "Google_Protobuf_FeatureSet"),
+    396: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
+    397: .same(proto: "Google_Protobuf_Field"),
+    398: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
+    399: .same(proto: "Google_Protobuf_FieldMask"),
+    400: .same(proto: "Google_Protobuf_FieldOptions"),
+    401: .same(proto: "Google_Protobuf_FileDescriptorProto"),
+    402: .same(proto: "Google_Protobuf_FileDescriptorSet"),
+    403: .same(proto: "Google_Protobuf_FileOptions"),
+    404: .same(proto: "Google_Protobuf_FloatValue"),
+    405: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    406: .same(proto: "Google_Protobuf_Int32Value"),
+    407: .same(proto: "Google_Protobuf_Int64Value"),
+    408: .same(proto: "Google_Protobuf_ListValue"),
+    409: .same(proto: "Google_Protobuf_MessageOptions"),
+    410: .same(proto: "Google_Protobuf_Method"),
+    411: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
+    412: .same(proto: "Google_Protobuf_MethodOptions"),
+    413: .same(proto: "Google_Protobuf_Mixin"),
+    414: .same(proto: "Google_Protobuf_NullValue"),
+    415: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
+    416: .same(proto: "Google_Protobuf_OneofOptions"),
+    417: .same(proto: "Google_Protobuf_Option"),
+    418: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    419: .same(proto: "Google_Protobuf_ServiceOptions"),
+    420: .same(proto: "Google_Protobuf_SourceCodeInfo"),
+    421: .same(proto: "Google_Protobuf_SourceContext"),
+    422: .same(proto: "Google_Protobuf_StringValue"),
+    423: .same(proto: "Google_Protobuf_Struct"),
+    424: .same(proto: "Google_Protobuf_Syntax"),
+    425: .same(proto: "Google_Protobuf_Timestamp"),
+    426: .same(proto: "Google_Protobuf_Type"),
+    427: .same(proto: "Google_Protobuf_UInt32Value"),
+    428: .same(proto: "Google_Protobuf_UInt64Value"),
+    429: .same(proto: "Google_Protobuf_UninterpretedOption"),
+    430: .same(proto: "Google_Protobuf_Value"),
+    431: .same(proto: "goPackage"),
+    432: .same(proto: "group"),
+    433: .same(proto: "groupFieldNumberStack"),
+    434: .same(proto: "groupSize"),
+    435: .same(proto: "guard"),
+    436: .same(proto: "hadOneofValue"),
+    437: .same(proto: "handleConflictingOneOf"),
+    438: .same(proto: "hasAggregateValue"),
+    439: .same(proto: "hasAllowAlias"),
+    440: .same(proto: "hasBegin"),
+    441: .same(proto: "hasCcEnableArenas"),
+    442: .same(proto: "hasCcGenericServices"),
+    443: .same(proto: "hasClientStreaming"),
+    444: .same(proto: "hasCsharpNamespace"),
+    445: .same(proto: "hasCtype"),
+    446: .same(proto: "hasDebugRedact"),
+    447: .same(proto: "hasDefaultValue"),
+    448: .same(proto: "hasDeprecated"),
+    449: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
+    450: .same(proto: "hasDeprecationWarning"),
+    451: .same(proto: "hasDoubleValue"),
+    452: .same(proto: "hasEdition"),
+    453: .same(proto: "hasEditionDeprecated"),
+    454: .same(proto: "hasEditionIntroduced"),
+    455: .same(proto: "hasEditionRemoved"),
+    456: .same(proto: "hasEnd"),
+    457: .same(proto: "hasEnforceNamingStyle"),
+    458: .same(proto: "hasEnumType"),
+    459: .same(proto: "hasExtendee"),
+    460: .same(proto: "hasExtensionValue"),
+    461: .same(proto: "hasFeatures"),
+    462: .same(proto: "hasFeatureSupport"),
+    463: .same(proto: "hasFieldPresence"),
+    464: .same(proto: "hasFixedFeatures"),
+    465: .same(proto: "hasFullName"),
+    466: .same(proto: "hasGoPackage"),
+    467: .same(proto: "hash"),
+    468: .same(proto: "Hashable"),
+    469: .same(proto: "hasher"),
+    470: .same(proto: "HashVisitor"),
+    471: .same(proto: "hasIdempotencyLevel"),
+    472: .same(proto: "hasIdentifierValue"),
+    473: .same(proto: "hasInputType"),
+    474: .same(proto: "hasIsExtension"),
+    475: .same(proto: "hasJavaGenerateEqualsAndHash"),
+    476: .same(proto: "hasJavaGenericServices"),
+    477: .same(proto: "hasJavaMultipleFiles"),
+    478: .same(proto: "hasJavaOuterClassname"),
+    479: .same(proto: "hasJavaPackage"),
+    480: .same(proto: "hasJavaStringCheckUtf8"),
+    481: .same(proto: "hasJsonFormat"),
+    482: .same(proto: "hasJsonName"),
+    483: .same(proto: "hasJstype"),
+    484: .same(proto: "hasLabel"),
+    485: .same(proto: "hasLazy"),
+    486: .same(proto: "hasLeadingComments"),
+    487: .same(proto: "hasMapEntry"),
+    488: .same(proto: "hasMaximumEdition"),
+    489: .same(proto: "hasMessageEncoding"),
+    490: .same(proto: "hasMessageSetWireFormat"),
+    491: .same(proto: "hasMinimumEdition"),
+    492: .same(proto: "hasName"),
+    493: .same(proto: "hasNamePart"),
+    494: .same(proto: "hasNegativeIntValue"),
+    495: .same(proto: "hasNoStandardDescriptorAccessor"),
+    496: .same(proto: "hasNumber"),
+    497: .same(proto: "hasObjcClassPrefix"),
+    498: .same(proto: "hasOneofIndex"),
+    499: .same(proto: "hasOptimizeFor"),
+    500: .same(proto: "hasOptions"),
+    501: .same(proto: "hasOutputType"),
+    502: .same(proto: "hasOverridableFeatures"),
+    503: .same(proto: "hasPackage"),
+    504: .same(proto: "hasPacked"),
+    505: .same(proto: "hasPhpClassPrefix"),
+    506: .same(proto: "hasPhpMetadataNamespace"),
+    507: .same(proto: "hasPhpNamespace"),
+    508: .same(proto: "hasPositiveIntValue"),
+    509: .same(proto: "hasProto3Optional"),
+    510: .same(proto: "hasPyGenericServices"),
+    511: .same(proto: "hasRepeated"),
+    512: .same(proto: "hasRepeatedFieldEncoding"),
+    513: .same(proto: "hasReserved"),
+    514: .same(proto: "hasRetention"),
+    515: .same(proto: "hasRubyPackage"),
+    516: .same(proto: "hasSemantic"),
+    517: .same(proto: "hasServerStreaming"),
+    518: .same(proto: "hasSourceCodeInfo"),
+    519: .same(proto: "hasSourceContext"),
+    520: .same(proto: "hasSourceFile"),
+    521: .same(proto: "hasStart"),
+    522: .same(proto: "hasStringValue"),
+    523: .same(proto: "hasSwiftPrefix"),
+    524: .same(proto: "hasSyntax"),
+    525: .same(proto: "hasTrailingComments"),
+    526: .same(proto: "hasType"),
+    527: .same(proto: "hasTypeName"),
+    528: .same(proto: "hasUnverifiedLazy"),
+    529: .same(proto: "hasUtf8Validation"),
+    530: .same(proto: "hasValue"),
+    531: .same(proto: "hasVerification"),
+    532: .same(proto: "hasWeak"),
+    533: .same(proto: "hour"),
+    534: .same(proto: "i"),
+    535: .same(proto: "idempotencyLevel"),
+    536: .same(proto: "identifierValue"),
+    537: .same(proto: "if"),
+    538: .same(proto: "ignoreUnknownExtensionFields"),
+    539: .same(proto: "ignoreUnknownFields"),
+    540: .same(proto: "index"),
+    541: .same(proto: "init"),
+    542: .same(proto: "inout"),
+    543: .same(proto: "inputType"),
+    544: .same(proto: "insert"),
+    545: .same(proto: "Int"),
+    546: .same(proto: "Int32"),
+    547: .same(proto: "Int32Value"),
+    548: .same(proto: "Int64"),
+    549: .same(proto: "Int64Value"),
+    550: .same(proto: "Int8"),
+    551: .same(proto: "integerLiteral"),
+    552: .same(proto: "IntegerLiteralType"),
+    553: .same(proto: "intern"),
+    554: .same(proto: "Internal"),
+    555: .same(proto: "InternalState"),
+    556: .same(proto: "intersect"),
+    557: .same(proto: "into"),
+    558: .same(proto: "ints"),
+    559: .same(proto: "invalidAnyTypeURL"),
+    560: .same(proto: "isA"),
+    561: .same(proto: "isEqual"),
+    562: .same(proto: "isEqualTo"),
+    563: .same(proto: "isExtension"),
+    564: .same(proto: "isInitialized"),
+    565: .same(proto: "isNegative"),
+    566: .same(proto: "isPathValid"),
+    567: .same(proto: "isValid"),
+    568: .same(proto: "itemTagsEncodedSize"),
+    569: .same(proto: "iterator"),
+    570: .same(proto: "javaGenerateEqualsAndHash"),
+    571: .same(proto: "javaGenericServices"),
+    572: .same(proto: "javaMultipleFiles"),
+    573: .same(proto: "javaOuterClassname"),
+    574: .same(proto: "javaPackage"),
+    575: .same(proto: "javaStringCheckUtf8"),
+    576: .same(proto: "JSONDecoder"),
+    577: .same(proto: "JSONDecoding"),
+    578: .same(proto: "JSONDecodingError"),
+    579: .same(proto: "JSONDecodingOptions"),
+    580: .same(proto: "jsonEncoder"),
+    581: .same(proto: "JSONEncoding"),
+    582: .same(proto: "JSONEncodingError"),
+    583: .same(proto: "JSONEncodingOptions"),
+    584: .same(proto: "JSONEncodingVisitor"),
+    585: .same(proto: "jsonFormat"),
+    586: .same(proto: "JSONMapEncodingVisitor"),
+    587: .same(proto: "jsonName"),
+    588: .same(proto: "jsonPath"),
+    589: .same(proto: "jsonPaths"),
+    590: .same(proto: "JSONScanner"),
+    591: .same(proto: "jsonString"),
+    592: .same(proto: "jsonText"),
+    593: .same(proto: "jsonUTF8Bytes"),
+    594: .same(proto: "jsonUTF8Data"),
+    595: .same(proto: "jstype"),
+    596: .same(proto: "k"),
+    597: .same(proto: "kChunkSize"),
+    598: .same(proto: "Key"),
+    599: .same(proto: "keyField"),
+    600: .same(proto: "keyFieldOpt"),
+    601: .same(proto: "KeyType"),
+    602: .same(proto: "kind"),
+    603: .same(proto: "l"),
+    604: .same(proto: "label"),
+    605: .same(proto: "lazy"),
+    606: .same(proto: "leadingComments"),
+    607: .same(proto: "leadingDetachedComments"),
+    608: .same(proto: "length"),
+    609: .same(proto: "lessThan"),
+    610: .same(proto: "let"),
+    611: .same(proto: "lhs"),
+    612: .same(proto: "line"),
+    613: .same(proto: "list"),
+    614: .same(proto: "listOfMessages"),
+    615: .same(proto: "listValue"),
+    616: .same(proto: "littleEndian"),
+    617: .same(proto: "load"),
+    618: .same(proto: "localHasher"),
+    619: .same(proto: "location"),
+    620: .same(proto: "M"),
+    621: .same(proto: "major"),
+    622: .same(proto: "makeAsyncIterator"),
+    623: .same(proto: "makeIterator"),
+    624: .same(proto: "malformedLength"),
+    625: .same(proto: "mapEntry"),
+    626: .same(proto: "MapKeyType"),
+    627: .same(proto: "mapToMessages"),
+    628: .same(proto: "MapValueType"),
+    629: .same(proto: "mapVisitor"),
+    630: .same(proto: "mask"),
+    631: .same(proto: "maximumEdition"),
+    632: .same(proto: "mdayStart"),
+    633: .same(proto: "merge"),
+    634: .same(proto: "MergeOptions"),
+    635: .same(proto: "message"),
+    636: .same(proto: "messageDepthLimit"),
+    637: .same(proto: "messageEncoding"),
+    638: .same(proto: "MessageExtension"),
+    639: .same(proto: "MessageImplementationBase"),
+    640: .same(proto: "MessageOptions"),
+    641: .same(proto: "MessageSet"),
+    642: .same(proto: "messageSetWireFormat"),
+    643: .same(proto: "messageSize"),
+    644: .same(proto: "messageType"),
+    645: .same(proto: "Method"),
+    646: .same(proto: "MethodDescriptorProto"),
+    647: .same(proto: "MethodOptions"),
+    648: .same(proto: "methods"),
+    649: .same(proto: "min"),
+    650: .same(proto: "minimumEdition"),
+    651: .same(proto: "minor"),
+    652: .same(proto: "Mixin"),
+    653: .same(proto: "mixins"),
+    654: .same(proto: "modify"),
+    655: .same(proto: "month"),
+    656: .same(proto: "msgExtension"),
+    657: .same(proto: "mutating"),
+    658: .same(proto: "n"),
+    659: .same(proto: "name"),
+    660: .same(proto: "NameDescription"),
+    661: .same(proto: "NameMap"),
+    662: .same(proto: "NamePart"),
+    663: .same(proto: "names"),
+    664: .same(proto: "nanos"),
+    665: .same(proto: "negativeIntValue"),
+    666: .same(proto: "nestedType"),
+    667: .same(proto: "newExtensible"),
+    668: .same(proto: "newL"),
+    669: .same(proto: "newList"),
+    670: .same(proto: "newMessage"),
+    671: .same(proto: "newValue"),
+    672: .same(proto: "next"),
+    673: .same(proto: "nextByte"),
+    674: .same(proto: "nextFieldNumber"),
+    675: .same(proto: "nextVarInt"),
+    676: .same(proto: "nil"),
+    677: .same(proto: "nilLiteral"),
+    678: .same(proto: "noBytesAvailable"),
+    679: .same(proto: "noStandardDescriptorAccessor"),
+    680: .same(proto: "nullValue"),
+    681: .same(proto: "number"),
+    682: .same(proto: "numberValue"),
+    683: .same(proto: "objcClassPrefix"),
+    684: .same(proto: "of"),
+    685: .same(proto: "oneofDecl"),
+    686: .same(proto: "OneofDescriptorProto"),
+    687: .same(proto: "oneofIndex"),
+    688: .same(proto: "OneofOptions"),
+    689: .same(proto: "oneofs"),
+    690: .same(proto: "OneOf_Kind"),
+    691: .same(proto: "optimizeFor"),
+    692: .same(proto: "OptimizeMode"),
+    693: .same(proto: "Option"),
+    694: .same(proto: "OptionalEnumExtensionField"),
+    695: .same(proto: "OptionalExtensionField"),
+    696: .same(proto: "OptionalGroupExtensionField"),
+    697: .same(proto: "OptionalMessageExtensionField"),
+    698: .same(proto: "OptionRetention"),
+    699: .same(proto: "options"),
+    700: .same(proto: "OptionTargetType"),
+    701: .same(proto: "other"),
+    702: .same(proto: "others"),
+    703: .same(proto: "out"),
+    704: .same(proto: "outputType"),
+    705: .same(proto: "overridableFeatures"),
+    706: .same(proto: "p"),
+    707: .same(proto: "package"),
+    708: .same(proto: "packed"),
+    709: .same(proto: "PackedEnumExtensionField"),
+    710: .same(proto: "PackedExtensionField"),
+    711: .same(proto: "padding"),
+    712: .same(proto: "parent"),
+    713: .same(proto: "parse"),
+    714: .same(proto: "partial"),
+    715: .same(proto: "path"),
+    716: .same(proto: "PathDecoder"),
+    717: .same(proto: "PathDecodingError"),
+    718: .same(proto: "paths"),
+    719: .same(proto: "PathVisitor"),
+    720: .same(proto: "payload"),
+    721: .same(proto: "payloadSize"),
+    722: .same(proto: "phpClassPrefix"),
+    723: .same(proto: "phpMetadataNamespace"),
+    724: .same(proto: "phpNamespace"),
+    725: .same(proto: "pos"),
+    726: .same(proto: "positiveIntValue"),
+    727: .same(proto: "prefix"),
+    728: .same(proto: "preserveProtoFieldNames"),
+    729: .same(proto: "preTraverse"),
+    730: .same(proto: "prevPath"),
+    731: .same(proto: "printUnknownFields"),
+    732: .same(proto: "proto2"),
+    733: .same(proto: "proto3DefaultValue"),
+    734: .same(proto: "proto3Optional"),
+    735: .same(proto: "ProtobufAPIVersionCheck"),
+    736: .same(proto: "ProtobufAPIVersion_2"),
+    737: .same(proto: "ProtobufBool"),
+    738: .same(proto: "ProtobufBytes"),
+    739: .same(proto: "ProtobufDouble"),
+    740: .same(proto: "ProtobufEnumMap"),
+    741: .same(proto: "protobufExtension"),
+    742: .same(proto: "ProtobufFixed32"),
+    743: .same(proto: "ProtobufFixed64"),
+    744: .same(proto: "ProtobufFloat"),
+    745: .same(proto: "ProtobufInt32"),
+    746: .same(proto: "ProtobufInt64"),
+    747: .same(proto: "ProtobufMap"),
+    748: .same(proto: "ProtobufMessageMap"),
+    749: .same(proto: "ProtobufSFixed32"),
+    750: .same(proto: "ProtobufSFixed64"),
+    751: .same(proto: "ProtobufSInt32"),
+    752: .same(proto: "ProtobufSInt64"),
+    753: .same(proto: "ProtobufString"),
+    754: .same(proto: "ProtobufUInt32"),
+    755: .same(proto: "ProtobufUInt64"),
+    756: .same(proto: "protobuf_extensionFieldValues"),
+    757: .same(proto: "protobuf_fieldNumber"),
+    758: .same(proto: "protobuf_generated_isEqualTo"),
+    759: .same(proto: "protobuf_nameMap"),
+    760: .same(proto: "protobuf_newField"),
+    761: .same(proto: "protobuf_package"),
+    762: .same(proto: "protocol"),
+    763: .same(proto: "protoFieldName"),
+    764: .same(proto: "protoMessageName"),
+    765: .same(proto: "ProtoNameProviding"),
+    766: .same(proto: "protoPaths"),
+    767: .same(proto: "public"),
+    768: .same(proto: "publicDependency"),
+    769: .same(proto: "putBoolValue"),
+    770: .same(proto: "putBytesValue"),
+    771: .same(proto: "putDoubleValue"),
+    772: .same(proto: "putEnumValue"),
+    773: .same(proto: "putFixedUInt32"),
+    774: .same(proto: "putFixedUInt64"),
+    775: .same(proto: "putFloatValue"),
+    776: .same(proto: "putInt64"),
+    777: .same(proto: "putStringValue"),
+    778: .same(proto: "putUInt64"),
+    779: .same(proto: "putUInt64Hex"),
+    780: .same(proto: "putVarInt"),
+    781: .same(proto: "putZigZagVarInt"),
+    782: .same(proto: "pyGenericServices"),
+    783: .same(proto: "R"),
+    784: .same(proto: "rawChars"),
+    785: .same(proto: "RawRepresentable"),
+    786: .same(proto: "RawValue"),
+    787: .same(proto: "read4HexDigits"),
+    788: .same(proto: "readBytes"),
+    789: .same(proto: "register"),
+    790: .same(proto: "removingAllFieldsOf"),
+    791: .same(proto: "repeated"),
+    792: .same(proto: "RepeatedEnumExtensionField"),
+    793: .same(proto: "RepeatedExtensionField"),
+    794: .same(proto: "repeatedFieldEncoding"),
+    795: .same(proto: "RepeatedGroupExtensionField"),
+    796: .same(proto: "RepeatedMessageExtensionField"),
+    797: .same(proto: "repeating"),
+    798: .same(proto: "replaceRepeatedFields"),
+    799: .same(proto: "requestStreaming"),
+    800: .same(proto: "requestTypeURL"),
+    801: .same(proto: "requiredSize"),
+    802: .same(proto: "responseStreaming"),
+    803: .same(proto: "responseTypeURL"),
+    804: .same(proto: "result"),
+    805: .same(proto: "retention"),
+    806: .same(proto: "rethrows"),
+    807: .same(proto: "return"),
+    808: .same(proto: "ReturnType"),
+    809: .same(proto: "revision"),
+    810: .same(proto: "rhs"),
+    811: .same(proto: "root"),
+    812: .same(proto: "rubyPackage"),
+    813: .same(proto: "s"),
+    814: .same(proto: "sawBackslash"),
+    815: .same(proto: "sawSection4Characters"),
+    816: .same(proto: "sawSection5Characters"),
+    817: .same(proto: "scan"),
+    818: .same(proto: "scanner"),
+    819: .same(proto: "seconds"),
+    820: .same(proto: "self"),
+    821: .same(proto: "semantic"),
+    822: .same(proto: "Sendable"),
+    823: .same(proto: "separator"),
+    824: .same(proto: "serialize"),
+    825: .same(proto: "serializedBytes"),
+    826: .same(proto: "serializedData"),
+    827: .same(proto: "serializedSize"),
+    828: .same(proto: "serverStreaming"),
+    829: .same(proto: "service"),
+    830: .same(proto: "ServiceDescriptorProto"),
+    831: .same(proto: "ServiceOptions"),
+    832: .same(proto: "set"),
+    833: .same(proto: "setExtensionValue"),
+    834: .same(proto: "shift"),
+    835: .same(proto: "SimpleExtensionMap"),
+    836: .same(proto: "size"),
+    837: .same(proto: "sizer"),
+    838: .same(proto: "source"),
+    839: .same(proto: "sourceCodeInfo"),
+    840: .same(proto: "sourceContext"),
+    841: .same(proto: "sourceEncoding"),
+    842: .same(proto: "sourceFile"),
+    843: .same(proto: "SourceLocation"),
+    844: .same(proto: "span"),
+    845: .same(proto: "split"),
+    846: .same(proto: "start"),
+    847: .same(proto: "startArray"),
+    848: .same(proto: "startArrayObject"),
+    849: .same(proto: "startField"),
+    850: .same(proto: "startIndex"),
+    851: .same(proto: "startMessageField"),
+    852: .same(proto: "startObject"),
+    853: .same(proto: "startRegularField"),
+    854: .same(proto: "state"),
+    855: .same(proto: "static"),
+    856: .same(proto: "StaticString"),
+    857: .same(proto: "storage"),
+    858: .same(proto: "String"),
+    859: .same(proto: "stringLiteral"),
+    860: .same(proto: "StringLiteralType"),
+    861: .same(proto: "stringResult"),
+    862: .same(proto: "stringValue"),
+    863: .same(proto: "struct"),
+    864: .same(proto: "structValue"),
+    865: .same(proto: "subDecoder"),
+    866: .same(proto: "subscript"),
+    867: .same(proto: "subtract"),
+    868: .same(proto: "subVisitor"),
+    869: .same(proto: "Swift"),
+    870: .same(proto: "swiftPrefix"),
+    871: .same(proto: "SwiftProtobufContiguousBytes"),
+    872: .same(proto: "SwiftProtobufError"),
+    873: .same(proto: "syntax"),
+    874: .same(proto: "T"),
+    875: .same(proto: "tag"),
+    876: .same(proto: "targets"),
+    877: .same(proto: "terminator"),
+    878: .same(proto: "testDecoder"),
+    879: .same(proto: "text"),
+    880: .same(proto: "textDecoder"),
+    881: .same(proto: "TextFormatDecoder"),
+    882: .same(proto: "TextFormatDecodingError"),
+    883: .same(proto: "TextFormatDecodingOptions"),
+    884: .same(proto: "TextFormatEncodingOptions"),
+    885: .same(proto: "TextFormatEncodingVisitor"),
+    886: .same(proto: "textFormatString"),
+    887: .same(proto: "throwOrIgnore"),
+    888: .same(proto: "throws"),
+    889: .same(proto: "timeInterval"),
+    890: .same(proto: "timeIntervalSince1970"),
+    891: .same(proto: "timeIntervalSinceReferenceDate"),
+    892: .same(proto: "Timestamp"),
+    893: .same(proto: "tmp"),
+    894: .same(proto: "tooLarge"),
+    895: .same(proto: "total"),
+    896: .same(proto: "totalArrayDepth"),
+    897: .same(proto: "totalSize"),
+    898: .same(proto: "trailingComments"),
+    899: .same(proto: "traverse"),
+    900: .same(proto: "trim"),
+    901: .same(proto: "true"),
+    902: .same(proto: "try"),
+    903: .same(proto: "type"),
+    904: .same(proto: "typealias"),
+    905: .same(proto: "TypeEnum"),
+    906: .same(proto: "typeName"),
+    907: .same(proto: "typePrefix"),
+    908: .same(proto: "typeStart"),
+    909: .same(proto: "typeUnknown"),
+    910: .same(proto: "typeURL"),
+    911: .same(proto: "UInt32"),
+    912: .same(proto: "UInt32Value"),
+    913: .same(proto: "UInt64"),
+    914: .same(proto: "UInt64Value"),
+    915: .same(proto: "UInt8"),
+    916: .same(proto: "unchecked"),
+    917: .same(proto: "unicodeScalarLiteral"),
+    918: .same(proto: "UnicodeScalarLiteralType"),
+    919: .same(proto: "unicodeScalars"),
+    920: .same(proto: "UnicodeScalarView"),
+    921: .same(proto: "uninterpretedOption"),
+    922: .same(proto: "union"),
+    923: .same(proto: "uniqueStorage"),
+    924: .same(proto: "unknown"),
+    925: .same(proto: "unknownFields"),
+    926: .same(proto: "UnknownStorage"),
+    927: .same(proto: "unpackTo"),
+    928: .same(proto: "UnsafeBufferPointer"),
+    929: .same(proto: "UnsafeMutablePointer"),
+    930: .same(proto: "UnsafeMutableRawBufferPointer"),
+    931: .same(proto: "UnsafeRawBufferPointer"),
+    932: .same(proto: "UnsafeRawPointer"),
+    933: .same(proto: "unverifiedLazy"),
+    934: .same(proto: "updatedOptions"),
+    935: .same(proto: "url"),
+    936: .same(proto: "useDeterministicOrdering"),
+    937: .same(proto: "utf8"),
+    938: .same(proto: "utf8Ptr"),
+    939: .same(proto: "utf8ToDouble"),
+    940: .same(proto: "utf8Validation"),
+    941: .same(proto: "UTF8View"),
+    942: .same(proto: "v"),
+    943: .same(proto: "value"),
+    944: .same(proto: "valueField"),
+    945: .same(proto: "values"),
+    946: .same(proto: "ValueType"),
+    947: .same(proto: "var"),
+    948: .same(proto: "verification"),
+    949: .same(proto: "VerificationState"),
+    950: .same(proto: "Version"),
+    951: .same(proto: "versionString"),
+    952: .same(proto: "visitExtensionFields"),
+    953: .same(proto: "visitExtensionFieldsAsMessageSet"),
+    954: .same(proto: "visitMapField"),
+    955: .same(proto: "visitor"),
+    956: .same(proto: "visitPacked"),
+    957: .same(proto: "visitPackedBoolField"),
+    958: .same(proto: "visitPackedDoubleField"),
+    959: .same(proto: "visitPackedEnumField"),
+    960: .same(proto: "visitPackedFixed32Field"),
+    961: .same(proto: "visitPackedFixed64Field"),
+    962: .same(proto: "visitPackedFloatField"),
+    963: .same(proto: "visitPackedInt32Field"),
+    964: .same(proto: "visitPackedInt64Field"),
+    965: .same(proto: "visitPackedSFixed32Field"),
+    966: .same(proto: "visitPackedSFixed64Field"),
+    967: .same(proto: "visitPackedSInt32Field"),
+    968: .same(proto: "visitPackedSInt64Field"),
+    969: .same(proto: "visitPackedUInt32Field"),
+    970: .same(proto: "visitPackedUInt64Field"),
+    971: .same(proto: "visitRepeated"),
+    972: .same(proto: "visitRepeatedBoolField"),
+    973: .same(proto: "visitRepeatedBytesField"),
+    974: .same(proto: "visitRepeatedDoubleField"),
+    975: .same(proto: "visitRepeatedEnumField"),
+    976: .same(proto: "visitRepeatedFixed32Field"),
+    977: .same(proto: "visitRepeatedFixed64Field"),
+    978: .same(proto: "visitRepeatedFloatField"),
+    979: .same(proto: "visitRepeatedGroupField"),
+    980: .same(proto: "visitRepeatedInt32Field"),
+    981: .same(proto: "visitRepeatedInt64Field"),
+    982: .same(proto: "visitRepeatedMessageField"),
+    983: .same(proto: "visitRepeatedSFixed32Field"),
+    984: .same(proto: "visitRepeatedSFixed64Field"),
+    985: .same(proto: "visitRepeatedSInt32Field"),
+    986: .same(proto: "visitRepeatedSInt64Field"),
+    987: .same(proto: "visitRepeatedStringField"),
+    988: .same(proto: "visitRepeatedUInt32Field"),
+    989: .same(proto: "visitRepeatedUInt64Field"),
+    990: .same(proto: "visitSingular"),
+    991: .same(proto: "visitSingularBoolField"),
+    992: .same(proto: "visitSingularBytesField"),
+    993: .same(proto: "visitSingularDoubleField"),
+    994: .same(proto: "visitSingularEnumField"),
+    995: .same(proto: "visitSingularFixed32Field"),
+    996: .same(proto: "visitSingularFixed64Field"),
+    997: .same(proto: "visitSingularFloatField"),
+    998: .same(proto: "visitSingularGroupField"),
+    999: .same(proto: "visitSingularInt32Field"),
+    1000: .same(proto: "visitSingularInt64Field"),
+    1001: .same(proto: "visitSingularMessageField"),
+    1002: .same(proto: "visitSingularSFixed32Field"),
+    1003: .same(proto: "visitSingularSFixed64Field"),
+    1004: .same(proto: "visitSingularSInt32Field"),
+    1005: .same(proto: "visitSingularSInt64Field"),
+    1006: .same(proto: "visitSingularStringField"),
+    1007: .same(proto: "visitSingularUInt32Field"),
+    1008: .same(proto: "visitSingularUInt64Field"),
+    1009: .same(proto: "visitUnknown"),
+    1010: .same(proto: "wasDecoded"),
+    1011: .same(proto: "weak"),
+    1012: .same(proto: "weakDependency"),
+    1013: .same(proto: "where"),
+    1014: .same(proto: "wireFormat"),
+    1015: .same(proto: "with"),
+    1016: .same(proto: "withUnsafeBytes"),
+    1017: .same(proto: "withUnsafeMutableBytes"),
+    1018: .same(proto: "work"),
+    1019: .same(proto: "Wrapped"),
+    1020: .same(proto: "WrappedType"),
+    1021: .same(proto: "wrappedValue"),
+    1022: .same(proto: "written"),
+    1023: .same(proto: "yday"),
   ]
 }
diff --git a/Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift b/Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift
index 5b6b008f5..d68e06030 100644
--- a/Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift
+++ b/Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift
@@ -2911,6 +2911,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum clearEnforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneClearEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneClearEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneClearEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneClearEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnforceNamingStyle] = [
+      .noneClearEnforceNamingStyle,
+    ]
+
+  }
+
   enum clearEnumType: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneClearEnumType // = 0
@@ -7921,7 +7951,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Duration: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum duration: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDuration // = 0
     case UNRECOGNIZED(Int)
@@ -7945,7 +7975,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration] = [
       .noneDuration,
     ]
 
@@ -8371,6 +8401,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum emptyAnyTypeURL: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneEmptyAnyTypeURL // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneEmptyAnyTypeURL
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneEmptyAnyTypeURL
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneEmptyAnyTypeURL: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyAnyTypeURL] = [
+      .noneEmptyAnyTypeURL,
+    ]
+
+  }
+
   enum emptyData: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneEmptyData // = 0
@@ -8731,6 +8791,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum enforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enforceNamingStyle] = [
+      .noneEnforceNamingStyle,
+    ]
+
+  }
+
   enum enumEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneEnum // = 0
@@ -13621,6 +13711,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum hasEnforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneHasEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneHasEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneHasEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneHasEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnforceNamingStyle] = [
+      .noneHasEnforceNamingStyle,
+    ]
+
+  }
+
   enum hasEnumType: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneHasEnumType // = 0
@@ -16651,6 +16771,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum invalidAnyTypeURL: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneInvalidAnyTypeURL // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneInvalidAnyTypeURL
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneInvalidAnyTypeURL
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneInvalidAnyTypeURL: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.invalidAnyTypeURL] = [
+      .noneInvalidAnyTypeURL,
+    ]
+
+  }
+
   enum isA: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneIsA // = 0
@@ -17161,6 +17311,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum JSONDecoding: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneJsondecoding // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneJsondecoding
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneJsondecoding
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneJsondecoding: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoding] = [
+      .noneJsondecoding,
+    ]
+
+  }
+
   enum JSONDecodingError: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneJsondecodingError // = 0
@@ -17251,6 +17431,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum JSONEncoding: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneJsonencoding // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneJsonencoding
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneJsonencoding
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneJsonencoding: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncoding] = [
+      .noneJsonencoding,
+    ]
+
+  }
+
   enum JSONEncodingError: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneJsonencodingError // = 0
@@ -31113,6 +31323,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnd: Swif
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_clearEnforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_clearEnumType"),
@@ -32115,9 +32331,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.doubleValue: S
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Duration"),
+    0: .same(proto: "NONE_duration"),
   ]
 }
 
@@ -32205,6 +32421,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Empty: SwiftPr
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyAnyTypeURL: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_emptyAnyTypeURL"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyData: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_emptyData"),
@@ -32277,6 +32499,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.endRegularFiel
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_enforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enumEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_enum"),
@@ -33255,6 +33483,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnd: SwiftP
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_hasEnforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_hasEnumType"),
@@ -33861,6 +34095,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ints: SwiftPro
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.invalidAnyTypeURL: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_invalidAnyTypeURL"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.isA: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_isA"),
@@ -33963,6 +34203,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoder: S
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoding: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_JSONDecoding"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecodingError: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_JSONDecodingError"),
@@ -33981,6 +34227,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.jsonEncoder: S
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncoding: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_JSONEncoding"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncodingError: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_JSONEncodingError"),
diff --git a/Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift b/Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift
index 8786f008c..5c01c5fa1 100644
--- a/Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift
+++ b/Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift
@@ -509,6 +509,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._clearEnd_p = newValue}
   }
 
+  var clearEnforceNamingStyle_p: Int32 {
+    get {return _storage._clearEnforceNamingStyle_p}
+    set {_uniqueStorage()._clearEnforceNamingStyle_p = newValue}
+  }
+
   var clearEnumType_p: Int32 {
     get {return _storage._clearEnumType_p}
     set {_uniqueStorage()._clearEnumType_p = newValue}
@@ -1419,6 +1424,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._empty = newValue}
   }
 
+  var emptyAnyTypeURL: Int32 {
+    get {return _storage._emptyAnyTypeURL}
+    set {_uniqueStorage()._emptyAnyTypeURL = newValue}
+  }
+
   var emptyData: Int32 {
     get {return _storage._emptyData}
     set {_uniqueStorage()._emptyData = newValue}
@@ -1479,6 +1489,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._endRegularField = newValue}
   }
 
+  var enforceNamingStyle: Int32 {
+    get {return _storage._enforceNamingStyle}
+    set {_uniqueStorage()._enforceNamingStyle = newValue}
+  }
+
   var `enum`: Int32 {
     get {return _storage._enum}
     set {_uniqueStorage()._enum = newValue}
@@ -2294,6 +2309,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._hasEnd_p = newValue}
   }
 
+  var hasEnforceNamingStyle_p: Int32 {
+    get {return _storage._hasEnforceNamingStyle_p}
+    set {_uniqueStorage()._hasEnforceNamingStyle_p = newValue}
+  }
+
   var hasEnumType_p: Int32 {
     get {return _storage._hasEnumType_p}
     set {_uniqueStorage()._hasEnumType_p = newValue}
@@ -2799,6 +2819,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._ints = newValue}
   }
 
+  var invalidAnyTypeURL: Int32 {
+    get {return _storage._invalidAnyTypeURL}
+    set {_uniqueStorage()._invalidAnyTypeURL = newValue}
+  }
+
   var isA: Int32 {
     get {return _storage._isA}
     set {_uniqueStorage()._isA = newValue}
@@ -2884,6 +2909,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._jsondecoder = newValue}
   }
 
+  var jsondecoding: Int32 {
+    get {return _storage._jsondecoding}
+    set {_uniqueStorage()._jsondecoding = newValue}
+  }
+
   var jsondecodingError: Int32 {
     get {return _storage._jsondecodingError}
     set {_uniqueStorage()._jsondecodingError = newValue}
@@ -2899,6 +2929,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._jsonEncoder = newValue}
   }
 
+  var jsonencoding: Int32 {
+    get {return _storage._jsonencoding}
+    set {_uniqueStorage()._jsonencoding = newValue}
+  }
+
   var jsonencodingError: Int32 {
     get {return _storage._jsonencodingError}
     set {_uniqueStorage()._jsonencodingError = newValue}
@@ -5219,926 +5254,933 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     94: .same(proto: "clearEditionIntroduced"),
     95: .same(proto: "clearEditionRemoved"),
     96: .same(proto: "clearEnd"),
-    97: .same(proto: "clearEnumType"),
-    98: .same(proto: "clearExtendee"),
-    99: .same(proto: "clearExtensionValue"),
-    100: .same(proto: "clearFeatures"),
-    101: .same(proto: "clearFeatureSupport"),
-    102: .same(proto: "clearFieldPresence"),
-    103: .same(proto: "clearFixedFeatures"),
-    104: .same(proto: "clearFullName"),
-    105: .same(proto: "clearGoPackage"),
-    106: .same(proto: "clearIdempotencyLevel"),
-    107: .same(proto: "clearIdentifierValue"),
-    108: .same(proto: "clearInputType"),
-    109: .same(proto: "clearIsExtension"),
-    110: .same(proto: "clearJavaGenerateEqualsAndHash"),
-    111: .same(proto: "clearJavaGenericServices"),
-    112: .same(proto: "clearJavaMultipleFiles"),
-    113: .same(proto: "clearJavaOuterClassname"),
-    114: .same(proto: "clearJavaPackage"),
-    115: .same(proto: "clearJavaStringCheckUtf8"),
-    116: .same(proto: "clearJsonFormat"),
-    117: .same(proto: "clearJsonName"),
-    118: .same(proto: "clearJstype"),
-    119: .same(proto: "clearLabel"),
-    120: .same(proto: "clearLazy"),
-    121: .same(proto: "clearLeadingComments"),
-    122: .same(proto: "clearMapEntry"),
-    123: .same(proto: "clearMaximumEdition"),
-    124: .same(proto: "clearMessageEncoding"),
-    125: .same(proto: "clearMessageSetWireFormat"),
-    126: .same(proto: "clearMinimumEdition"),
-    127: .same(proto: "clearName"),
-    128: .same(proto: "clearNamePart"),
-    129: .same(proto: "clearNegativeIntValue"),
-    130: .same(proto: "clearNoStandardDescriptorAccessor"),
-    131: .same(proto: "clearNumber"),
-    132: .same(proto: "clearObjcClassPrefix"),
-    133: .same(proto: "clearOneofIndex"),
-    134: .same(proto: "clearOptimizeFor"),
-    135: .same(proto: "clearOptions"),
-    136: .same(proto: "clearOutputType"),
-    137: .same(proto: "clearOverridableFeatures"),
-    138: .same(proto: "clearPackage"),
-    139: .same(proto: "clearPacked"),
-    140: .same(proto: "clearPhpClassPrefix"),
-    141: .same(proto: "clearPhpMetadataNamespace"),
-    142: .same(proto: "clearPhpNamespace"),
-    143: .same(proto: "clearPositiveIntValue"),
-    144: .same(proto: "clearProto3Optional"),
-    145: .same(proto: "clearPyGenericServices"),
-    146: .same(proto: "clearRepeated"),
-    147: .same(proto: "clearRepeatedFieldEncoding"),
-    148: .same(proto: "clearReserved"),
-    149: .same(proto: "clearRetention"),
-    150: .same(proto: "clearRubyPackage"),
-    151: .same(proto: "clearSemantic"),
-    152: .same(proto: "clearServerStreaming"),
-    153: .same(proto: "clearSourceCodeInfo"),
-    154: .same(proto: "clearSourceContext"),
-    155: .same(proto: "clearSourceFile"),
-    156: .same(proto: "clearStart"),
-    157: .same(proto: "clearStringValue"),
-    158: .same(proto: "clearSwiftPrefix"),
-    159: .same(proto: "clearSyntax"),
-    160: .same(proto: "clearTrailingComments"),
-    161: .same(proto: "clearType"),
-    162: .same(proto: "clearTypeName"),
-    163: .same(proto: "clearUnverifiedLazy"),
-    164: .same(proto: "clearUtf8Validation"),
-    165: .same(proto: "clearValue"),
-    166: .same(proto: "clearVerification"),
-    167: .same(proto: "clearWeak"),
-    168: .same(proto: "clientStreaming"),
-    169: .same(proto: "code"),
-    170: .same(proto: "codePoint"),
-    171: .same(proto: "codeUnits"),
-    172: .same(proto: "Collection"),
-    173: .same(proto: "com"),
-    174: .same(proto: "comma"),
-    175: .same(proto: "consumedBytes"),
-    176: .same(proto: "contains"),
-    177: .same(proto: "contentsOf"),
-    178: .same(proto: "ContiguousBytes"),
-    179: .same(proto: "copy"),
-    180: .same(proto: "count"),
-    181: .same(proto: "countVarintsInBuffer"),
-    182: .same(proto: "csharpNamespace"),
-    183: .same(proto: "ctype"),
-    184: .same(proto: "customCodable"),
-    185: .same(proto: "CustomDebugStringConvertible"),
-    186: .same(proto: "CustomStringConvertible"),
-    187: .same(proto: "d"),
-    188: .same(proto: "Data"),
-    189: .same(proto: "dataResult"),
-    190: .same(proto: "date"),
-    191: .same(proto: "daySec"),
-    192: .same(proto: "daysSinceEpoch"),
-    193: .same(proto: "debugDescription"),
-    194: .same(proto: "debugRedact"),
-    195: .same(proto: "declaration"),
-    196: .same(proto: "decoded"),
-    197: .same(proto: "decodedFromJSONNull"),
-    198: .same(proto: "decodeExtensionField"),
-    199: .same(proto: "decodeExtensionFieldsAsMessageSet"),
-    200: .same(proto: "decodeJSON"),
-    201: .same(proto: "decodeMapField"),
-    202: .same(proto: "decodeMessage"),
-    203: .same(proto: "decoder"),
-    204: .same(proto: "decodeRepeated"),
-    205: .same(proto: "decodeRepeatedBoolField"),
-    206: .same(proto: "decodeRepeatedBytesField"),
-    207: .same(proto: "decodeRepeatedDoubleField"),
-    208: .same(proto: "decodeRepeatedEnumField"),
-    209: .same(proto: "decodeRepeatedFixed32Field"),
-    210: .same(proto: "decodeRepeatedFixed64Field"),
-    211: .same(proto: "decodeRepeatedFloatField"),
-    212: .same(proto: "decodeRepeatedGroupField"),
-    213: .same(proto: "decodeRepeatedInt32Field"),
-    214: .same(proto: "decodeRepeatedInt64Field"),
-    215: .same(proto: "decodeRepeatedMessageField"),
-    216: .same(proto: "decodeRepeatedSFixed32Field"),
-    217: .same(proto: "decodeRepeatedSFixed64Field"),
-    218: .same(proto: "decodeRepeatedSInt32Field"),
-    219: .same(proto: "decodeRepeatedSInt64Field"),
-    220: .same(proto: "decodeRepeatedStringField"),
-    221: .same(proto: "decodeRepeatedUInt32Field"),
-    222: .same(proto: "decodeRepeatedUInt64Field"),
-    223: .same(proto: "decodeSingular"),
-    224: .same(proto: "decodeSingularBoolField"),
-    225: .same(proto: "decodeSingularBytesField"),
-    226: .same(proto: "decodeSingularDoubleField"),
-    227: .same(proto: "decodeSingularEnumField"),
-    228: .same(proto: "decodeSingularFixed32Field"),
-    229: .same(proto: "decodeSingularFixed64Field"),
-    230: .same(proto: "decodeSingularFloatField"),
-    231: .same(proto: "decodeSingularGroupField"),
-    232: .same(proto: "decodeSingularInt32Field"),
-    233: .same(proto: "decodeSingularInt64Field"),
-    234: .same(proto: "decodeSingularMessageField"),
-    235: .same(proto: "decodeSingularSFixed32Field"),
-    236: .same(proto: "decodeSingularSFixed64Field"),
-    237: .same(proto: "decodeSingularSInt32Field"),
-    238: .same(proto: "decodeSingularSInt64Field"),
-    239: .same(proto: "decodeSingularStringField"),
-    240: .same(proto: "decodeSingularUInt32Field"),
-    241: .same(proto: "decodeSingularUInt64Field"),
-    242: .same(proto: "decodeTextFormat"),
-    243: .same(proto: "defaultAnyTypeURLPrefix"),
-    244: .same(proto: "defaults"),
-    245: .same(proto: "defaultValue"),
-    246: .same(proto: "dependency"),
-    247: .same(proto: "deprecated"),
-    248: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
-    249: .same(proto: "deprecationWarning"),
-    250: .same(proto: "description"),
-    251: .same(proto: "DescriptorProto"),
-    252: .same(proto: "Dictionary"),
-    253: .same(proto: "dictionaryLiteral"),
-    254: .same(proto: "digit"),
-    255: .same(proto: "digit0"),
-    256: .same(proto: "digit1"),
-    257: .same(proto: "digitCount"),
-    258: .same(proto: "digits"),
-    259: .same(proto: "digitValue"),
-    260: .same(proto: "discardableResult"),
-    261: .same(proto: "discardUnknownFields"),
-    262: .same(proto: "Double"),
-    263: .same(proto: "doubleValue"),
-    264: .same(proto: "Duration"),
-    265: .same(proto: "E"),
-    266: .same(proto: "edition"),
-    267: .same(proto: "EditionDefault"),
-    268: .same(proto: "editionDefaults"),
-    269: .same(proto: "editionDeprecated"),
-    270: .same(proto: "editionIntroduced"),
-    271: .same(proto: "editionRemoved"),
-    272: .same(proto: "Element"),
-    273: .same(proto: "elements"),
-    274: .same(proto: "else"),
-    275: .same(proto: "emitExtensionFieldName"),
-    276: .same(proto: "emitFieldName"),
-    277: .same(proto: "emitFieldNumber"),
-    278: .same(proto: "Empty"),
-    279: .same(proto: "emptyData"),
-    280: .same(proto: "encodeAsBytes"),
-    281: .same(proto: "encoded"),
-    282: .same(proto: "encodedJSONString"),
-    283: .same(proto: "encodedSize"),
-    284: .same(proto: "encodeField"),
-    285: .same(proto: "encoder"),
-    286: .same(proto: "end"),
-    287: .same(proto: "endArray"),
-    288: .same(proto: "endMessageField"),
-    289: .same(proto: "endObject"),
-    290: .same(proto: "endRegularField"),
-    291: .same(proto: "enum"),
-    292: .same(proto: "EnumDescriptorProto"),
-    293: .same(proto: "EnumOptions"),
-    294: .same(proto: "EnumReservedRange"),
-    295: .same(proto: "enumType"),
-    296: .same(proto: "enumvalue"),
-    297: .same(proto: "EnumValueDescriptorProto"),
-    298: .same(proto: "EnumValueOptions"),
-    299: .same(proto: "Equatable"),
-    300: .same(proto: "Error"),
-    301: .same(proto: "ExpressibleByArrayLiteral"),
-    302: .same(proto: "ExpressibleByDictionaryLiteral"),
-    303: .same(proto: "ext"),
-    304: .same(proto: "extDecoder"),
-    305: .same(proto: "extendedGraphemeClusterLiteral"),
-    306: .same(proto: "ExtendedGraphemeClusterLiteralType"),
-    307: .same(proto: "extendee"),
-    308: .same(proto: "ExtensibleMessage"),
-    309: .same(proto: "extension"),
-    310: .same(proto: "ExtensionField"),
-    311: .same(proto: "extensionFieldNumber"),
-    312: .same(proto: "ExtensionFieldValueSet"),
-    313: .same(proto: "ExtensionMap"),
-    314: .same(proto: "extensionRange"),
-    315: .same(proto: "ExtensionRangeOptions"),
-    316: .same(proto: "extensions"),
-    317: .same(proto: "extras"),
-    318: .same(proto: "F"),
-    319: .same(proto: "false"),
-    320: .same(proto: "features"),
-    321: .same(proto: "FeatureSet"),
-    322: .same(proto: "FeatureSetDefaults"),
-    323: .same(proto: "FeatureSetEditionDefault"),
-    324: .same(proto: "featureSupport"),
-    325: .same(proto: "field"),
-    326: .same(proto: "fieldData"),
-    327: .same(proto: "FieldDescriptorProto"),
-    328: .same(proto: "FieldMask"),
-    329: .same(proto: "FieldMaskError"),
-    330: .same(proto: "fieldName"),
-    331: .same(proto: "fieldNameCount"),
-    332: .same(proto: "fieldNum"),
-    333: .same(proto: "fieldNumber"),
-    334: .same(proto: "fieldNumberForProto"),
-    335: .same(proto: "FieldOptions"),
-    336: .same(proto: "fieldPresence"),
-    337: .same(proto: "fields"),
-    338: .same(proto: "fieldSize"),
-    339: .same(proto: "FieldTag"),
-    340: .same(proto: "FieldType"),
-    341: .same(proto: "file"),
-    342: .same(proto: "FileDescriptorProto"),
-    343: .same(proto: "FileDescriptorSet"),
-    344: .same(proto: "fileName"),
-    345: .same(proto: "FileOptions"),
-    346: .same(proto: "filter"),
-    347: .same(proto: "final"),
-    348: .same(proto: "finiteOnly"),
-    349: .same(proto: "first"),
-    350: .same(proto: "firstItem"),
-    351: .same(proto: "fixedFeatures"),
-    352: .same(proto: "Float"),
-    353: .same(proto: "floatLiteral"),
-    354: .same(proto: "FloatLiteralType"),
-    355: .same(proto: "FloatValue"),
-    356: .same(proto: "for"),
-    357: .same(proto: "forMessageName"),
-    358: .same(proto: "formUnion"),
-    359: .same(proto: "forReadingFrom"),
-    360: .same(proto: "forTypeURL"),
-    361: .same(proto: "ForwardParser"),
-    362: .same(proto: "forWritingInto"),
-    363: .same(proto: "from"),
-    364: .same(proto: "fromAscii2"),
-    365: .same(proto: "fromAscii4"),
-    366: .same(proto: "fromByteOffset"),
-    367: .same(proto: "fromHexDigit"),
-    368: .same(proto: "fullName"),
-    369: .same(proto: "func"),
-    370: .same(proto: "function"),
-    371: .same(proto: "G"),
-    372: .same(proto: "GeneratedCodeInfo"),
-    373: .same(proto: "get"),
-    374: .same(proto: "getExtensionValue"),
-    375: .same(proto: "googleapis"),
-    376: .standard(proto: "Google_Protobuf_Any"),
-    377: .standard(proto: "Google_Protobuf_Api"),
-    378: .standard(proto: "Google_Protobuf_BoolValue"),
-    379: .standard(proto: "Google_Protobuf_BytesValue"),
-    380: .standard(proto: "Google_Protobuf_DescriptorProto"),
-    381: .standard(proto: "Google_Protobuf_DoubleValue"),
-    382: .standard(proto: "Google_Protobuf_Duration"),
-    383: .standard(proto: "Google_Protobuf_Edition"),
-    384: .standard(proto: "Google_Protobuf_Empty"),
-    385: .standard(proto: "Google_Protobuf_Enum"),
-    386: .standard(proto: "Google_Protobuf_EnumDescriptorProto"),
-    387: .standard(proto: "Google_Protobuf_EnumOptions"),
-    388: .standard(proto: "Google_Protobuf_EnumValue"),
-    389: .standard(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    390: .standard(proto: "Google_Protobuf_EnumValueOptions"),
-    391: .standard(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    392: .standard(proto: "Google_Protobuf_FeatureSet"),
-    393: .standard(proto: "Google_Protobuf_FeatureSetDefaults"),
-    394: .standard(proto: "Google_Protobuf_Field"),
-    395: .standard(proto: "Google_Protobuf_FieldDescriptorProto"),
-    396: .standard(proto: "Google_Protobuf_FieldMask"),
-    397: .standard(proto: "Google_Protobuf_FieldOptions"),
-    398: .standard(proto: "Google_Protobuf_FileDescriptorProto"),
-    399: .standard(proto: "Google_Protobuf_FileDescriptorSet"),
-    400: .standard(proto: "Google_Protobuf_FileOptions"),
-    401: .standard(proto: "Google_Protobuf_FloatValue"),
-    402: .standard(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    403: .standard(proto: "Google_Protobuf_Int32Value"),
-    404: .standard(proto: "Google_Protobuf_Int64Value"),
-    405: .standard(proto: "Google_Protobuf_ListValue"),
-    406: .standard(proto: "Google_Protobuf_MessageOptions"),
-    407: .standard(proto: "Google_Protobuf_Method"),
-    408: .standard(proto: "Google_Protobuf_MethodDescriptorProto"),
-    409: .standard(proto: "Google_Protobuf_MethodOptions"),
-    410: .standard(proto: "Google_Protobuf_Mixin"),
-    411: .standard(proto: "Google_Protobuf_NullValue"),
-    412: .standard(proto: "Google_Protobuf_OneofDescriptorProto"),
-    413: .standard(proto: "Google_Protobuf_OneofOptions"),
-    414: .standard(proto: "Google_Protobuf_Option"),
-    415: .standard(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    416: .standard(proto: "Google_Protobuf_ServiceOptions"),
-    417: .standard(proto: "Google_Protobuf_SourceCodeInfo"),
-    418: .standard(proto: "Google_Protobuf_SourceContext"),
-    419: .standard(proto: "Google_Protobuf_StringValue"),
-    420: .standard(proto: "Google_Protobuf_Struct"),
-    421: .standard(proto: "Google_Protobuf_Syntax"),
-    422: .standard(proto: "Google_Protobuf_Timestamp"),
-    423: .standard(proto: "Google_Protobuf_Type"),
-    424: .standard(proto: "Google_Protobuf_UInt32Value"),
-    425: .standard(proto: "Google_Protobuf_UInt64Value"),
-    426: .standard(proto: "Google_Protobuf_UninterpretedOption"),
-    427: .standard(proto: "Google_Protobuf_Value"),
-    428: .same(proto: "goPackage"),
-    429: .same(proto: "group"),
-    430: .same(proto: "groupFieldNumberStack"),
-    431: .same(proto: "groupSize"),
-    432: .same(proto: "guard"),
-    433: .same(proto: "hadOneofValue"),
-    434: .same(proto: "handleConflictingOneOf"),
-    435: .same(proto: "hasAggregateValue"),
-    436: .same(proto: "hasAllowAlias"),
-    437: .same(proto: "hasBegin"),
-    438: .same(proto: "hasCcEnableArenas"),
-    439: .same(proto: "hasCcGenericServices"),
-    440: .same(proto: "hasClientStreaming"),
-    441: .same(proto: "hasCsharpNamespace"),
-    442: .same(proto: "hasCtype"),
-    443: .same(proto: "hasDebugRedact"),
-    444: .same(proto: "hasDefaultValue"),
-    445: .same(proto: "hasDeprecated"),
-    446: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
-    447: .same(proto: "hasDeprecationWarning"),
-    448: .same(proto: "hasDoubleValue"),
-    449: .same(proto: "hasEdition"),
-    450: .same(proto: "hasEditionDeprecated"),
-    451: .same(proto: "hasEditionIntroduced"),
-    452: .same(proto: "hasEditionRemoved"),
-    453: .same(proto: "hasEnd"),
-    454: .same(proto: "hasEnumType"),
-    455: .same(proto: "hasExtendee"),
-    456: .same(proto: "hasExtensionValue"),
-    457: .same(proto: "hasFeatures"),
-    458: .same(proto: "hasFeatureSupport"),
-    459: .same(proto: "hasFieldPresence"),
-    460: .same(proto: "hasFixedFeatures"),
-    461: .same(proto: "hasFullName"),
-    462: .same(proto: "hasGoPackage"),
-    463: .same(proto: "hash"),
-    464: .same(proto: "Hashable"),
-    465: .same(proto: "hasher"),
-    466: .same(proto: "HashVisitor"),
-    467: .same(proto: "hasIdempotencyLevel"),
-    468: .same(proto: "hasIdentifierValue"),
-    469: .same(proto: "hasInputType"),
-    470: .same(proto: "hasIsExtension"),
-    471: .same(proto: "hasJavaGenerateEqualsAndHash"),
-    472: .same(proto: "hasJavaGenericServices"),
-    473: .same(proto: "hasJavaMultipleFiles"),
-    474: .same(proto: "hasJavaOuterClassname"),
-    475: .same(proto: "hasJavaPackage"),
-    476: .same(proto: "hasJavaStringCheckUtf8"),
-    477: .same(proto: "hasJsonFormat"),
-    478: .same(proto: "hasJsonName"),
-    479: .same(proto: "hasJstype"),
-    480: .same(proto: "hasLabel"),
-    481: .same(proto: "hasLazy"),
-    482: .same(proto: "hasLeadingComments"),
-    483: .same(proto: "hasMapEntry"),
-    484: .same(proto: "hasMaximumEdition"),
-    485: .same(proto: "hasMessageEncoding"),
-    486: .same(proto: "hasMessageSetWireFormat"),
-    487: .same(proto: "hasMinimumEdition"),
-    488: .same(proto: "hasName"),
-    489: .same(proto: "hasNamePart"),
-    490: .same(proto: "hasNegativeIntValue"),
-    491: .same(proto: "hasNoStandardDescriptorAccessor"),
-    492: .same(proto: "hasNumber"),
-    493: .same(proto: "hasObjcClassPrefix"),
-    494: .same(proto: "hasOneofIndex"),
-    495: .same(proto: "hasOptimizeFor"),
-    496: .same(proto: "hasOptions"),
-    497: .same(proto: "hasOutputType"),
-    498: .same(proto: "hasOverridableFeatures"),
-    499: .same(proto: "hasPackage"),
-    500: .same(proto: "hasPacked"),
-    501: .same(proto: "hasPhpClassPrefix"),
-    502: .same(proto: "hasPhpMetadataNamespace"),
-    503: .same(proto: "hasPhpNamespace"),
-    504: .same(proto: "hasPositiveIntValue"),
-    505: .same(proto: "hasProto3Optional"),
-    506: .same(proto: "hasPyGenericServices"),
-    507: .same(proto: "hasRepeated"),
-    508: .same(proto: "hasRepeatedFieldEncoding"),
-    509: .same(proto: "hasReserved"),
-    510: .same(proto: "hasRetention"),
-    511: .same(proto: "hasRubyPackage"),
-    512: .same(proto: "hasSemantic"),
-    513: .same(proto: "hasServerStreaming"),
-    514: .same(proto: "hasSourceCodeInfo"),
-    515: .same(proto: "hasSourceContext"),
-    516: .same(proto: "hasSourceFile"),
-    517: .same(proto: "hasStart"),
-    518: .same(proto: "hasStringValue"),
-    519: .same(proto: "hasSwiftPrefix"),
-    520: .same(proto: "hasSyntax"),
-    521: .same(proto: "hasTrailingComments"),
-    522: .same(proto: "hasType"),
-    523: .same(proto: "hasTypeName"),
-    524: .same(proto: "hasUnverifiedLazy"),
-    525: .same(proto: "hasUtf8Validation"),
-    526: .same(proto: "hasValue"),
-    527: .same(proto: "hasVerification"),
-    528: .same(proto: "hasWeak"),
-    529: .same(proto: "hour"),
-    530: .same(proto: "i"),
-    531: .same(proto: "idempotencyLevel"),
-    532: .same(proto: "identifierValue"),
-    533: .same(proto: "if"),
-    534: .same(proto: "ignoreUnknownExtensionFields"),
-    535: .same(proto: "ignoreUnknownFields"),
-    536: .same(proto: "index"),
-    537: .same(proto: "init"),
-    538: .same(proto: "inout"),
-    539: .same(proto: "inputType"),
-    540: .same(proto: "insert"),
-    541: .same(proto: "Int"),
-    542: .same(proto: "Int32"),
-    543: .same(proto: "Int32Value"),
-    544: .same(proto: "Int64"),
-    545: .same(proto: "Int64Value"),
-    546: .same(proto: "Int8"),
-    547: .same(proto: "integerLiteral"),
-    548: .same(proto: "IntegerLiteralType"),
-    549: .same(proto: "intern"),
-    550: .same(proto: "Internal"),
-    551: .same(proto: "InternalState"),
-    552: .same(proto: "intersect"),
-    553: .same(proto: "into"),
-    554: .same(proto: "ints"),
-    555: .same(proto: "isA"),
-    556: .same(proto: "isEqual"),
-    557: .same(proto: "isEqualTo"),
-    558: .same(proto: "isExtension"),
-    559: .same(proto: "isInitialized"),
-    560: .same(proto: "isNegative"),
-    561: .same(proto: "isPathValid"),
-    562: .same(proto: "isValid"),
-    563: .same(proto: "itemTagsEncodedSize"),
-    564: .same(proto: "iterator"),
-    565: .same(proto: "javaGenerateEqualsAndHash"),
-    566: .same(proto: "javaGenericServices"),
-    567: .same(proto: "javaMultipleFiles"),
-    568: .same(proto: "javaOuterClassname"),
-    569: .same(proto: "javaPackage"),
-    570: .same(proto: "javaStringCheckUtf8"),
-    571: .same(proto: "JSONDecoder"),
-    572: .same(proto: "JSONDecodingError"),
-    573: .same(proto: "JSONDecodingOptions"),
-    574: .same(proto: "jsonEncoder"),
-    575: .same(proto: "JSONEncodingError"),
-    576: .same(proto: "JSONEncodingOptions"),
-    577: .same(proto: "JSONEncodingVisitor"),
-    578: .same(proto: "jsonFormat"),
-    579: .same(proto: "JSONMapEncodingVisitor"),
-    580: .same(proto: "jsonName"),
-    581: .same(proto: "jsonPath"),
-    582: .same(proto: "jsonPaths"),
-    583: .same(proto: "JSONScanner"),
-    584: .same(proto: "jsonString"),
-    585: .same(proto: "jsonText"),
-    586: .same(proto: "jsonUTF8Bytes"),
-    587: .same(proto: "jsonUTF8Data"),
-    588: .same(proto: "jstype"),
-    589: .same(proto: "k"),
-    590: .same(proto: "kChunkSize"),
-    591: .same(proto: "Key"),
-    592: .same(proto: "keyField"),
-    593: .same(proto: "keyFieldOpt"),
-    594: .same(proto: "KeyType"),
-    595: .same(proto: "kind"),
-    596: .same(proto: "l"),
-    597: .same(proto: "label"),
-    598: .same(proto: "lazy"),
-    599: .same(proto: "leadingComments"),
-    600: .same(proto: "leadingDetachedComments"),
-    601: .same(proto: "length"),
-    602: .same(proto: "lessThan"),
-    603: .same(proto: "let"),
-    604: .same(proto: "lhs"),
-    605: .same(proto: "line"),
-    606: .same(proto: "list"),
-    607: .same(proto: "listOfMessages"),
-    608: .same(proto: "listValue"),
-    609: .same(proto: "littleEndian"),
-    610: .same(proto: "load"),
-    611: .same(proto: "localHasher"),
-    612: .same(proto: "location"),
-    613: .same(proto: "M"),
-    614: .same(proto: "major"),
-    615: .same(proto: "makeAsyncIterator"),
-    616: .same(proto: "makeIterator"),
-    617: .same(proto: "malformedLength"),
-    618: .same(proto: "mapEntry"),
-    619: .same(proto: "MapKeyType"),
-    620: .same(proto: "mapToMessages"),
-    621: .same(proto: "MapValueType"),
-    622: .same(proto: "mapVisitor"),
-    623: .same(proto: "mask"),
-    624: .same(proto: "maximumEdition"),
-    625: .same(proto: "mdayStart"),
-    626: .same(proto: "merge"),
-    627: .same(proto: "MergeOptions"),
-    628: .same(proto: "message"),
-    629: .same(proto: "messageDepthLimit"),
-    630: .same(proto: "messageEncoding"),
-    631: .same(proto: "MessageExtension"),
-    632: .same(proto: "MessageImplementationBase"),
-    633: .same(proto: "MessageOptions"),
-    634: .same(proto: "MessageSet"),
-    635: .same(proto: "messageSetWireFormat"),
-    636: .same(proto: "messageSize"),
-    637: .same(proto: "messageType"),
-    638: .same(proto: "Method"),
-    639: .same(proto: "MethodDescriptorProto"),
-    640: .same(proto: "MethodOptions"),
-    641: .same(proto: "methods"),
-    642: .same(proto: "min"),
-    643: .same(proto: "minimumEdition"),
-    644: .same(proto: "minor"),
-    645: .same(proto: "Mixin"),
-    646: .same(proto: "mixins"),
-    647: .same(proto: "modify"),
-    648: .same(proto: "month"),
-    649: .same(proto: "msgExtension"),
-    650: .same(proto: "mutating"),
-    651: .same(proto: "n"),
-    652: .same(proto: "name"),
-    653: .same(proto: "NameDescription"),
-    654: .same(proto: "NameMap"),
-    655: .same(proto: "NamePart"),
-    656: .same(proto: "names"),
-    657: .same(proto: "nanos"),
-    658: .same(proto: "negativeIntValue"),
-    659: .same(proto: "nestedType"),
-    660: .same(proto: "newExtensible"),
-    661: .same(proto: "newL"),
-    662: .same(proto: "newList"),
-    663: .same(proto: "newMessage"),
-    664: .same(proto: "newValue"),
-    665: .same(proto: "next"),
-    666: .same(proto: "nextByte"),
-    667: .same(proto: "nextFieldNumber"),
-    668: .same(proto: "nextVarInt"),
-    669: .same(proto: "nil"),
-    670: .same(proto: "nilLiteral"),
-    671: .same(proto: "noBytesAvailable"),
-    672: .same(proto: "noStandardDescriptorAccessor"),
-    673: .same(proto: "nullValue"),
-    674: .same(proto: "number"),
-    675: .same(proto: "numberValue"),
-    676: .same(proto: "objcClassPrefix"),
-    677: .same(proto: "of"),
-    678: .same(proto: "oneofDecl"),
-    679: .same(proto: "OneofDescriptorProto"),
-    680: .same(proto: "oneofIndex"),
-    681: .same(proto: "OneofOptions"),
-    682: .same(proto: "oneofs"),
-    683: .standard(proto: "OneOf_Kind"),
-    684: .same(proto: "optimizeFor"),
-    685: .same(proto: "OptimizeMode"),
-    686: .same(proto: "Option"),
-    687: .same(proto: "OptionalEnumExtensionField"),
-    688: .same(proto: "OptionalExtensionField"),
-    689: .same(proto: "OptionalGroupExtensionField"),
-    690: .same(proto: "OptionalMessageExtensionField"),
-    691: .same(proto: "OptionRetention"),
-    692: .same(proto: "options"),
-    693: .same(proto: "OptionTargetType"),
-    694: .same(proto: "other"),
-    695: .same(proto: "others"),
-    696: .same(proto: "out"),
-    697: .same(proto: "outputType"),
-    698: .same(proto: "overridableFeatures"),
-    699: .same(proto: "p"),
-    700: .same(proto: "package"),
-    701: .same(proto: "packed"),
-    702: .same(proto: "PackedEnumExtensionField"),
-    703: .same(proto: "PackedExtensionField"),
-    704: .same(proto: "padding"),
-    705: .same(proto: "parent"),
-    706: .same(proto: "parse"),
-    707: .same(proto: "partial"),
-    708: .same(proto: "path"),
-    709: .same(proto: "PathDecoder"),
-    710: .same(proto: "PathDecodingError"),
-    711: .same(proto: "paths"),
-    712: .same(proto: "PathVisitor"),
-    713: .same(proto: "payload"),
-    714: .same(proto: "payloadSize"),
-    715: .same(proto: "phpClassPrefix"),
-    716: .same(proto: "phpMetadataNamespace"),
-    717: .same(proto: "phpNamespace"),
-    718: .same(proto: "pos"),
-    719: .same(proto: "positiveIntValue"),
-    720: .same(proto: "prefix"),
-    721: .same(proto: "preserveProtoFieldNames"),
-    722: .same(proto: "preTraverse"),
-    723: .same(proto: "prevPath"),
-    724: .same(proto: "printUnknownFields"),
-    725: .same(proto: "proto2"),
-    726: .same(proto: "proto3DefaultValue"),
-    727: .same(proto: "proto3Optional"),
-    728: .same(proto: "ProtobufAPIVersionCheck"),
-    729: .standard(proto: "ProtobufAPIVersion_2"),
-    730: .same(proto: "ProtobufBool"),
-    731: .same(proto: "ProtobufBytes"),
-    732: .same(proto: "ProtobufDouble"),
-    733: .same(proto: "ProtobufEnumMap"),
-    734: .same(proto: "protobufExtension"),
-    735: .same(proto: "ProtobufFixed32"),
-    736: .same(proto: "ProtobufFixed64"),
-    737: .same(proto: "ProtobufFloat"),
-    738: .same(proto: "ProtobufInt32"),
-    739: .same(proto: "ProtobufInt64"),
-    740: .same(proto: "ProtobufMap"),
-    741: .same(proto: "ProtobufMessageMap"),
-    742: .same(proto: "ProtobufSFixed32"),
-    743: .same(proto: "ProtobufSFixed64"),
-    744: .same(proto: "ProtobufSInt32"),
-    745: .same(proto: "ProtobufSInt64"),
-    746: .same(proto: "ProtobufString"),
-    747: .same(proto: "ProtobufUInt32"),
-    748: .same(proto: "ProtobufUInt64"),
-    749: .standard(proto: "protobuf_extensionFieldValues"),
-    750: .standard(proto: "protobuf_fieldNumber"),
-    751: .standard(proto: "protobuf_generated_isEqualTo"),
-    752: .standard(proto: "protobuf_nameMap"),
-    753: .standard(proto: "protobuf_newField"),
-    754: .standard(proto: "protobuf_package"),
-    755: .same(proto: "protocol"),
-    756: .same(proto: "protoFieldName"),
-    757: .same(proto: "protoMessageName"),
-    758: .same(proto: "ProtoNameProviding"),
-    759: .same(proto: "protoPaths"),
-    760: .same(proto: "public"),
-    761: .same(proto: "publicDependency"),
-    762: .same(proto: "putBoolValue"),
-    763: .same(proto: "putBytesValue"),
-    764: .same(proto: "putDoubleValue"),
-    765: .same(proto: "putEnumValue"),
-    766: .same(proto: "putFixedUInt32"),
-    767: .same(proto: "putFixedUInt64"),
-    768: .same(proto: "putFloatValue"),
-    769: .same(proto: "putInt64"),
-    770: .same(proto: "putStringValue"),
-    771: .same(proto: "putUInt64"),
-    772: .same(proto: "putUInt64Hex"),
-    773: .same(proto: "putVarInt"),
-    774: .same(proto: "putZigZagVarInt"),
-    775: .same(proto: "pyGenericServices"),
-    776: .same(proto: "R"),
-    777: .same(proto: "rawChars"),
-    778: .same(proto: "RawRepresentable"),
-    779: .same(proto: "RawValue"),
-    780: .same(proto: "read4HexDigits"),
-    781: .same(proto: "readBytes"),
-    782: .same(proto: "register"),
-    783: .same(proto: "removingAllFieldsOf"),
-    784: .same(proto: "repeated"),
-    785: .same(proto: "RepeatedEnumExtensionField"),
-    786: .same(proto: "RepeatedExtensionField"),
-    787: .same(proto: "repeatedFieldEncoding"),
-    788: .same(proto: "RepeatedGroupExtensionField"),
-    789: .same(proto: "RepeatedMessageExtensionField"),
-    790: .same(proto: "repeating"),
-    791: .same(proto: "replaceRepeatedFields"),
-    792: .same(proto: "requestStreaming"),
-    793: .same(proto: "requestTypeURL"),
-    794: .same(proto: "requiredSize"),
-    795: .same(proto: "responseStreaming"),
-    796: .same(proto: "responseTypeURL"),
-    797: .same(proto: "result"),
-    798: .same(proto: "retention"),
-    799: .same(proto: "rethrows"),
-    800: .same(proto: "return"),
-    801: .same(proto: "ReturnType"),
-    802: .same(proto: "revision"),
-    803: .same(proto: "rhs"),
-    804: .same(proto: "root"),
-    805: .same(proto: "rubyPackage"),
-    806: .same(proto: "s"),
-    807: .same(proto: "sawBackslash"),
-    808: .same(proto: "sawSection4Characters"),
-    809: .same(proto: "sawSection5Characters"),
-    810: .same(proto: "scan"),
-    811: .same(proto: "scanner"),
-    812: .same(proto: "seconds"),
-    813: .same(proto: "self"),
-    814: .same(proto: "semantic"),
-    815: .same(proto: "Sendable"),
-    816: .same(proto: "separator"),
-    817: .same(proto: "serialize"),
-    818: .same(proto: "serializedBytes"),
-    819: .same(proto: "serializedData"),
-    820: .same(proto: "serializedSize"),
-    821: .same(proto: "serverStreaming"),
-    822: .same(proto: "service"),
-    823: .same(proto: "ServiceDescriptorProto"),
-    824: .same(proto: "ServiceOptions"),
-    825: .same(proto: "set"),
-    826: .same(proto: "setExtensionValue"),
-    827: .same(proto: "shift"),
-    828: .same(proto: "SimpleExtensionMap"),
-    829: .same(proto: "size"),
-    830: .same(proto: "sizer"),
-    831: .same(proto: "source"),
-    832: .same(proto: "sourceCodeInfo"),
-    833: .same(proto: "sourceContext"),
-    834: .same(proto: "sourceEncoding"),
-    835: .same(proto: "sourceFile"),
-    836: .same(proto: "SourceLocation"),
-    837: .same(proto: "span"),
-    838: .same(proto: "split"),
-    839: .same(proto: "start"),
-    840: .same(proto: "startArray"),
-    841: .same(proto: "startArrayObject"),
-    842: .same(proto: "startField"),
-    843: .same(proto: "startIndex"),
-    844: .same(proto: "startMessageField"),
-    845: .same(proto: "startObject"),
-    846: .same(proto: "startRegularField"),
-    847: .same(proto: "state"),
-    848: .same(proto: "static"),
-    849: .same(proto: "StaticString"),
-    850: .same(proto: "storage"),
-    851: .same(proto: "String"),
-    852: .same(proto: "stringLiteral"),
-    853: .same(proto: "StringLiteralType"),
-    854: .same(proto: "stringResult"),
-    855: .same(proto: "stringValue"),
-    856: .same(proto: "struct"),
-    857: .same(proto: "structValue"),
-    858: .same(proto: "subDecoder"),
-    859: .same(proto: "subscript"),
-    860: .same(proto: "subtract"),
-    861: .same(proto: "subVisitor"),
-    862: .same(proto: "Swift"),
-    863: .same(proto: "swiftPrefix"),
-    864: .same(proto: "SwiftProtobufContiguousBytes"),
-    865: .same(proto: "SwiftProtobufError"),
-    866: .same(proto: "syntax"),
-    867: .same(proto: "T"),
-    868: .same(proto: "tag"),
-    869: .same(proto: "targets"),
-    870: .same(proto: "terminator"),
-    871: .same(proto: "testDecoder"),
-    872: .same(proto: "text"),
-    873: .same(proto: "textDecoder"),
-    874: .same(proto: "TextFormatDecoder"),
-    875: .same(proto: "TextFormatDecodingError"),
-    876: .same(proto: "TextFormatDecodingOptions"),
-    877: .same(proto: "TextFormatEncodingOptions"),
-    878: .same(proto: "TextFormatEncodingVisitor"),
-    879: .same(proto: "textFormatString"),
-    880: .same(proto: "throwOrIgnore"),
-    881: .same(proto: "throws"),
-    882: .same(proto: "timeInterval"),
-    883: .same(proto: "timeIntervalSince1970"),
-    884: .same(proto: "timeIntervalSinceReferenceDate"),
-    885: .same(proto: "Timestamp"),
-    886: .same(proto: "tmp"),
-    887: .same(proto: "tooLarge"),
-    888: .same(proto: "total"),
-    889: .same(proto: "totalArrayDepth"),
-    890: .same(proto: "totalSize"),
-    891: .same(proto: "trailingComments"),
-    892: .same(proto: "traverse"),
-    893: .same(proto: "trim"),
-    894: .same(proto: "true"),
-    895: .same(proto: "try"),
-    896: .same(proto: "type"),
-    897: .same(proto: "typealias"),
-    898: .same(proto: "TypeEnum"),
-    899: .same(proto: "typeName"),
-    900: .same(proto: "typePrefix"),
-    901: .same(proto: "typeStart"),
-    902: .same(proto: "typeUnknown"),
-    903: .same(proto: "typeURL"),
-    904: .same(proto: "UInt32"),
-    905: .same(proto: "UInt32Value"),
-    906: .same(proto: "UInt64"),
-    907: .same(proto: "UInt64Value"),
-    908: .same(proto: "UInt8"),
-    909: .same(proto: "unchecked"),
-    910: .same(proto: "unicodeScalarLiteral"),
-    911: .same(proto: "UnicodeScalarLiteralType"),
-    912: .same(proto: "unicodeScalars"),
-    913: .same(proto: "UnicodeScalarView"),
-    914: .same(proto: "uninterpretedOption"),
-    915: .same(proto: "union"),
-    916: .same(proto: "uniqueStorage"),
-    917: .same(proto: "unknown"),
-    918: .same(proto: "unknownFields"),
-    919: .same(proto: "UnknownStorage"),
-    920: .same(proto: "unpackTo"),
-    921: .same(proto: "UnsafeBufferPointer"),
-    922: .same(proto: "UnsafeMutablePointer"),
-    923: .same(proto: "UnsafeMutableRawBufferPointer"),
-    924: .same(proto: "UnsafeRawBufferPointer"),
-    925: .same(proto: "UnsafeRawPointer"),
-    926: .same(proto: "unverifiedLazy"),
-    927: .same(proto: "updatedOptions"),
-    928: .same(proto: "url"),
-    929: .same(proto: "useDeterministicOrdering"),
-    930: .same(proto: "utf8"),
-    931: .same(proto: "utf8Ptr"),
-    932: .same(proto: "utf8ToDouble"),
-    933: .same(proto: "utf8Validation"),
-    934: .same(proto: "UTF8View"),
-    935: .same(proto: "v"),
-    936: .same(proto: "value"),
-    937: .same(proto: "valueField"),
-    938: .same(proto: "values"),
-    939: .same(proto: "ValueType"),
-    940: .same(proto: "var"),
-    941: .same(proto: "verification"),
-    942: .same(proto: "VerificationState"),
-    943: .same(proto: "Version"),
-    944: .same(proto: "versionString"),
-    945: .same(proto: "visitExtensionFields"),
-    946: .same(proto: "visitExtensionFieldsAsMessageSet"),
-    947: .same(proto: "visitMapField"),
-    948: .same(proto: "visitor"),
-    949: .same(proto: "visitPacked"),
-    950: .same(proto: "visitPackedBoolField"),
-    951: .same(proto: "visitPackedDoubleField"),
-    952: .same(proto: "visitPackedEnumField"),
-    953: .same(proto: "visitPackedFixed32Field"),
-    954: .same(proto: "visitPackedFixed64Field"),
-    955: .same(proto: "visitPackedFloatField"),
-    956: .same(proto: "visitPackedInt32Field"),
-    957: .same(proto: "visitPackedInt64Field"),
-    958: .same(proto: "visitPackedSFixed32Field"),
-    959: .same(proto: "visitPackedSFixed64Field"),
-    960: .same(proto: "visitPackedSInt32Field"),
-    961: .same(proto: "visitPackedSInt64Field"),
-    962: .same(proto: "visitPackedUInt32Field"),
-    963: .same(proto: "visitPackedUInt64Field"),
-    964: .same(proto: "visitRepeated"),
-    965: .same(proto: "visitRepeatedBoolField"),
-    966: .same(proto: "visitRepeatedBytesField"),
-    967: .same(proto: "visitRepeatedDoubleField"),
-    968: .same(proto: "visitRepeatedEnumField"),
-    969: .same(proto: "visitRepeatedFixed32Field"),
-    970: .same(proto: "visitRepeatedFixed64Field"),
-    971: .same(proto: "visitRepeatedFloatField"),
-    972: .same(proto: "visitRepeatedGroupField"),
-    973: .same(proto: "visitRepeatedInt32Field"),
-    974: .same(proto: "visitRepeatedInt64Field"),
-    975: .same(proto: "visitRepeatedMessageField"),
-    976: .same(proto: "visitRepeatedSFixed32Field"),
-    977: .same(proto: "visitRepeatedSFixed64Field"),
-    978: .same(proto: "visitRepeatedSInt32Field"),
-    979: .same(proto: "visitRepeatedSInt64Field"),
-    980: .same(proto: "visitRepeatedStringField"),
-    981: .same(proto: "visitRepeatedUInt32Field"),
-    982: .same(proto: "visitRepeatedUInt64Field"),
-    983: .same(proto: "visitSingular"),
-    984: .same(proto: "visitSingularBoolField"),
-    985: .same(proto: "visitSingularBytesField"),
-    986: .same(proto: "visitSingularDoubleField"),
-    987: .same(proto: "visitSingularEnumField"),
-    988: .same(proto: "visitSingularFixed32Field"),
-    989: .same(proto: "visitSingularFixed64Field"),
-    990: .same(proto: "visitSingularFloatField"),
-    991: .same(proto: "visitSingularGroupField"),
-    992: .same(proto: "visitSingularInt32Field"),
-    993: .same(proto: "visitSingularInt64Field"),
-    994: .same(proto: "visitSingularMessageField"),
-    995: .same(proto: "visitSingularSFixed32Field"),
-    996: .same(proto: "visitSingularSFixed64Field"),
-    997: .same(proto: "visitSingularSInt32Field"),
-    998: .same(proto: "visitSingularSInt64Field"),
-    999: .same(proto: "visitSingularStringField"),
-    1000: .same(proto: "visitSingularUInt32Field"),
-    1001: .same(proto: "visitSingularUInt64Field"),
-    1002: .same(proto: "visitUnknown"),
-    1003: .same(proto: "wasDecoded"),
-    1004: .same(proto: "weak"),
-    1005: .same(proto: "weakDependency"),
-    1006: .same(proto: "where"),
-    1007: .same(proto: "wireFormat"),
-    1008: .same(proto: "with"),
-    1009: .same(proto: "withUnsafeBytes"),
-    1010: .same(proto: "withUnsafeMutableBytes"),
-    1011: .same(proto: "work"),
-    1012: .same(proto: "Wrapped"),
-    1013: .same(proto: "WrappedType"),
-    1014: .same(proto: "wrappedValue"),
-    1015: .same(proto: "written"),
-    1016: .same(proto: "yday"),
+    97: .same(proto: "clearEnforceNamingStyle"),
+    98: .same(proto: "clearEnumType"),
+    99: .same(proto: "clearExtendee"),
+    100: .same(proto: "clearExtensionValue"),
+    101: .same(proto: "clearFeatures"),
+    102: .same(proto: "clearFeatureSupport"),
+    103: .same(proto: "clearFieldPresence"),
+    104: .same(proto: "clearFixedFeatures"),
+    105: .same(proto: "clearFullName"),
+    106: .same(proto: "clearGoPackage"),
+    107: .same(proto: "clearIdempotencyLevel"),
+    108: .same(proto: "clearIdentifierValue"),
+    109: .same(proto: "clearInputType"),
+    110: .same(proto: "clearIsExtension"),
+    111: .same(proto: "clearJavaGenerateEqualsAndHash"),
+    112: .same(proto: "clearJavaGenericServices"),
+    113: .same(proto: "clearJavaMultipleFiles"),
+    114: .same(proto: "clearJavaOuterClassname"),
+    115: .same(proto: "clearJavaPackage"),
+    116: .same(proto: "clearJavaStringCheckUtf8"),
+    117: .same(proto: "clearJsonFormat"),
+    118: .same(proto: "clearJsonName"),
+    119: .same(proto: "clearJstype"),
+    120: .same(proto: "clearLabel"),
+    121: .same(proto: "clearLazy"),
+    122: .same(proto: "clearLeadingComments"),
+    123: .same(proto: "clearMapEntry"),
+    124: .same(proto: "clearMaximumEdition"),
+    125: .same(proto: "clearMessageEncoding"),
+    126: .same(proto: "clearMessageSetWireFormat"),
+    127: .same(proto: "clearMinimumEdition"),
+    128: .same(proto: "clearName"),
+    129: .same(proto: "clearNamePart"),
+    130: .same(proto: "clearNegativeIntValue"),
+    131: .same(proto: "clearNoStandardDescriptorAccessor"),
+    132: .same(proto: "clearNumber"),
+    133: .same(proto: "clearObjcClassPrefix"),
+    134: .same(proto: "clearOneofIndex"),
+    135: .same(proto: "clearOptimizeFor"),
+    136: .same(proto: "clearOptions"),
+    137: .same(proto: "clearOutputType"),
+    138: .same(proto: "clearOverridableFeatures"),
+    139: .same(proto: "clearPackage"),
+    140: .same(proto: "clearPacked"),
+    141: .same(proto: "clearPhpClassPrefix"),
+    142: .same(proto: "clearPhpMetadataNamespace"),
+    143: .same(proto: "clearPhpNamespace"),
+    144: .same(proto: "clearPositiveIntValue"),
+    145: .same(proto: "clearProto3Optional"),
+    146: .same(proto: "clearPyGenericServices"),
+    147: .same(proto: "clearRepeated"),
+    148: .same(proto: "clearRepeatedFieldEncoding"),
+    149: .same(proto: "clearReserved"),
+    150: .same(proto: "clearRetention"),
+    151: .same(proto: "clearRubyPackage"),
+    152: .same(proto: "clearSemantic"),
+    153: .same(proto: "clearServerStreaming"),
+    154: .same(proto: "clearSourceCodeInfo"),
+    155: .same(proto: "clearSourceContext"),
+    156: .same(proto: "clearSourceFile"),
+    157: .same(proto: "clearStart"),
+    158: .same(proto: "clearStringValue"),
+    159: .same(proto: "clearSwiftPrefix"),
+    160: .same(proto: "clearSyntax"),
+    161: .same(proto: "clearTrailingComments"),
+    162: .same(proto: "clearType"),
+    163: .same(proto: "clearTypeName"),
+    164: .same(proto: "clearUnverifiedLazy"),
+    165: .same(proto: "clearUtf8Validation"),
+    166: .same(proto: "clearValue"),
+    167: .same(proto: "clearVerification"),
+    168: .same(proto: "clearWeak"),
+    169: .same(proto: "clientStreaming"),
+    170: .same(proto: "code"),
+    171: .same(proto: "codePoint"),
+    172: .same(proto: "codeUnits"),
+    173: .same(proto: "Collection"),
+    174: .same(proto: "com"),
+    175: .same(proto: "comma"),
+    176: .same(proto: "consumedBytes"),
+    177: .same(proto: "contains"),
+    178: .same(proto: "contentsOf"),
+    179: .same(proto: "ContiguousBytes"),
+    180: .same(proto: "copy"),
+    181: .same(proto: "count"),
+    182: .same(proto: "countVarintsInBuffer"),
+    183: .same(proto: "csharpNamespace"),
+    184: .same(proto: "ctype"),
+    185: .same(proto: "customCodable"),
+    186: .same(proto: "CustomDebugStringConvertible"),
+    187: .same(proto: "CustomStringConvertible"),
+    188: .same(proto: "d"),
+    189: .same(proto: "Data"),
+    190: .same(proto: "dataResult"),
+    191: .same(proto: "date"),
+    192: .same(proto: "daySec"),
+    193: .same(proto: "daysSinceEpoch"),
+    194: .same(proto: "debugDescription"),
+    195: .same(proto: "debugRedact"),
+    196: .same(proto: "declaration"),
+    197: .same(proto: "decoded"),
+    198: .same(proto: "decodedFromJSONNull"),
+    199: .same(proto: "decodeExtensionField"),
+    200: .same(proto: "decodeExtensionFieldsAsMessageSet"),
+    201: .same(proto: "decodeJSON"),
+    202: .same(proto: "decodeMapField"),
+    203: .same(proto: "decodeMessage"),
+    204: .same(proto: "decoder"),
+    205: .same(proto: "decodeRepeated"),
+    206: .same(proto: "decodeRepeatedBoolField"),
+    207: .same(proto: "decodeRepeatedBytesField"),
+    208: .same(proto: "decodeRepeatedDoubleField"),
+    209: .same(proto: "decodeRepeatedEnumField"),
+    210: .same(proto: "decodeRepeatedFixed32Field"),
+    211: .same(proto: "decodeRepeatedFixed64Field"),
+    212: .same(proto: "decodeRepeatedFloatField"),
+    213: .same(proto: "decodeRepeatedGroupField"),
+    214: .same(proto: "decodeRepeatedInt32Field"),
+    215: .same(proto: "decodeRepeatedInt64Field"),
+    216: .same(proto: "decodeRepeatedMessageField"),
+    217: .same(proto: "decodeRepeatedSFixed32Field"),
+    218: .same(proto: "decodeRepeatedSFixed64Field"),
+    219: .same(proto: "decodeRepeatedSInt32Field"),
+    220: .same(proto: "decodeRepeatedSInt64Field"),
+    221: .same(proto: "decodeRepeatedStringField"),
+    222: .same(proto: "decodeRepeatedUInt32Field"),
+    223: .same(proto: "decodeRepeatedUInt64Field"),
+    224: .same(proto: "decodeSingular"),
+    225: .same(proto: "decodeSingularBoolField"),
+    226: .same(proto: "decodeSingularBytesField"),
+    227: .same(proto: "decodeSingularDoubleField"),
+    228: .same(proto: "decodeSingularEnumField"),
+    229: .same(proto: "decodeSingularFixed32Field"),
+    230: .same(proto: "decodeSingularFixed64Field"),
+    231: .same(proto: "decodeSingularFloatField"),
+    232: .same(proto: "decodeSingularGroupField"),
+    233: .same(proto: "decodeSingularInt32Field"),
+    234: .same(proto: "decodeSingularInt64Field"),
+    235: .same(proto: "decodeSingularMessageField"),
+    236: .same(proto: "decodeSingularSFixed32Field"),
+    237: .same(proto: "decodeSingularSFixed64Field"),
+    238: .same(proto: "decodeSingularSInt32Field"),
+    239: .same(proto: "decodeSingularSInt64Field"),
+    240: .same(proto: "decodeSingularStringField"),
+    241: .same(proto: "decodeSingularUInt32Field"),
+    242: .same(proto: "decodeSingularUInt64Field"),
+    243: .same(proto: "decodeTextFormat"),
+    244: .same(proto: "defaultAnyTypeURLPrefix"),
+    245: .same(proto: "defaults"),
+    246: .same(proto: "defaultValue"),
+    247: .same(proto: "dependency"),
+    248: .same(proto: "deprecated"),
+    249: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
+    250: .same(proto: "deprecationWarning"),
+    251: .same(proto: "description"),
+    252: .same(proto: "DescriptorProto"),
+    253: .same(proto: "Dictionary"),
+    254: .same(proto: "dictionaryLiteral"),
+    255: .same(proto: "digit"),
+    256: .same(proto: "digit0"),
+    257: .same(proto: "digit1"),
+    258: .same(proto: "digitCount"),
+    259: .same(proto: "digits"),
+    260: .same(proto: "digitValue"),
+    261: .same(proto: "discardableResult"),
+    262: .same(proto: "discardUnknownFields"),
+    263: .same(proto: "Double"),
+    264: .same(proto: "doubleValue"),
+    265: .same(proto: "duration"),
+    266: .same(proto: "E"),
+    267: .same(proto: "edition"),
+    268: .same(proto: "EditionDefault"),
+    269: .same(proto: "editionDefaults"),
+    270: .same(proto: "editionDeprecated"),
+    271: .same(proto: "editionIntroduced"),
+    272: .same(proto: "editionRemoved"),
+    273: .same(proto: "Element"),
+    274: .same(proto: "elements"),
+    275: .same(proto: "else"),
+    276: .same(proto: "emitExtensionFieldName"),
+    277: .same(proto: "emitFieldName"),
+    278: .same(proto: "emitFieldNumber"),
+    279: .same(proto: "Empty"),
+    280: .same(proto: "emptyAnyTypeURL"),
+    281: .same(proto: "emptyData"),
+    282: .same(proto: "encodeAsBytes"),
+    283: .same(proto: "encoded"),
+    284: .same(proto: "encodedJSONString"),
+    285: .same(proto: "encodedSize"),
+    286: .same(proto: "encodeField"),
+    287: .same(proto: "encoder"),
+    288: .same(proto: "end"),
+    289: .same(proto: "endArray"),
+    290: .same(proto: "endMessageField"),
+    291: .same(proto: "endObject"),
+    292: .same(proto: "endRegularField"),
+    293: .same(proto: "enforceNamingStyle"),
+    294: .same(proto: "enum"),
+    295: .same(proto: "EnumDescriptorProto"),
+    296: .same(proto: "EnumOptions"),
+    297: .same(proto: "EnumReservedRange"),
+    298: .same(proto: "enumType"),
+    299: .same(proto: "enumvalue"),
+    300: .same(proto: "EnumValueDescriptorProto"),
+    301: .same(proto: "EnumValueOptions"),
+    302: .same(proto: "Equatable"),
+    303: .same(proto: "Error"),
+    304: .same(proto: "ExpressibleByArrayLiteral"),
+    305: .same(proto: "ExpressibleByDictionaryLiteral"),
+    306: .same(proto: "ext"),
+    307: .same(proto: "extDecoder"),
+    308: .same(proto: "extendedGraphemeClusterLiteral"),
+    309: .same(proto: "ExtendedGraphemeClusterLiteralType"),
+    310: .same(proto: "extendee"),
+    311: .same(proto: "ExtensibleMessage"),
+    312: .same(proto: "extension"),
+    313: .same(proto: "ExtensionField"),
+    314: .same(proto: "extensionFieldNumber"),
+    315: .same(proto: "ExtensionFieldValueSet"),
+    316: .same(proto: "ExtensionMap"),
+    317: .same(proto: "extensionRange"),
+    318: .same(proto: "ExtensionRangeOptions"),
+    319: .same(proto: "extensions"),
+    320: .same(proto: "extras"),
+    321: .same(proto: "F"),
+    322: .same(proto: "false"),
+    323: .same(proto: "features"),
+    324: .same(proto: "FeatureSet"),
+    325: .same(proto: "FeatureSetDefaults"),
+    326: .same(proto: "FeatureSetEditionDefault"),
+    327: .same(proto: "featureSupport"),
+    328: .same(proto: "field"),
+    329: .same(proto: "fieldData"),
+    330: .same(proto: "FieldDescriptorProto"),
+    331: .same(proto: "FieldMask"),
+    332: .same(proto: "FieldMaskError"),
+    333: .same(proto: "fieldName"),
+    334: .same(proto: "fieldNameCount"),
+    335: .same(proto: "fieldNum"),
+    336: .same(proto: "fieldNumber"),
+    337: .same(proto: "fieldNumberForProto"),
+    338: .same(proto: "FieldOptions"),
+    339: .same(proto: "fieldPresence"),
+    340: .same(proto: "fields"),
+    341: .same(proto: "fieldSize"),
+    342: .same(proto: "FieldTag"),
+    343: .same(proto: "FieldType"),
+    344: .same(proto: "file"),
+    345: .same(proto: "FileDescriptorProto"),
+    346: .same(proto: "FileDescriptorSet"),
+    347: .same(proto: "fileName"),
+    348: .same(proto: "FileOptions"),
+    349: .same(proto: "filter"),
+    350: .same(proto: "final"),
+    351: .same(proto: "finiteOnly"),
+    352: .same(proto: "first"),
+    353: .same(proto: "firstItem"),
+    354: .same(proto: "fixedFeatures"),
+    355: .same(proto: "Float"),
+    356: .same(proto: "floatLiteral"),
+    357: .same(proto: "FloatLiteralType"),
+    358: .same(proto: "FloatValue"),
+    359: .same(proto: "for"),
+    360: .same(proto: "forMessageName"),
+    361: .same(proto: "formUnion"),
+    362: .same(proto: "forReadingFrom"),
+    363: .same(proto: "forTypeURL"),
+    364: .same(proto: "ForwardParser"),
+    365: .same(proto: "forWritingInto"),
+    366: .same(proto: "from"),
+    367: .same(proto: "fromAscii2"),
+    368: .same(proto: "fromAscii4"),
+    369: .same(proto: "fromByteOffset"),
+    370: .same(proto: "fromHexDigit"),
+    371: .same(proto: "fullName"),
+    372: .same(proto: "func"),
+    373: .same(proto: "function"),
+    374: .same(proto: "G"),
+    375: .same(proto: "GeneratedCodeInfo"),
+    376: .same(proto: "get"),
+    377: .same(proto: "getExtensionValue"),
+    378: .same(proto: "googleapis"),
+    379: .standard(proto: "Google_Protobuf_Any"),
+    380: .standard(proto: "Google_Protobuf_Api"),
+    381: .standard(proto: "Google_Protobuf_BoolValue"),
+    382: .standard(proto: "Google_Protobuf_BytesValue"),
+    383: .standard(proto: "Google_Protobuf_DescriptorProto"),
+    384: .standard(proto: "Google_Protobuf_DoubleValue"),
+    385: .standard(proto: "Google_Protobuf_Duration"),
+    386: .standard(proto: "Google_Protobuf_Edition"),
+    387: .standard(proto: "Google_Protobuf_Empty"),
+    388: .standard(proto: "Google_Protobuf_Enum"),
+    389: .standard(proto: "Google_Protobuf_EnumDescriptorProto"),
+    390: .standard(proto: "Google_Protobuf_EnumOptions"),
+    391: .standard(proto: "Google_Protobuf_EnumValue"),
+    392: .standard(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    393: .standard(proto: "Google_Protobuf_EnumValueOptions"),
+    394: .standard(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    395: .standard(proto: "Google_Protobuf_FeatureSet"),
+    396: .standard(proto: "Google_Protobuf_FeatureSetDefaults"),
+    397: .standard(proto: "Google_Protobuf_Field"),
+    398: .standard(proto: "Google_Protobuf_FieldDescriptorProto"),
+    399: .standard(proto: "Google_Protobuf_FieldMask"),
+    400: .standard(proto: "Google_Protobuf_FieldOptions"),
+    401: .standard(proto: "Google_Protobuf_FileDescriptorProto"),
+    402: .standard(proto: "Google_Protobuf_FileDescriptorSet"),
+    403: .standard(proto: "Google_Protobuf_FileOptions"),
+    404: .standard(proto: "Google_Protobuf_FloatValue"),
+    405: .standard(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    406: .standard(proto: "Google_Protobuf_Int32Value"),
+    407: .standard(proto: "Google_Protobuf_Int64Value"),
+    408: .standard(proto: "Google_Protobuf_ListValue"),
+    409: .standard(proto: "Google_Protobuf_MessageOptions"),
+    410: .standard(proto: "Google_Protobuf_Method"),
+    411: .standard(proto: "Google_Protobuf_MethodDescriptorProto"),
+    412: .standard(proto: "Google_Protobuf_MethodOptions"),
+    413: .standard(proto: "Google_Protobuf_Mixin"),
+    414: .standard(proto: "Google_Protobuf_NullValue"),
+    415: .standard(proto: "Google_Protobuf_OneofDescriptorProto"),
+    416: .standard(proto: "Google_Protobuf_OneofOptions"),
+    417: .standard(proto: "Google_Protobuf_Option"),
+    418: .standard(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    419: .standard(proto: "Google_Protobuf_ServiceOptions"),
+    420: .standard(proto: "Google_Protobuf_SourceCodeInfo"),
+    421: .standard(proto: "Google_Protobuf_SourceContext"),
+    422: .standard(proto: "Google_Protobuf_StringValue"),
+    423: .standard(proto: "Google_Protobuf_Struct"),
+    424: .standard(proto: "Google_Protobuf_Syntax"),
+    425: .standard(proto: "Google_Protobuf_Timestamp"),
+    426: .standard(proto: "Google_Protobuf_Type"),
+    427: .standard(proto: "Google_Protobuf_UInt32Value"),
+    428: .standard(proto: "Google_Protobuf_UInt64Value"),
+    429: .standard(proto: "Google_Protobuf_UninterpretedOption"),
+    430: .standard(proto: "Google_Protobuf_Value"),
+    431: .same(proto: "goPackage"),
+    432: .same(proto: "group"),
+    433: .same(proto: "groupFieldNumberStack"),
+    434: .same(proto: "groupSize"),
+    435: .same(proto: "guard"),
+    436: .same(proto: "hadOneofValue"),
+    437: .same(proto: "handleConflictingOneOf"),
+    438: .same(proto: "hasAggregateValue"),
+    439: .same(proto: "hasAllowAlias"),
+    440: .same(proto: "hasBegin"),
+    441: .same(proto: "hasCcEnableArenas"),
+    442: .same(proto: "hasCcGenericServices"),
+    443: .same(proto: "hasClientStreaming"),
+    444: .same(proto: "hasCsharpNamespace"),
+    445: .same(proto: "hasCtype"),
+    446: .same(proto: "hasDebugRedact"),
+    447: .same(proto: "hasDefaultValue"),
+    448: .same(proto: "hasDeprecated"),
+    449: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
+    450: .same(proto: "hasDeprecationWarning"),
+    451: .same(proto: "hasDoubleValue"),
+    452: .same(proto: "hasEdition"),
+    453: .same(proto: "hasEditionDeprecated"),
+    454: .same(proto: "hasEditionIntroduced"),
+    455: .same(proto: "hasEditionRemoved"),
+    456: .same(proto: "hasEnd"),
+    457: .same(proto: "hasEnforceNamingStyle"),
+    458: .same(proto: "hasEnumType"),
+    459: .same(proto: "hasExtendee"),
+    460: .same(proto: "hasExtensionValue"),
+    461: .same(proto: "hasFeatures"),
+    462: .same(proto: "hasFeatureSupport"),
+    463: .same(proto: "hasFieldPresence"),
+    464: .same(proto: "hasFixedFeatures"),
+    465: .same(proto: "hasFullName"),
+    466: .same(proto: "hasGoPackage"),
+    467: .same(proto: "hash"),
+    468: .same(proto: "Hashable"),
+    469: .same(proto: "hasher"),
+    470: .same(proto: "HashVisitor"),
+    471: .same(proto: "hasIdempotencyLevel"),
+    472: .same(proto: "hasIdentifierValue"),
+    473: .same(proto: "hasInputType"),
+    474: .same(proto: "hasIsExtension"),
+    475: .same(proto: "hasJavaGenerateEqualsAndHash"),
+    476: .same(proto: "hasJavaGenericServices"),
+    477: .same(proto: "hasJavaMultipleFiles"),
+    478: .same(proto: "hasJavaOuterClassname"),
+    479: .same(proto: "hasJavaPackage"),
+    480: .same(proto: "hasJavaStringCheckUtf8"),
+    481: .same(proto: "hasJsonFormat"),
+    482: .same(proto: "hasJsonName"),
+    483: .same(proto: "hasJstype"),
+    484: .same(proto: "hasLabel"),
+    485: .same(proto: "hasLazy"),
+    486: .same(proto: "hasLeadingComments"),
+    487: .same(proto: "hasMapEntry"),
+    488: .same(proto: "hasMaximumEdition"),
+    489: .same(proto: "hasMessageEncoding"),
+    490: .same(proto: "hasMessageSetWireFormat"),
+    491: .same(proto: "hasMinimumEdition"),
+    492: .same(proto: "hasName"),
+    493: .same(proto: "hasNamePart"),
+    494: .same(proto: "hasNegativeIntValue"),
+    495: .same(proto: "hasNoStandardDescriptorAccessor"),
+    496: .same(proto: "hasNumber"),
+    497: .same(proto: "hasObjcClassPrefix"),
+    498: .same(proto: "hasOneofIndex"),
+    499: .same(proto: "hasOptimizeFor"),
+    500: .same(proto: "hasOptions"),
+    501: .same(proto: "hasOutputType"),
+    502: .same(proto: "hasOverridableFeatures"),
+    503: .same(proto: "hasPackage"),
+    504: .same(proto: "hasPacked"),
+    505: .same(proto: "hasPhpClassPrefix"),
+    506: .same(proto: "hasPhpMetadataNamespace"),
+    507: .same(proto: "hasPhpNamespace"),
+    508: .same(proto: "hasPositiveIntValue"),
+    509: .same(proto: "hasProto3Optional"),
+    510: .same(proto: "hasPyGenericServices"),
+    511: .same(proto: "hasRepeated"),
+    512: .same(proto: "hasRepeatedFieldEncoding"),
+    513: .same(proto: "hasReserved"),
+    514: .same(proto: "hasRetention"),
+    515: .same(proto: "hasRubyPackage"),
+    516: .same(proto: "hasSemantic"),
+    517: .same(proto: "hasServerStreaming"),
+    518: .same(proto: "hasSourceCodeInfo"),
+    519: .same(proto: "hasSourceContext"),
+    520: .same(proto: "hasSourceFile"),
+    521: .same(proto: "hasStart"),
+    522: .same(proto: "hasStringValue"),
+    523: .same(proto: "hasSwiftPrefix"),
+    524: .same(proto: "hasSyntax"),
+    525: .same(proto: "hasTrailingComments"),
+    526: .same(proto: "hasType"),
+    527: .same(proto: "hasTypeName"),
+    528: .same(proto: "hasUnverifiedLazy"),
+    529: .same(proto: "hasUtf8Validation"),
+    530: .same(proto: "hasValue"),
+    531: .same(proto: "hasVerification"),
+    532: .same(proto: "hasWeak"),
+    533: .same(proto: "hour"),
+    534: .same(proto: "i"),
+    535: .same(proto: "idempotencyLevel"),
+    536: .same(proto: "identifierValue"),
+    537: .same(proto: "if"),
+    538: .same(proto: "ignoreUnknownExtensionFields"),
+    539: .same(proto: "ignoreUnknownFields"),
+    540: .same(proto: "index"),
+    541: .same(proto: "init"),
+    542: .same(proto: "inout"),
+    543: .same(proto: "inputType"),
+    544: .same(proto: "insert"),
+    545: .same(proto: "Int"),
+    546: .same(proto: "Int32"),
+    547: .same(proto: "Int32Value"),
+    548: .same(proto: "Int64"),
+    549: .same(proto: "Int64Value"),
+    550: .same(proto: "Int8"),
+    551: .same(proto: "integerLiteral"),
+    552: .same(proto: "IntegerLiteralType"),
+    553: .same(proto: "intern"),
+    554: .same(proto: "Internal"),
+    555: .same(proto: "InternalState"),
+    556: .same(proto: "intersect"),
+    557: .same(proto: "into"),
+    558: .same(proto: "ints"),
+    559: .same(proto: "invalidAnyTypeURL"),
+    560: .same(proto: "isA"),
+    561: .same(proto: "isEqual"),
+    562: .same(proto: "isEqualTo"),
+    563: .same(proto: "isExtension"),
+    564: .same(proto: "isInitialized"),
+    565: .same(proto: "isNegative"),
+    566: .same(proto: "isPathValid"),
+    567: .same(proto: "isValid"),
+    568: .same(proto: "itemTagsEncodedSize"),
+    569: .same(proto: "iterator"),
+    570: .same(proto: "javaGenerateEqualsAndHash"),
+    571: .same(proto: "javaGenericServices"),
+    572: .same(proto: "javaMultipleFiles"),
+    573: .same(proto: "javaOuterClassname"),
+    574: .same(proto: "javaPackage"),
+    575: .same(proto: "javaStringCheckUtf8"),
+    576: .same(proto: "JSONDecoder"),
+    577: .same(proto: "JSONDecoding"),
+    578: .same(proto: "JSONDecodingError"),
+    579: .same(proto: "JSONDecodingOptions"),
+    580: .same(proto: "jsonEncoder"),
+    581: .same(proto: "JSONEncoding"),
+    582: .same(proto: "JSONEncodingError"),
+    583: .same(proto: "JSONEncodingOptions"),
+    584: .same(proto: "JSONEncodingVisitor"),
+    585: .same(proto: "jsonFormat"),
+    586: .same(proto: "JSONMapEncodingVisitor"),
+    587: .same(proto: "jsonName"),
+    588: .same(proto: "jsonPath"),
+    589: .same(proto: "jsonPaths"),
+    590: .same(proto: "JSONScanner"),
+    591: .same(proto: "jsonString"),
+    592: .same(proto: "jsonText"),
+    593: .same(proto: "jsonUTF8Bytes"),
+    594: .same(proto: "jsonUTF8Data"),
+    595: .same(proto: "jstype"),
+    596: .same(proto: "k"),
+    597: .same(proto: "kChunkSize"),
+    598: .same(proto: "Key"),
+    599: .same(proto: "keyField"),
+    600: .same(proto: "keyFieldOpt"),
+    601: .same(proto: "KeyType"),
+    602: .same(proto: "kind"),
+    603: .same(proto: "l"),
+    604: .same(proto: "label"),
+    605: .same(proto: "lazy"),
+    606: .same(proto: "leadingComments"),
+    607: .same(proto: "leadingDetachedComments"),
+    608: .same(proto: "length"),
+    609: .same(proto: "lessThan"),
+    610: .same(proto: "let"),
+    611: .same(proto: "lhs"),
+    612: .same(proto: "line"),
+    613: .same(proto: "list"),
+    614: .same(proto: "listOfMessages"),
+    615: .same(proto: "listValue"),
+    616: .same(proto: "littleEndian"),
+    617: .same(proto: "load"),
+    618: .same(proto: "localHasher"),
+    619: .same(proto: "location"),
+    620: .same(proto: "M"),
+    621: .same(proto: "major"),
+    622: .same(proto: "makeAsyncIterator"),
+    623: .same(proto: "makeIterator"),
+    624: .same(proto: "malformedLength"),
+    625: .same(proto: "mapEntry"),
+    626: .same(proto: "MapKeyType"),
+    627: .same(proto: "mapToMessages"),
+    628: .same(proto: "MapValueType"),
+    629: .same(proto: "mapVisitor"),
+    630: .same(proto: "mask"),
+    631: .same(proto: "maximumEdition"),
+    632: .same(proto: "mdayStart"),
+    633: .same(proto: "merge"),
+    634: .same(proto: "MergeOptions"),
+    635: .same(proto: "message"),
+    636: .same(proto: "messageDepthLimit"),
+    637: .same(proto: "messageEncoding"),
+    638: .same(proto: "MessageExtension"),
+    639: .same(proto: "MessageImplementationBase"),
+    640: .same(proto: "MessageOptions"),
+    641: .same(proto: "MessageSet"),
+    642: .same(proto: "messageSetWireFormat"),
+    643: .same(proto: "messageSize"),
+    644: .same(proto: "messageType"),
+    645: .same(proto: "Method"),
+    646: .same(proto: "MethodDescriptorProto"),
+    647: .same(proto: "MethodOptions"),
+    648: .same(proto: "methods"),
+    649: .same(proto: "min"),
+    650: .same(proto: "minimumEdition"),
+    651: .same(proto: "minor"),
+    652: .same(proto: "Mixin"),
+    653: .same(proto: "mixins"),
+    654: .same(proto: "modify"),
+    655: .same(proto: "month"),
+    656: .same(proto: "msgExtension"),
+    657: .same(proto: "mutating"),
+    658: .same(proto: "n"),
+    659: .same(proto: "name"),
+    660: .same(proto: "NameDescription"),
+    661: .same(proto: "NameMap"),
+    662: .same(proto: "NamePart"),
+    663: .same(proto: "names"),
+    664: .same(proto: "nanos"),
+    665: .same(proto: "negativeIntValue"),
+    666: .same(proto: "nestedType"),
+    667: .same(proto: "newExtensible"),
+    668: .same(proto: "newL"),
+    669: .same(proto: "newList"),
+    670: .same(proto: "newMessage"),
+    671: .same(proto: "newValue"),
+    672: .same(proto: "next"),
+    673: .same(proto: "nextByte"),
+    674: .same(proto: "nextFieldNumber"),
+    675: .same(proto: "nextVarInt"),
+    676: .same(proto: "nil"),
+    677: .same(proto: "nilLiteral"),
+    678: .same(proto: "noBytesAvailable"),
+    679: .same(proto: "noStandardDescriptorAccessor"),
+    680: .same(proto: "nullValue"),
+    681: .same(proto: "number"),
+    682: .same(proto: "numberValue"),
+    683: .same(proto: "objcClassPrefix"),
+    684: .same(proto: "of"),
+    685: .same(proto: "oneofDecl"),
+    686: .same(proto: "OneofDescriptorProto"),
+    687: .same(proto: "oneofIndex"),
+    688: .same(proto: "OneofOptions"),
+    689: .same(proto: "oneofs"),
+    690: .standard(proto: "OneOf_Kind"),
+    691: .same(proto: "optimizeFor"),
+    692: .same(proto: "OptimizeMode"),
+    693: .same(proto: "Option"),
+    694: .same(proto: "OptionalEnumExtensionField"),
+    695: .same(proto: "OptionalExtensionField"),
+    696: .same(proto: "OptionalGroupExtensionField"),
+    697: .same(proto: "OptionalMessageExtensionField"),
+    698: .same(proto: "OptionRetention"),
+    699: .same(proto: "options"),
+    700: .same(proto: "OptionTargetType"),
+    701: .same(proto: "other"),
+    702: .same(proto: "others"),
+    703: .same(proto: "out"),
+    704: .same(proto: "outputType"),
+    705: .same(proto: "overridableFeatures"),
+    706: .same(proto: "p"),
+    707: .same(proto: "package"),
+    708: .same(proto: "packed"),
+    709: .same(proto: "PackedEnumExtensionField"),
+    710: .same(proto: "PackedExtensionField"),
+    711: .same(proto: "padding"),
+    712: .same(proto: "parent"),
+    713: .same(proto: "parse"),
+    714: .same(proto: "partial"),
+    715: .same(proto: "path"),
+    716: .same(proto: "PathDecoder"),
+    717: .same(proto: "PathDecodingError"),
+    718: .same(proto: "paths"),
+    719: .same(proto: "PathVisitor"),
+    720: .same(proto: "payload"),
+    721: .same(proto: "payloadSize"),
+    722: .same(proto: "phpClassPrefix"),
+    723: .same(proto: "phpMetadataNamespace"),
+    724: .same(proto: "phpNamespace"),
+    725: .same(proto: "pos"),
+    726: .same(proto: "positiveIntValue"),
+    727: .same(proto: "prefix"),
+    728: .same(proto: "preserveProtoFieldNames"),
+    729: .same(proto: "preTraverse"),
+    730: .same(proto: "prevPath"),
+    731: .same(proto: "printUnknownFields"),
+    732: .same(proto: "proto2"),
+    733: .same(proto: "proto3DefaultValue"),
+    734: .same(proto: "proto3Optional"),
+    735: .same(proto: "ProtobufAPIVersionCheck"),
+    736: .standard(proto: "ProtobufAPIVersion_2"),
+    737: .same(proto: "ProtobufBool"),
+    738: .same(proto: "ProtobufBytes"),
+    739: .same(proto: "ProtobufDouble"),
+    740: .same(proto: "ProtobufEnumMap"),
+    741: .same(proto: "protobufExtension"),
+    742: .same(proto: "ProtobufFixed32"),
+    743: .same(proto: "ProtobufFixed64"),
+    744: .same(proto: "ProtobufFloat"),
+    745: .same(proto: "ProtobufInt32"),
+    746: .same(proto: "ProtobufInt64"),
+    747: .same(proto: "ProtobufMap"),
+    748: .same(proto: "ProtobufMessageMap"),
+    749: .same(proto: "ProtobufSFixed32"),
+    750: .same(proto: "ProtobufSFixed64"),
+    751: .same(proto: "ProtobufSInt32"),
+    752: .same(proto: "ProtobufSInt64"),
+    753: .same(proto: "ProtobufString"),
+    754: .same(proto: "ProtobufUInt32"),
+    755: .same(proto: "ProtobufUInt64"),
+    756: .standard(proto: "protobuf_extensionFieldValues"),
+    757: .standard(proto: "protobuf_fieldNumber"),
+    758: .standard(proto: "protobuf_generated_isEqualTo"),
+    759: .standard(proto: "protobuf_nameMap"),
+    760: .standard(proto: "protobuf_newField"),
+    761: .standard(proto: "protobuf_package"),
+    762: .same(proto: "protocol"),
+    763: .same(proto: "protoFieldName"),
+    764: .same(proto: "protoMessageName"),
+    765: .same(proto: "ProtoNameProviding"),
+    766: .same(proto: "protoPaths"),
+    767: .same(proto: "public"),
+    768: .same(proto: "publicDependency"),
+    769: .same(proto: "putBoolValue"),
+    770: .same(proto: "putBytesValue"),
+    771: .same(proto: "putDoubleValue"),
+    772: .same(proto: "putEnumValue"),
+    773: .same(proto: "putFixedUInt32"),
+    774: .same(proto: "putFixedUInt64"),
+    775: .same(proto: "putFloatValue"),
+    776: .same(proto: "putInt64"),
+    777: .same(proto: "putStringValue"),
+    778: .same(proto: "putUInt64"),
+    779: .same(proto: "putUInt64Hex"),
+    780: .same(proto: "putVarInt"),
+    781: .same(proto: "putZigZagVarInt"),
+    782: .same(proto: "pyGenericServices"),
+    783: .same(proto: "R"),
+    784: .same(proto: "rawChars"),
+    785: .same(proto: "RawRepresentable"),
+    786: .same(proto: "RawValue"),
+    787: .same(proto: "read4HexDigits"),
+    788: .same(proto: "readBytes"),
+    789: .same(proto: "register"),
+    790: .same(proto: "removingAllFieldsOf"),
+    791: .same(proto: "repeated"),
+    792: .same(proto: "RepeatedEnumExtensionField"),
+    793: .same(proto: "RepeatedExtensionField"),
+    794: .same(proto: "repeatedFieldEncoding"),
+    795: .same(proto: "RepeatedGroupExtensionField"),
+    796: .same(proto: "RepeatedMessageExtensionField"),
+    797: .same(proto: "repeating"),
+    798: .same(proto: "replaceRepeatedFields"),
+    799: .same(proto: "requestStreaming"),
+    800: .same(proto: "requestTypeURL"),
+    801: .same(proto: "requiredSize"),
+    802: .same(proto: "responseStreaming"),
+    803: .same(proto: "responseTypeURL"),
+    804: .same(proto: "result"),
+    805: .same(proto: "retention"),
+    806: .same(proto: "rethrows"),
+    807: .same(proto: "return"),
+    808: .same(proto: "ReturnType"),
+    809: .same(proto: "revision"),
+    810: .same(proto: "rhs"),
+    811: .same(proto: "root"),
+    812: .same(proto: "rubyPackage"),
+    813: .same(proto: "s"),
+    814: .same(proto: "sawBackslash"),
+    815: .same(proto: "sawSection4Characters"),
+    816: .same(proto: "sawSection5Characters"),
+    817: .same(proto: "scan"),
+    818: .same(proto: "scanner"),
+    819: .same(proto: "seconds"),
+    820: .same(proto: "self"),
+    821: .same(proto: "semantic"),
+    822: .same(proto: "Sendable"),
+    823: .same(proto: "separator"),
+    824: .same(proto: "serialize"),
+    825: .same(proto: "serializedBytes"),
+    826: .same(proto: "serializedData"),
+    827: .same(proto: "serializedSize"),
+    828: .same(proto: "serverStreaming"),
+    829: .same(proto: "service"),
+    830: .same(proto: "ServiceDescriptorProto"),
+    831: .same(proto: "ServiceOptions"),
+    832: .same(proto: "set"),
+    833: .same(proto: "setExtensionValue"),
+    834: .same(proto: "shift"),
+    835: .same(proto: "SimpleExtensionMap"),
+    836: .same(proto: "size"),
+    837: .same(proto: "sizer"),
+    838: .same(proto: "source"),
+    839: .same(proto: "sourceCodeInfo"),
+    840: .same(proto: "sourceContext"),
+    841: .same(proto: "sourceEncoding"),
+    842: .same(proto: "sourceFile"),
+    843: .same(proto: "SourceLocation"),
+    844: .same(proto: "span"),
+    845: .same(proto: "split"),
+    846: .same(proto: "start"),
+    847: .same(proto: "startArray"),
+    848: .same(proto: "startArrayObject"),
+    849: .same(proto: "startField"),
+    850: .same(proto: "startIndex"),
+    851: .same(proto: "startMessageField"),
+    852: .same(proto: "startObject"),
+    853: .same(proto: "startRegularField"),
+    854: .same(proto: "state"),
+    855: .same(proto: "static"),
+    856: .same(proto: "StaticString"),
+    857: .same(proto: "storage"),
+    858: .same(proto: "String"),
+    859: .same(proto: "stringLiteral"),
+    860: .same(proto: "StringLiteralType"),
+    861: .same(proto: "stringResult"),
+    862: .same(proto: "stringValue"),
+    863: .same(proto: "struct"),
+    864: .same(proto: "structValue"),
+    865: .same(proto: "subDecoder"),
+    866: .same(proto: "subscript"),
+    867: .same(proto: "subtract"),
+    868: .same(proto: "subVisitor"),
+    869: .same(proto: "Swift"),
+    870: .same(proto: "swiftPrefix"),
+    871: .same(proto: "SwiftProtobufContiguousBytes"),
+    872: .same(proto: "SwiftProtobufError"),
+    873: .same(proto: "syntax"),
+    874: .same(proto: "T"),
+    875: .same(proto: "tag"),
+    876: .same(proto: "targets"),
+    877: .same(proto: "terminator"),
+    878: .same(proto: "testDecoder"),
+    879: .same(proto: "text"),
+    880: .same(proto: "textDecoder"),
+    881: .same(proto: "TextFormatDecoder"),
+    882: .same(proto: "TextFormatDecodingError"),
+    883: .same(proto: "TextFormatDecodingOptions"),
+    884: .same(proto: "TextFormatEncodingOptions"),
+    885: .same(proto: "TextFormatEncodingVisitor"),
+    886: .same(proto: "textFormatString"),
+    887: .same(proto: "throwOrIgnore"),
+    888: .same(proto: "throws"),
+    889: .same(proto: "timeInterval"),
+    890: .same(proto: "timeIntervalSince1970"),
+    891: .same(proto: "timeIntervalSinceReferenceDate"),
+    892: .same(proto: "Timestamp"),
+    893: .same(proto: "tmp"),
+    894: .same(proto: "tooLarge"),
+    895: .same(proto: "total"),
+    896: .same(proto: "totalArrayDepth"),
+    897: .same(proto: "totalSize"),
+    898: .same(proto: "trailingComments"),
+    899: .same(proto: "traverse"),
+    900: .same(proto: "trim"),
+    901: .same(proto: "true"),
+    902: .same(proto: "try"),
+    903: .same(proto: "type"),
+    904: .same(proto: "typealias"),
+    905: .same(proto: "TypeEnum"),
+    906: .same(proto: "typeName"),
+    907: .same(proto: "typePrefix"),
+    908: .same(proto: "typeStart"),
+    909: .same(proto: "typeUnknown"),
+    910: .same(proto: "typeURL"),
+    911: .same(proto: "UInt32"),
+    912: .same(proto: "UInt32Value"),
+    913: .same(proto: "UInt64"),
+    914: .same(proto: "UInt64Value"),
+    915: .same(proto: "UInt8"),
+    916: .same(proto: "unchecked"),
+    917: .same(proto: "unicodeScalarLiteral"),
+    918: .same(proto: "UnicodeScalarLiteralType"),
+    919: .same(proto: "unicodeScalars"),
+    920: .same(proto: "UnicodeScalarView"),
+    921: .same(proto: "uninterpretedOption"),
+    922: .same(proto: "union"),
+    923: .same(proto: "uniqueStorage"),
+    924: .same(proto: "unknown"),
+    925: .same(proto: "unknownFields"),
+    926: .same(proto: "UnknownStorage"),
+    927: .same(proto: "unpackTo"),
+    928: .same(proto: "UnsafeBufferPointer"),
+    929: .same(proto: "UnsafeMutablePointer"),
+    930: .same(proto: "UnsafeMutableRawBufferPointer"),
+    931: .same(proto: "UnsafeRawBufferPointer"),
+    932: .same(proto: "UnsafeRawPointer"),
+    933: .same(proto: "unverifiedLazy"),
+    934: .same(proto: "updatedOptions"),
+    935: .same(proto: "url"),
+    936: .same(proto: "useDeterministicOrdering"),
+    937: .same(proto: "utf8"),
+    938: .same(proto: "utf8Ptr"),
+    939: .same(proto: "utf8ToDouble"),
+    940: .same(proto: "utf8Validation"),
+    941: .same(proto: "UTF8View"),
+    942: .same(proto: "v"),
+    943: .same(proto: "value"),
+    944: .same(proto: "valueField"),
+    945: .same(proto: "values"),
+    946: .same(proto: "ValueType"),
+    947: .same(proto: "var"),
+    948: .same(proto: "verification"),
+    949: .same(proto: "VerificationState"),
+    950: .same(proto: "Version"),
+    951: .same(proto: "versionString"),
+    952: .same(proto: "visitExtensionFields"),
+    953: .same(proto: "visitExtensionFieldsAsMessageSet"),
+    954: .same(proto: "visitMapField"),
+    955: .same(proto: "visitor"),
+    956: .same(proto: "visitPacked"),
+    957: .same(proto: "visitPackedBoolField"),
+    958: .same(proto: "visitPackedDoubleField"),
+    959: .same(proto: "visitPackedEnumField"),
+    960: .same(proto: "visitPackedFixed32Field"),
+    961: .same(proto: "visitPackedFixed64Field"),
+    962: .same(proto: "visitPackedFloatField"),
+    963: .same(proto: "visitPackedInt32Field"),
+    964: .same(proto: "visitPackedInt64Field"),
+    965: .same(proto: "visitPackedSFixed32Field"),
+    966: .same(proto: "visitPackedSFixed64Field"),
+    967: .same(proto: "visitPackedSInt32Field"),
+    968: .same(proto: "visitPackedSInt64Field"),
+    969: .same(proto: "visitPackedUInt32Field"),
+    970: .same(proto: "visitPackedUInt64Field"),
+    971: .same(proto: "visitRepeated"),
+    972: .same(proto: "visitRepeatedBoolField"),
+    973: .same(proto: "visitRepeatedBytesField"),
+    974: .same(proto: "visitRepeatedDoubleField"),
+    975: .same(proto: "visitRepeatedEnumField"),
+    976: .same(proto: "visitRepeatedFixed32Field"),
+    977: .same(proto: "visitRepeatedFixed64Field"),
+    978: .same(proto: "visitRepeatedFloatField"),
+    979: .same(proto: "visitRepeatedGroupField"),
+    980: .same(proto: "visitRepeatedInt32Field"),
+    981: .same(proto: "visitRepeatedInt64Field"),
+    982: .same(proto: "visitRepeatedMessageField"),
+    983: .same(proto: "visitRepeatedSFixed32Field"),
+    984: .same(proto: "visitRepeatedSFixed64Field"),
+    985: .same(proto: "visitRepeatedSInt32Field"),
+    986: .same(proto: "visitRepeatedSInt64Field"),
+    987: .same(proto: "visitRepeatedStringField"),
+    988: .same(proto: "visitRepeatedUInt32Field"),
+    989: .same(proto: "visitRepeatedUInt64Field"),
+    990: .same(proto: "visitSingular"),
+    991: .same(proto: "visitSingularBoolField"),
+    992: .same(proto: "visitSingularBytesField"),
+    993: .same(proto: "visitSingularDoubleField"),
+    994: .same(proto: "visitSingularEnumField"),
+    995: .same(proto: "visitSingularFixed32Field"),
+    996: .same(proto: "visitSingularFixed64Field"),
+    997: .same(proto: "visitSingularFloatField"),
+    998: .same(proto: "visitSingularGroupField"),
+    999: .same(proto: "visitSingularInt32Field"),
+    1000: .same(proto: "visitSingularInt64Field"),
+    1001: .same(proto: "visitSingularMessageField"),
+    1002: .same(proto: "visitSingularSFixed32Field"),
+    1003: .same(proto: "visitSingularSFixed64Field"),
+    1004: .same(proto: "visitSingularSInt32Field"),
+    1005: .same(proto: "visitSingularSInt64Field"),
+    1006: .same(proto: "visitSingularStringField"),
+    1007: .same(proto: "visitSingularUInt32Field"),
+    1008: .same(proto: "visitSingularUInt64Field"),
+    1009: .same(proto: "visitUnknown"),
+    1010: .same(proto: "wasDecoded"),
+    1011: .same(proto: "weak"),
+    1012: .same(proto: "weakDependency"),
+    1013: .same(proto: "where"),
+    1014: .same(proto: "wireFormat"),
+    1015: .same(proto: "with"),
+    1016: .same(proto: "withUnsafeBytes"),
+    1017: .same(proto: "withUnsafeMutableBytes"),
+    1018: .same(proto: "work"),
+    1019: .same(proto: "Wrapped"),
+    1020: .same(proto: "WrappedType"),
+    1021: .same(proto: "wrappedValue"),
+    1022: .same(proto: "written"),
+    1023: .same(proto: "yday"),
   ]
 
   fileprivate class _StorageClass {
@@ -6238,6 +6280,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _clearEditionIntroduced_p: Int32 = 0
     var _clearEditionRemoved_p: Int32 = 0
     var _clearEnd_p: Int32 = 0
+    var _clearEnforceNamingStyle_p: Int32 = 0
     var _clearEnumType_p: Int32 = 0
     var _clearExtendee_p: Int32 = 0
     var _clearExtensionValue_p: Int32 = 0
@@ -6420,6 +6463,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _emitFieldName: Int32 = 0
     var _emitFieldNumber: Int32 = 0
     var _empty: Int32 = 0
+    var _emptyAnyTypeURL: Int32 = 0
     var _emptyData: Int32 = 0
     var _encodeAsBytes: Int32 = 0
     var _encoded: Int32 = 0
@@ -6432,6 +6476,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _endMessageField: Int32 = 0
     var _endObject: Int32 = 0
     var _endRegularField: Int32 = 0
+    var _enforceNamingStyle: Int32 = 0
     var _enum: Int32 = 0
     var _enumDescriptorProto: Int32 = 0
     var _enumOptions: Int32 = 0
@@ -6595,6 +6640,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _hasEditionIntroduced_p: Int32 = 0
     var _hasEditionRemoved_p: Int32 = 0
     var _hasEnd_p: Int32 = 0
+    var _hasEnforceNamingStyle_p: Int32 = 0
     var _hasEnumType_p: Int32 = 0
     var _hasExtendee_p: Int32 = 0
     var _hasExtensionValue_p: Int32 = 0
@@ -6696,6 +6742,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _intersect: Int32 = 0
     var _into: Int32 = 0
     var _ints: Int32 = 0
+    var _invalidAnyTypeURL: Int32 = 0
     var _isA: Int32 = 0
     var _isEqual: Int32 = 0
     var _isEqualTo: Int32 = 0
@@ -6713,9 +6760,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _javaPackage: Int32 = 0
     var _javaStringCheckUtf8: Int32 = 0
     var _jsondecoder: Int32 = 0
+    var _jsondecoding: Int32 = 0
     var _jsondecodingError: Int32 = 0
     var _jsondecodingOptions: Int32 = 0
     var _jsonEncoder: Int32 = 0
+    var _jsonencoding: Int32 = 0
     var _jsonencodingError: Int32 = 0
     var _jsonencodingOptions: Int32 = 0
     var _jsonencodingVisitor: Int32 = 0
@@ -7268,6 +7317,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _clearEditionIntroduced_p = source._clearEditionIntroduced_p
       _clearEditionRemoved_p = source._clearEditionRemoved_p
       _clearEnd_p = source._clearEnd_p
+      _clearEnforceNamingStyle_p = source._clearEnforceNamingStyle_p
       _clearEnumType_p = source._clearEnumType_p
       _clearExtendee_p = source._clearExtendee_p
       _clearExtensionValue_p = source._clearExtensionValue_p
@@ -7450,6 +7500,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _emitFieldName = source._emitFieldName
       _emitFieldNumber = source._emitFieldNumber
       _empty = source._empty
+      _emptyAnyTypeURL = source._emptyAnyTypeURL
       _emptyData = source._emptyData
       _encodeAsBytes = source._encodeAsBytes
       _encoded = source._encoded
@@ -7462,6 +7513,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _endMessageField = source._endMessageField
       _endObject = source._endObject
       _endRegularField = source._endRegularField
+      _enforceNamingStyle = source._enforceNamingStyle
       _enum = source._enum
       _enumDescriptorProto = source._enumDescriptorProto
       _enumOptions = source._enumOptions
@@ -7625,6 +7677,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _hasEditionIntroduced_p = source._hasEditionIntroduced_p
       _hasEditionRemoved_p = source._hasEditionRemoved_p
       _hasEnd_p = source._hasEnd_p
+      _hasEnforceNamingStyle_p = source._hasEnforceNamingStyle_p
       _hasEnumType_p = source._hasEnumType_p
       _hasExtendee_p = source._hasExtendee_p
       _hasExtensionValue_p = source._hasExtensionValue_p
@@ -7726,6 +7779,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _intersect = source._intersect
       _into = source._into
       _ints = source._ints
+      _invalidAnyTypeURL = source._invalidAnyTypeURL
       _isA = source._isA
       _isEqual = source._isEqual
       _isEqualTo = source._isEqualTo
@@ -7743,9 +7797,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _javaPackage = source._javaPackage
       _javaStringCheckUtf8 = source._javaStringCheckUtf8
       _jsondecoder = source._jsondecoder
+      _jsondecoding = source._jsondecoding
       _jsondecodingError = source._jsondecodingError
       _jsondecodingOptions = source._jsondecodingOptions
       _jsonEncoder = source._jsonEncoder
+      _jsonencoding = source._jsonencoding
       _jsonencodingError = source._jsonencodingError
       _jsonencodingOptions = source._jsonencodingOptions
       _jsonencodingVisitor = source._jsonencodingVisitor
@@ -8302,926 +8358,933 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         case 94: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEditionIntroduced_p) }()
         case 95: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEditionRemoved_p) }()
         case 96: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnd_p) }()
-        case 97: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnumType_p) }()
-        case 98: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtendee_p) }()
-        case 99: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtensionValue_p) }()
-        case 100: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatures_p) }()
-        case 101: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatureSupport_p) }()
-        case 102: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFieldPresence_p) }()
-        case 103: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFixedFeatures_p) }()
-        case 104: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFullName_p) }()
-        case 105: try { try decoder.decodeSingularInt32Field(value: &_storage._clearGoPackage_p) }()
-        case 106: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdempotencyLevel_p) }()
-        case 107: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdentifierValue_p) }()
-        case 108: try { try decoder.decodeSingularInt32Field(value: &_storage._clearInputType_p) }()
-        case 109: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIsExtension_p) }()
-        case 110: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenerateEqualsAndHash_p) }()
-        case 111: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenericServices_p) }()
-        case 112: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaMultipleFiles_p) }()
-        case 113: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaOuterClassname_p) }()
-        case 114: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaPackage_p) }()
-        case 115: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaStringCheckUtf8_p) }()
-        case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonFormat_p) }()
-        case 117: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonName_p) }()
-        case 118: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJstype_p) }()
-        case 119: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLabel_p) }()
-        case 120: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLazy_p) }()
-        case 121: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLeadingComments_p) }()
-        case 122: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMapEntry_p) }()
-        case 123: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMaximumEdition_p) }()
-        case 124: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageEncoding_p) }()
-        case 125: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageSetWireFormat_p) }()
-        case 126: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMinimumEdition_p) }()
-        case 127: try { try decoder.decodeSingularInt32Field(value: &_storage._clearName_p) }()
-        case 128: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNamePart_p) }()
-        case 129: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNegativeIntValue_p) }()
-        case 130: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNoStandardDescriptorAccessor_p) }()
-        case 131: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNumber_p) }()
-        case 132: try { try decoder.decodeSingularInt32Field(value: &_storage._clearObjcClassPrefix_p) }()
-        case 133: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOneofIndex_p) }()
-        case 134: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptimizeFor_p) }()
-        case 135: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptions_p) }()
-        case 136: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOutputType_p) }()
-        case 137: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOverridableFeatures_p) }()
-        case 138: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPackage_p) }()
-        case 139: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPacked_p) }()
-        case 140: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpClassPrefix_p) }()
-        case 141: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpMetadataNamespace_p) }()
-        case 142: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpNamespace_p) }()
-        case 143: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPositiveIntValue_p) }()
-        case 144: try { try decoder.decodeSingularInt32Field(value: &_storage._clearProto3Optional_p) }()
-        case 145: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPyGenericServices_p) }()
-        case 146: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeated_p) }()
-        case 147: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeatedFieldEncoding_p) }()
-        case 148: try { try decoder.decodeSingularInt32Field(value: &_storage._clearReserved_p) }()
-        case 149: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRetention_p) }()
-        case 150: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRubyPackage_p) }()
-        case 151: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSemantic_p) }()
-        case 152: try { try decoder.decodeSingularInt32Field(value: &_storage._clearServerStreaming_p) }()
-        case 153: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceCodeInfo_p) }()
-        case 154: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceContext_p) }()
-        case 155: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceFile_p) }()
-        case 156: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStart_p) }()
-        case 157: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStringValue_p) }()
-        case 158: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSwiftPrefix_p) }()
-        case 159: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSyntax_p) }()
-        case 160: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTrailingComments_p) }()
-        case 161: try { try decoder.decodeSingularInt32Field(value: &_storage._clearType_p) }()
-        case 162: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTypeName_p) }()
-        case 163: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUnverifiedLazy_p) }()
-        case 164: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUtf8Validation_p) }()
-        case 165: try { try decoder.decodeSingularInt32Field(value: &_storage._clearValue_p) }()
-        case 166: try { try decoder.decodeSingularInt32Field(value: &_storage._clearVerification_p) }()
-        case 167: try { try decoder.decodeSingularInt32Field(value: &_storage._clearWeak_p) }()
-        case 168: try { try decoder.decodeSingularInt32Field(value: &_storage._clientStreaming) }()
-        case 169: try { try decoder.decodeSingularInt32Field(value: &_storage._code) }()
-        case 170: try { try decoder.decodeSingularInt32Field(value: &_storage._codePoint) }()
-        case 171: try { try decoder.decodeSingularInt32Field(value: &_storage._codeUnits) }()
-        case 172: try { try decoder.decodeSingularInt32Field(value: &_storage._collection) }()
-        case 173: try { try decoder.decodeSingularInt32Field(value: &_storage._com) }()
-        case 174: try { try decoder.decodeSingularInt32Field(value: &_storage._comma) }()
-        case 175: try { try decoder.decodeSingularInt32Field(value: &_storage._consumedBytes) }()
-        case 176: try { try decoder.decodeSingularInt32Field(value: &_storage._contains) }()
-        case 177: try { try decoder.decodeSingularInt32Field(value: &_storage._contentsOf) }()
-        case 178: try { try decoder.decodeSingularInt32Field(value: &_storage._contiguousBytes) }()
-        case 179: try { try decoder.decodeSingularInt32Field(value: &_storage._copy) }()
-        case 180: try { try decoder.decodeSingularInt32Field(value: &_storage._count) }()
-        case 181: try { try decoder.decodeSingularInt32Field(value: &_storage._countVarintsInBuffer) }()
-        case 182: try { try decoder.decodeSingularInt32Field(value: &_storage._csharpNamespace) }()
-        case 183: try { try decoder.decodeSingularInt32Field(value: &_storage._ctype) }()
-        case 184: try { try decoder.decodeSingularInt32Field(value: &_storage._customCodable) }()
-        case 185: try { try decoder.decodeSingularInt32Field(value: &_storage._customDebugStringConvertible) }()
-        case 186: try { try decoder.decodeSingularInt32Field(value: &_storage._customStringConvertible) }()
-        case 187: try { try decoder.decodeSingularInt32Field(value: &_storage._d) }()
-        case 188: try { try decoder.decodeSingularInt32Field(value: &_storage._data) }()
-        case 189: try { try decoder.decodeSingularInt32Field(value: &_storage._dataResult) }()
-        case 190: try { try decoder.decodeSingularInt32Field(value: &_storage._date) }()
-        case 191: try { try decoder.decodeSingularInt32Field(value: &_storage._daySec) }()
-        case 192: try { try decoder.decodeSingularInt32Field(value: &_storage._daysSinceEpoch) }()
-        case 193: try { try decoder.decodeSingularInt32Field(value: &_storage._debugDescription_p) }()
-        case 194: try { try decoder.decodeSingularInt32Field(value: &_storage._debugRedact) }()
-        case 195: try { try decoder.decodeSingularInt32Field(value: &_storage._declaration) }()
-        case 196: try { try decoder.decodeSingularInt32Field(value: &_storage._decoded) }()
-        case 197: try { try decoder.decodeSingularInt32Field(value: &_storage._decodedFromJsonnull) }()
-        case 198: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionField) }()
-        case 199: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionFieldsAsMessageSet) }()
-        case 200: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeJson) }()
-        case 201: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMapField) }()
-        case 202: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMessage) }()
-        case 203: try { try decoder.decodeSingularInt32Field(value: &_storage._decoder) }()
-        case 204: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeated) }()
-        case 205: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBoolField) }()
-        case 206: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBytesField) }()
-        case 207: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedDoubleField) }()
-        case 208: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedEnumField) }()
-        case 209: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed32Field) }()
-        case 210: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed64Field) }()
-        case 211: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFloatField) }()
-        case 212: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedGroupField) }()
-        case 213: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt32Field) }()
-        case 214: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt64Field) }()
-        case 215: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedMessageField) }()
-        case 216: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed32Field) }()
-        case 217: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed64Field) }()
-        case 218: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint32Field) }()
-        case 219: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint64Field) }()
-        case 220: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedStringField) }()
-        case 221: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint32Field) }()
-        case 222: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint64Field) }()
-        case 223: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingular) }()
-        case 224: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBoolField) }()
-        case 225: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBytesField) }()
-        case 226: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularDoubleField) }()
-        case 227: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularEnumField) }()
-        case 228: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed32Field) }()
-        case 229: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed64Field) }()
-        case 230: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFloatField) }()
-        case 231: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularGroupField) }()
-        case 232: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt32Field) }()
-        case 233: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt64Field) }()
-        case 234: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularMessageField) }()
-        case 235: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed32Field) }()
-        case 236: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed64Field) }()
-        case 237: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint32Field) }()
-        case 238: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint64Field) }()
-        case 239: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularStringField) }()
-        case 240: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint32Field) }()
-        case 241: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint64Field) }()
-        case 242: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeTextFormat) }()
-        case 243: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultAnyTypeUrlprefix) }()
-        case 244: try { try decoder.decodeSingularInt32Field(value: &_storage._defaults) }()
-        case 245: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultValue) }()
-        case 246: try { try decoder.decodeSingularInt32Field(value: &_storage._dependency) }()
-        case 247: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecated) }()
-        case 248: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecatedLegacyJsonFieldConflicts) }()
-        case 249: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecationWarning) }()
-        case 250: try { try decoder.decodeSingularInt32Field(value: &_storage._description_p) }()
-        case 251: try { try decoder.decodeSingularInt32Field(value: &_storage._descriptorProto) }()
-        case 252: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionary) }()
-        case 253: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionaryLiteral) }()
-        case 254: try { try decoder.decodeSingularInt32Field(value: &_storage._digit) }()
-        case 255: try { try decoder.decodeSingularInt32Field(value: &_storage._digit0) }()
-        case 256: try { try decoder.decodeSingularInt32Field(value: &_storage._digit1) }()
-        case 257: try { try decoder.decodeSingularInt32Field(value: &_storage._digitCount) }()
-        case 258: try { try decoder.decodeSingularInt32Field(value: &_storage._digits) }()
-        case 259: try { try decoder.decodeSingularInt32Field(value: &_storage._digitValue) }()
-        case 260: try { try decoder.decodeSingularInt32Field(value: &_storage._discardableResult) }()
-        case 261: try { try decoder.decodeSingularInt32Field(value: &_storage._discardUnknownFields) }()
-        case 262: try { try decoder.decodeSingularInt32Field(value: &_storage._double) }()
-        case 263: try { try decoder.decodeSingularInt32Field(value: &_storage._doubleValue) }()
-        case 264: try { try decoder.decodeSingularInt32Field(value: &_storage._duration) }()
-        case 265: try { try decoder.decodeSingularInt32Field(value: &_storage._e) }()
-        case 266: try { try decoder.decodeSingularInt32Field(value: &_storage._edition) }()
-        case 267: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefault) }()
-        case 268: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefaults) }()
-        case 269: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDeprecated) }()
-        case 270: try { try decoder.decodeSingularInt32Field(value: &_storage._editionIntroduced) }()
-        case 271: try { try decoder.decodeSingularInt32Field(value: &_storage._editionRemoved) }()
-        case 272: try { try decoder.decodeSingularInt32Field(value: &_storage._element) }()
-        case 273: try { try decoder.decodeSingularInt32Field(value: &_storage._elements) }()
-        case 274: try { try decoder.decodeSingularInt32Field(value: &_storage._else) }()
-        case 275: try { try decoder.decodeSingularInt32Field(value: &_storage._emitExtensionFieldName) }()
-        case 276: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldName) }()
-        case 277: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldNumber) }()
-        case 278: try { try decoder.decodeSingularInt32Field(value: &_storage._empty) }()
-        case 279: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyData) }()
-        case 280: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeAsBytes) }()
-        case 281: try { try decoder.decodeSingularInt32Field(value: &_storage._encoded) }()
-        case 282: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedJsonstring) }()
-        case 283: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedSize) }()
-        case 284: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeField) }()
-        case 285: try { try decoder.decodeSingularInt32Field(value: &_storage._encoder) }()
-        case 286: try { try decoder.decodeSingularInt32Field(value: &_storage._end) }()
-        case 287: try { try decoder.decodeSingularInt32Field(value: &_storage._endArray) }()
-        case 288: try { try decoder.decodeSingularInt32Field(value: &_storage._endMessageField) }()
-        case 289: try { try decoder.decodeSingularInt32Field(value: &_storage._endObject) }()
-        case 290: try { try decoder.decodeSingularInt32Field(value: &_storage._endRegularField) }()
-        case 291: try { try decoder.decodeSingularInt32Field(value: &_storage._enum) }()
-        case 292: try { try decoder.decodeSingularInt32Field(value: &_storage._enumDescriptorProto) }()
-        case 293: try { try decoder.decodeSingularInt32Field(value: &_storage._enumOptions) }()
-        case 294: try { try decoder.decodeSingularInt32Field(value: &_storage._enumReservedRange) }()
-        case 295: try { try decoder.decodeSingularInt32Field(value: &_storage._enumType) }()
-        case 296: try { try decoder.decodeSingularInt32Field(value: &_storage._enumvalue) }()
-        case 297: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueDescriptorProto) }()
-        case 298: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueOptions) }()
-        case 299: try { try decoder.decodeSingularInt32Field(value: &_storage._equatable) }()
-        case 300: try { try decoder.decodeSingularInt32Field(value: &_storage._error) }()
-        case 301: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByArrayLiteral) }()
-        case 302: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByDictionaryLiteral) }()
-        case 303: try { try decoder.decodeSingularInt32Field(value: &_storage._ext) }()
-        case 304: try { try decoder.decodeSingularInt32Field(value: &_storage._extDecoder) }()
-        case 305: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteral) }()
-        case 306: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteralType) }()
-        case 307: try { try decoder.decodeSingularInt32Field(value: &_storage._extendee) }()
-        case 308: try { try decoder.decodeSingularInt32Field(value: &_storage._extensibleMessage) }()
-        case 309: try { try decoder.decodeSingularInt32Field(value: &_storage._extension) }()
-        case 310: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionField) }()
-        case 311: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldNumber) }()
-        case 312: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldValueSet) }()
-        case 313: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionMap) }()
-        case 314: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRange) }()
-        case 315: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRangeOptions) }()
-        case 316: try { try decoder.decodeSingularInt32Field(value: &_storage._extensions) }()
-        case 317: try { try decoder.decodeSingularInt32Field(value: &_storage._extras) }()
-        case 318: try { try decoder.decodeSingularInt32Field(value: &_storage._f) }()
-        case 319: try { try decoder.decodeSingularInt32Field(value: &_storage._false) }()
-        case 320: try { try decoder.decodeSingularInt32Field(value: &_storage._features) }()
-        case 321: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSet) }()
-        case 322: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetDefaults) }()
-        case 323: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetEditionDefault) }()
-        case 324: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSupport) }()
-        case 325: try { try decoder.decodeSingularInt32Field(value: &_storage._field) }()
-        case 326: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldData) }()
-        case 327: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldDescriptorProto) }()
-        case 328: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMask) }()
-        case 329: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMaskError) }()
-        case 330: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName) }()
-        case 331: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNameCount) }()
-        case 332: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNum) }()
-        case 333: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumber) }()
-        case 334: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumberForProto) }()
-        case 335: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldOptions) }()
-        case 336: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldPresence) }()
-        case 337: try { try decoder.decodeSingularInt32Field(value: &_storage._fields) }()
-        case 338: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldSize) }()
-        case 339: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldTag) }()
-        case 340: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldType) }()
-        case 341: try { try decoder.decodeSingularInt32Field(value: &_storage._file) }()
-        case 342: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorProto) }()
-        case 343: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorSet) }()
-        case 344: try { try decoder.decodeSingularInt32Field(value: &_storage._fileName) }()
-        case 345: try { try decoder.decodeSingularInt32Field(value: &_storage._fileOptions) }()
-        case 346: try { try decoder.decodeSingularInt32Field(value: &_storage._filter) }()
-        case 347: try { try decoder.decodeSingularInt32Field(value: &_storage._final) }()
-        case 348: try { try decoder.decodeSingularInt32Field(value: &_storage._finiteOnly) }()
-        case 349: try { try decoder.decodeSingularInt32Field(value: &_storage._first) }()
-        case 350: try { try decoder.decodeSingularInt32Field(value: &_storage._firstItem) }()
-        case 351: try { try decoder.decodeSingularInt32Field(value: &_storage._fixedFeatures) }()
-        case 352: try { try decoder.decodeSingularInt32Field(value: &_storage._float) }()
-        case 353: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteral) }()
-        case 354: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteralType) }()
-        case 355: try { try decoder.decodeSingularInt32Field(value: &_storage._floatValue) }()
-        case 356: try { try decoder.decodeSingularInt32Field(value: &_storage._for) }()
-        case 357: try { try decoder.decodeSingularInt32Field(value: &_storage._forMessageName) }()
-        case 358: try { try decoder.decodeSingularInt32Field(value: &_storage._formUnion) }()
-        case 359: try { try decoder.decodeSingularInt32Field(value: &_storage._forReadingFrom) }()
-        case 360: try { try decoder.decodeSingularInt32Field(value: &_storage._forTypeURL) }()
-        case 361: try { try decoder.decodeSingularInt32Field(value: &_storage._forwardParser) }()
-        case 362: try { try decoder.decodeSingularInt32Field(value: &_storage._forWritingInto) }()
-        case 363: try { try decoder.decodeSingularInt32Field(value: &_storage._from) }()
-        case 364: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii2) }()
-        case 365: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii4) }()
-        case 366: try { try decoder.decodeSingularInt32Field(value: &_storage._fromByteOffset) }()
-        case 367: try { try decoder.decodeSingularInt32Field(value: &_storage._fromHexDigit) }()
-        case 368: try { try decoder.decodeSingularInt32Field(value: &_storage._fullName) }()
-        case 369: try { try decoder.decodeSingularInt32Field(value: &_storage._func) }()
-        case 370: try { try decoder.decodeSingularInt32Field(value: &_storage._function) }()
-        case 371: try { try decoder.decodeSingularInt32Field(value: &_storage._g) }()
-        case 372: try { try decoder.decodeSingularInt32Field(value: &_storage._generatedCodeInfo) }()
-        case 373: try { try decoder.decodeSingularInt32Field(value: &_storage._get) }()
-        case 374: try { try decoder.decodeSingularInt32Field(value: &_storage._getExtensionValue) }()
-        case 375: try { try decoder.decodeSingularInt32Field(value: &_storage._googleapis) }()
-        case 376: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufAny) }()
-        case 377: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufApi) }()
-        case 378: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBoolValue) }()
-        case 379: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBytesValue) }()
-        case 380: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDescriptorProto) }()
-        case 381: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDoubleValue) }()
-        case 382: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDuration) }()
-        case 383: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEdition) }()
-        case 384: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEmpty) }()
-        case 385: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnum) }()
-        case 386: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumDescriptorProto) }()
-        case 387: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumOptions) }()
-        case 388: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValue) }()
-        case 389: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueDescriptorProto) }()
-        case 390: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueOptions) }()
-        case 391: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufExtensionRangeOptions) }()
-        case 392: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSet) }()
-        case 393: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSetDefaults) }()
-        case 394: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufField) }()
-        case 395: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldDescriptorProto) }()
-        case 396: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldMask) }()
-        case 397: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldOptions) }()
-        case 398: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorProto) }()
-        case 399: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorSet) }()
-        case 400: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileOptions) }()
-        case 401: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFloatValue) }()
-        case 402: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufGeneratedCodeInfo) }()
-        case 403: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt32Value) }()
-        case 404: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt64Value) }()
-        case 405: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufListValue) }()
-        case 406: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMessageOptions) }()
-        case 407: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethod) }()
-        case 408: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodDescriptorProto) }()
-        case 409: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodOptions) }()
-        case 410: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMixin) }()
-        case 411: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufNullValue) }()
-        case 412: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofDescriptorProto) }()
-        case 413: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofOptions) }()
-        case 414: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOption) }()
-        case 415: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceDescriptorProto) }()
-        case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceOptions) }()
-        case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceCodeInfo) }()
-        case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceContext) }()
-        case 419: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStringValue) }()
-        case 420: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStruct) }()
-        case 421: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSyntax) }()
-        case 422: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufTimestamp) }()
-        case 423: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufType) }()
-        case 424: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint32Value) }()
-        case 425: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint64Value) }()
-        case 426: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUninterpretedOption) }()
-        case 427: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufValue) }()
-        case 428: try { try decoder.decodeSingularInt32Field(value: &_storage._goPackage) }()
-        case 429: try { try decoder.decodeSingularInt32Field(value: &_storage._group) }()
-        case 430: try { try decoder.decodeSingularInt32Field(value: &_storage._groupFieldNumberStack) }()
-        case 431: try { try decoder.decodeSingularInt32Field(value: &_storage._groupSize) }()
-        case 432: try { try decoder.decodeSingularInt32Field(value: &_storage._guard) }()
-        case 433: try { try decoder.decodeSingularInt32Field(value: &_storage._hadOneofValue) }()
-        case 434: try { try decoder.decodeSingularInt32Field(value: &_storage._handleConflictingOneOf) }()
-        case 435: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAggregateValue_p) }()
-        case 436: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAllowAlias_p) }()
-        case 437: try { try decoder.decodeSingularInt32Field(value: &_storage._hasBegin_p) }()
-        case 438: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcEnableArenas_p) }()
-        case 439: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcGenericServices_p) }()
-        case 440: try { try decoder.decodeSingularInt32Field(value: &_storage._hasClientStreaming_p) }()
-        case 441: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCsharpNamespace_p) }()
-        case 442: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCtype_p) }()
-        case 443: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDebugRedact_p) }()
-        case 444: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDefaultValue_p) }()
-        case 445: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecated_p) }()
-        case 446: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecatedLegacyJsonFieldConflicts_p) }()
-        case 447: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecationWarning_p) }()
-        case 448: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDoubleValue_p) }()
-        case 449: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEdition_p) }()
-        case 450: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionDeprecated_p) }()
-        case 451: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionIntroduced_p) }()
-        case 452: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionRemoved_p) }()
-        case 453: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnd_p) }()
-        case 454: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnumType_p) }()
-        case 455: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtendee_p) }()
-        case 456: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtensionValue_p) }()
-        case 457: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatures_p) }()
-        case 458: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatureSupport_p) }()
-        case 459: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFieldPresence_p) }()
-        case 460: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFixedFeatures_p) }()
-        case 461: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFullName_p) }()
-        case 462: try { try decoder.decodeSingularInt32Field(value: &_storage._hasGoPackage_p) }()
-        case 463: try { try decoder.decodeSingularInt32Field(value: &_storage._hash) }()
-        case 464: try { try decoder.decodeSingularInt32Field(value: &_storage._hashable) }()
-        case 465: try { try decoder.decodeSingularInt32Field(value: &_storage._hasher) }()
-        case 466: try { try decoder.decodeSingularInt32Field(value: &_storage._hashVisitor) }()
-        case 467: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdempotencyLevel_p) }()
-        case 468: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdentifierValue_p) }()
-        case 469: try { try decoder.decodeSingularInt32Field(value: &_storage._hasInputType_p) }()
-        case 470: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIsExtension_p) }()
-        case 471: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenerateEqualsAndHash_p) }()
-        case 472: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenericServices_p) }()
-        case 473: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaMultipleFiles_p) }()
-        case 474: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaOuterClassname_p) }()
-        case 475: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaPackage_p) }()
-        case 476: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaStringCheckUtf8_p) }()
-        case 477: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonFormat_p) }()
-        case 478: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonName_p) }()
-        case 479: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJstype_p) }()
-        case 480: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLabel_p) }()
-        case 481: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLazy_p) }()
-        case 482: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLeadingComments_p) }()
-        case 483: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMapEntry_p) }()
-        case 484: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMaximumEdition_p) }()
-        case 485: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageEncoding_p) }()
-        case 486: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageSetWireFormat_p) }()
-        case 487: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMinimumEdition_p) }()
-        case 488: try { try decoder.decodeSingularInt32Field(value: &_storage._hasName_p) }()
-        case 489: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNamePart_p) }()
-        case 490: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNegativeIntValue_p) }()
-        case 491: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNoStandardDescriptorAccessor_p) }()
-        case 492: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNumber_p) }()
-        case 493: try { try decoder.decodeSingularInt32Field(value: &_storage._hasObjcClassPrefix_p) }()
-        case 494: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOneofIndex_p) }()
-        case 495: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptimizeFor_p) }()
-        case 496: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptions_p) }()
-        case 497: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOutputType_p) }()
-        case 498: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOverridableFeatures_p) }()
-        case 499: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPackage_p) }()
-        case 500: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPacked_p) }()
-        case 501: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpClassPrefix_p) }()
-        case 502: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpMetadataNamespace_p) }()
-        case 503: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpNamespace_p) }()
-        case 504: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPositiveIntValue_p) }()
-        case 505: try { try decoder.decodeSingularInt32Field(value: &_storage._hasProto3Optional_p) }()
-        case 506: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPyGenericServices_p) }()
-        case 507: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeated_p) }()
-        case 508: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeatedFieldEncoding_p) }()
-        case 509: try { try decoder.decodeSingularInt32Field(value: &_storage._hasReserved_p) }()
-        case 510: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRetention_p) }()
-        case 511: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRubyPackage_p) }()
-        case 512: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSemantic_p) }()
-        case 513: try { try decoder.decodeSingularInt32Field(value: &_storage._hasServerStreaming_p) }()
-        case 514: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceCodeInfo_p) }()
-        case 515: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceContext_p) }()
-        case 516: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceFile_p) }()
-        case 517: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStart_p) }()
-        case 518: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStringValue_p) }()
-        case 519: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSwiftPrefix_p) }()
-        case 520: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSyntax_p) }()
-        case 521: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTrailingComments_p) }()
-        case 522: try { try decoder.decodeSingularInt32Field(value: &_storage._hasType_p) }()
-        case 523: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTypeName_p) }()
-        case 524: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUnverifiedLazy_p) }()
-        case 525: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUtf8Validation_p) }()
-        case 526: try { try decoder.decodeSingularInt32Field(value: &_storage._hasValue_p) }()
-        case 527: try { try decoder.decodeSingularInt32Field(value: &_storage._hasVerification_p) }()
-        case 528: try { try decoder.decodeSingularInt32Field(value: &_storage._hasWeak_p) }()
-        case 529: try { try decoder.decodeSingularInt32Field(value: &_storage._hour) }()
-        case 530: try { try decoder.decodeSingularInt32Field(value: &_storage._i) }()
-        case 531: try { try decoder.decodeSingularInt32Field(value: &_storage._idempotencyLevel) }()
-        case 532: try { try decoder.decodeSingularInt32Field(value: &_storage._identifierValue) }()
-        case 533: try { try decoder.decodeSingularInt32Field(value: &_storage._if) }()
-        case 534: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownExtensionFields) }()
-        case 535: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownFields) }()
-        case 536: try { try decoder.decodeSingularInt32Field(value: &_storage._index) }()
-        case 537: try { try decoder.decodeSingularInt32Field(value: &_storage._init_p) }()
-        case 538: try { try decoder.decodeSingularInt32Field(value: &_storage._inout) }()
-        case 539: try { try decoder.decodeSingularInt32Field(value: &_storage._inputType) }()
-        case 540: try { try decoder.decodeSingularInt32Field(value: &_storage._insert) }()
-        case 541: try { try decoder.decodeSingularInt32Field(value: &_storage._int) }()
-        case 542: try { try decoder.decodeSingularInt32Field(value: &_storage._int32) }()
-        case 543: try { try decoder.decodeSingularInt32Field(value: &_storage._int32Value) }()
-        case 544: try { try decoder.decodeSingularInt32Field(value: &_storage._int64) }()
-        case 545: try { try decoder.decodeSingularInt32Field(value: &_storage._int64Value) }()
-        case 546: try { try decoder.decodeSingularInt32Field(value: &_storage._int8) }()
-        case 547: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteral) }()
-        case 548: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteralType) }()
-        case 549: try { try decoder.decodeSingularInt32Field(value: &_storage._intern) }()
-        case 550: try { try decoder.decodeSingularInt32Field(value: &_storage._internal) }()
-        case 551: try { try decoder.decodeSingularInt32Field(value: &_storage._internalState) }()
-        case 552: try { try decoder.decodeSingularInt32Field(value: &_storage._intersect) }()
-        case 553: try { try decoder.decodeSingularInt32Field(value: &_storage._into) }()
-        case 554: try { try decoder.decodeSingularInt32Field(value: &_storage._ints) }()
-        case 555: try { try decoder.decodeSingularInt32Field(value: &_storage._isA) }()
-        case 556: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqual) }()
-        case 557: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqualTo) }()
-        case 558: try { try decoder.decodeSingularInt32Field(value: &_storage._isExtension) }()
-        case 559: try { try decoder.decodeSingularInt32Field(value: &_storage._isInitialized_p) }()
-        case 560: try { try decoder.decodeSingularInt32Field(value: &_storage._isNegative) }()
-        case 561: try { try decoder.decodeSingularInt32Field(value: &_storage._isPathValid) }()
-        case 562: try { try decoder.decodeSingularInt32Field(value: &_storage._isValid) }()
-        case 563: try { try decoder.decodeSingularInt32Field(value: &_storage._itemTagsEncodedSize) }()
-        case 564: try { try decoder.decodeSingularInt32Field(value: &_storage._iterator) }()
-        case 565: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenerateEqualsAndHash) }()
-        case 566: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenericServices) }()
-        case 567: try { try decoder.decodeSingularInt32Field(value: &_storage._javaMultipleFiles) }()
-        case 568: try { try decoder.decodeSingularInt32Field(value: &_storage._javaOuterClassname) }()
-        case 569: try { try decoder.decodeSingularInt32Field(value: &_storage._javaPackage) }()
-        case 570: try { try decoder.decodeSingularInt32Field(value: &_storage._javaStringCheckUtf8) }()
-        case 571: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoder) }()
-        case 572: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingError) }()
-        case 573: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingOptions) }()
-        case 574: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonEncoder) }()
-        case 575: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingError) }()
-        case 576: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingOptions) }()
-        case 577: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingVisitor) }()
-        case 578: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonFormat) }()
-        case 579: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonmapEncodingVisitor) }()
-        case 580: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonName) }()
-        case 581: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPath) }()
-        case 582: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPaths) }()
-        case 583: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonscanner) }()
-        case 584: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonString) }()
-        case 585: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonText) }()
-        case 586: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Bytes) }()
-        case 587: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Data) }()
-        case 588: try { try decoder.decodeSingularInt32Field(value: &_storage._jstype) }()
-        case 589: try { try decoder.decodeSingularInt32Field(value: &_storage._k) }()
-        case 590: try { try decoder.decodeSingularInt32Field(value: &_storage._kChunkSize) }()
-        case 591: try { try decoder.decodeSingularInt32Field(value: &_storage._key) }()
-        case 592: try { try decoder.decodeSingularInt32Field(value: &_storage._keyField) }()
-        case 593: try { try decoder.decodeSingularInt32Field(value: &_storage._keyFieldOpt) }()
-        case 594: try { try decoder.decodeSingularInt32Field(value: &_storage._keyType) }()
-        case 595: try { try decoder.decodeSingularInt32Field(value: &_storage._kind) }()
-        case 596: try { try decoder.decodeSingularInt32Field(value: &_storage._l) }()
-        case 597: try { try decoder.decodeSingularInt32Field(value: &_storage._label) }()
-        case 598: try { try decoder.decodeSingularInt32Field(value: &_storage._lazy) }()
-        case 599: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingComments) }()
-        case 600: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingDetachedComments) }()
-        case 601: try { try decoder.decodeSingularInt32Field(value: &_storage._length) }()
-        case 602: try { try decoder.decodeSingularInt32Field(value: &_storage._lessThan) }()
-        case 603: try { try decoder.decodeSingularInt32Field(value: &_storage._let) }()
-        case 604: try { try decoder.decodeSingularInt32Field(value: &_storage._lhs) }()
-        case 605: try { try decoder.decodeSingularInt32Field(value: &_storage._line) }()
-        case 606: try { try decoder.decodeSingularInt32Field(value: &_storage._list) }()
-        case 607: try { try decoder.decodeSingularInt32Field(value: &_storage._listOfMessages) }()
-        case 608: try { try decoder.decodeSingularInt32Field(value: &_storage._listValue) }()
-        case 609: try { try decoder.decodeSingularInt32Field(value: &_storage._littleEndian) }()
-        case 610: try { try decoder.decodeSingularInt32Field(value: &_storage._load) }()
-        case 611: try { try decoder.decodeSingularInt32Field(value: &_storage._localHasher) }()
-        case 612: try { try decoder.decodeSingularInt32Field(value: &_storage._location) }()
-        case 613: try { try decoder.decodeSingularInt32Field(value: &_storage._m) }()
-        case 614: try { try decoder.decodeSingularInt32Field(value: &_storage._major) }()
-        case 615: try { try decoder.decodeSingularInt32Field(value: &_storage._makeAsyncIterator) }()
-        case 616: try { try decoder.decodeSingularInt32Field(value: &_storage._makeIterator) }()
-        case 617: try { try decoder.decodeSingularInt32Field(value: &_storage._malformedLength) }()
-        case 618: try { try decoder.decodeSingularInt32Field(value: &_storage._mapEntry) }()
-        case 619: try { try decoder.decodeSingularInt32Field(value: &_storage._mapKeyType) }()
-        case 620: try { try decoder.decodeSingularInt32Field(value: &_storage._mapToMessages) }()
-        case 621: try { try decoder.decodeSingularInt32Field(value: &_storage._mapValueType) }()
-        case 622: try { try decoder.decodeSingularInt32Field(value: &_storage._mapVisitor) }()
-        case 623: try { try decoder.decodeSingularInt32Field(value: &_storage._mask) }()
-        case 624: try { try decoder.decodeSingularInt32Field(value: &_storage._maximumEdition) }()
-        case 625: try { try decoder.decodeSingularInt32Field(value: &_storage._mdayStart) }()
-        case 626: try { try decoder.decodeSingularInt32Field(value: &_storage._merge) }()
-        case 627: try { try decoder.decodeSingularInt32Field(value: &_storage._mergeOptions) }()
-        case 628: try { try decoder.decodeSingularInt32Field(value: &_storage._message) }()
-        case 629: try { try decoder.decodeSingularInt32Field(value: &_storage._messageDepthLimit) }()
-        case 630: try { try decoder.decodeSingularInt32Field(value: &_storage._messageEncoding) }()
-        case 631: try { try decoder.decodeSingularInt32Field(value: &_storage._messageExtension) }()
-        case 632: try { try decoder.decodeSingularInt32Field(value: &_storage._messageImplementationBase) }()
-        case 633: try { try decoder.decodeSingularInt32Field(value: &_storage._messageOptions) }()
-        case 634: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSet) }()
-        case 635: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSetWireFormat) }()
-        case 636: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSize) }()
-        case 637: try { try decoder.decodeSingularInt32Field(value: &_storage._messageType) }()
-        case 638: try { try decoder.decodeSingularInt32Field(value: &_storage._method) }()
-        case 639: try { try decoder.decodeSingularInt32Field(value: &_storage._methodDescriptorProto) }()
-        case 640: try { try decoder.decodeSingularInt32Field(value: &_storage._methodOptions) }()
-        case 641: try { try decoder.decodeSingularInt32Field(value: &_storage._methods) }()
-        case 642: try { try decoder.decodeSingularInt32Field(value: &_storage._min) }()
-        case 643: try { try decoder.decodeSingularInt32Field(value: &_storage._minimumEdition) }()
-        case 644: try { try decoder.decodeSingularInt32Field(value: &_storage._minor) }()
-        case 645: try { try decoder.decodeSingularInt32Field(value: &_storage._mixin) }()
-        case 646: try { try decoder.decodeSingularInt32Field(value: &_storage._mixins) }()
-        case 647: try { try decoder.decodeSingularInt32Field(value: &_storage._modify) }()
-        case 648: try { try decoder.decodeSingularInt32Field(value: &_storage._month) }()
-        case 649: try { try decoder.decodeSingularInt32Field(value: &_storage._msgExtension) }()
-        case 650: try { try decoder.decodeSingularInt32Field(value: &_storage._mutating) }()
-        case 651: try { try decoder.decodeSingularInt32Field(value: &_storage._n) }()
-        case 652: try { try decoder.decodeSingularInt32Field(value: &_storage._name) }()
-        case 653: try { try decoder.decodeSingularInt32Field(value: &_storage._nameDescription) }()
-        case 654: try { try decoder.decodeSingularInt32Field(value: &_storage._nameMap) }()
-        case 655: try { try decoder.decodeSingularInt32Field(value: &_storage._namePart) }()
-        case 656: try { try decoder.decodeSingularInt32Field(value: &_storage._names) }()
-        case 657: try { try decoder.decodeSingularInt32Field(value: &_storage._nanos) }()
-        case 658: try { try decoder.decodeSingularInt32Field(value: &_storage._negativeIntValue) }()
-        case 659: try { try decoder.decodeSingularInt32Field(value: &_storage._nestedType) }()
-        case 660: try { try decoder.decodeSingularInt32Field(value: &_storage._newExtensible) }()
-        case 661: try { try decoder.decodeSingularInt32Field(value: &_storage._newL) }()
-        case 662: try { try decoder.decodeSingularInt32Field(value: &_storage._newList) }()
-        case 663: try { try decoder.decodeSingularInt32Field(value: &_storage._newMessage) }()
-        case 664: try { try decoder.decodeSingularInt32Field(value: &_storage._newValue) }()
-        case 665: try { try decoder.decodeSingularInt32Field(value: &_storage._next) }()
-        case 666: try { try decoder.decodeSingularInt32Field(value: &_storage._nextByte) }()
-        case 667: try { try decoder.decodeSingularInt32Field(value: &_storage._nextFieldNumber) }()
-        case 668: try { try decoder.decodeSingularInt32Field(value: &_storage._nextVarInt) }()
-        case 669: try { try decoder.decodeSingularInt32Field(value: &_storage._nil) }()
-        case 670: try { try decoder.decodeSingularInt32Field(value: &_storage._nilLiteral) }()
-        case 671: try { try decoder.decodeSingularInt32Field(value: &_storage._noBytesAvailable) }()
-        case 672: try { try decoder.decodeSingularInt32Field(value: &_storage._noStandardDescriptorAccessor) }()
-        case 673: try { try decoder.decodeSingularInt32Field(value: &_storage._nullValue) }()
-        case 674: try { try decoder.decodeSingularInt32Field(value: &_storage._number) }()
-        case 675: try { try decoder.decodeSingularInt32Field(value: &_storage._numberValue) }()
-        case 676: try { try decoder.decodeSingularInt32Field(value: &_storage._objcClassPrefix) }()
-        case 677: try { try decoder.decodeSingularInt32Field(value: &_storage._of) }()
-        case 678: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDecl) }()
-        case 679: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDescriptorProto) }()
-        case 680: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofIndex) }()
-        case 681: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofOptions) }()
-        case 682: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofs) }()
-        case 683: try { try decoder.decodeSingularInt32Field(value: &_storage._oneOfKind) }()
-        case 684: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeFor) }()
-        case 685: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeMode) }()
-        case 686: try { try decoder.decodeSingularInt32Field(value: &_storage._option) }()
-        case 687: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalEnumExtensionField) }()
-        case 688: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalExtensionField) }()
-        case 689: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalGroupExtensionField) }()
-        case 690: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalMessageExtensionField) }()
-        case 691: try { try decoder.decodeSingularInt32Field(value: &_storage._optionRetention) }()
-        case 692: try { try decoder.decodeSingularInt32Field(value: &_storage._options) }()
-        case 693: try { try decoder.decodeSingularInt32Field(value: &_storage._optionTargetType) }()
-        case 694: try { try decoder.decodeSingularInt32Field(value: &_storage._other) }()
-        case 695: try { try decoder.decodeSingularInt32Field(value: &_storage._others) }()
-        case 696: try { try decoder.decodeSingularInt32Field(value: &_storage._out) }()
-        case 697: try { try decoder.decodeSingularInt32Field(value: &_storage._outputType) }()
-        case 698: try { try decoder.decodeSingularInt32Field(value: &_storage._overridableFeatures) }()
-        case 699: try { try decoder.decodeSingularInt32Field(value: &_storage._p) }()
-        case 700: try { try decoder.decodeSingularInt32Field(value: &_storage._package) }()
-        case 701: try { try decoder.decodeSingularInt32Field(value: &_storage._packed) }()
-        case 702: try { try decoder.decodeSingularInt32Field(value: &_storage._packedEnumExtensionField) }()
-        case 703: try { try decoder.decodeSingularInt32Field(value: &_storage._packedExtensionField) }()
-        case 704: try { try decoder.decodeSingularInt32Field(value: &_storage._padding) }()
-        case 705: try { try decoder.decodeSingularInt32Field(value: &_storage._parent) }()
-        case 706: try { try decoder.decodeSingularInt32Field(value: &_storage._parse) }()
-        case 707: try { try decoder.decodeSingularInt32Field(value: &_storage._partial) }()
-        case 708: try { try decoder.decodeSingularInt32Field(value: &_storage._path) }()
-        case 709: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecoder) }()
-        case 710: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecodingError) }()
-        case 711: try { try decoder.decodeSingularInt32Field(value: &_storage._paths) }()
-        case 712: try { try decoder.decodeSingularInt32Field(value: &_storage._pathVisitor) }()
-        case 713: try { try decoder.decodeSingularInt32Field(value: &_storage._payload) }()
-        case 714: try { try decoder.decodeSingularInt32Field(value: &_storage._payloadSize) }()
-        case 715: try { try decoder.decodeSingularInt32Field(value: &_storage._phpClassPrefix) }()
-        case 716: try { try decoder.decodeSingularInt32Field(value: &_storage._phpMetadataNamespace) }()
-        case 717: try { try decoder.decodeSingularInt32Field(value: &_storage._phpNamespace) }()
-        case 718: try { try decoder.decodeSingularInt32Field(value: &_storage._pos) }()
-        case 719: try { try decoder.decodeSingularInt32Field(value: &_storage._positiveIntValue) }()
-        case 720: try { try decoder.decodeSingularInt32Field(value: &_storage._prefix) }()
-        case 721: try { try decoder.decodeSingularInt32Field(value: &_storage._preserveProtoFieldNames) }()
-        case 722: try { try decoder.decodeSingularInt32Field(value: &_storage._preTraverse) }()
-        case 723: try { try decoder.decodeSingularInt32Field(value: &_storage._prevPath) }()
-        case 724: try { try decoder.decodeSingularInt32Field(value: &_storage._printUnknownFields) }()
-        case 725: try { try decoder.decodeSingularInt32Field(value: &_storage._proto2) }()
-        case 726: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3DefaultValue) }()
-        case 727: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3Optional) }()
-        case 728: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversionCheck) }()
-        case 729: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversion2) }()
-        case 730: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBool) }()
-        case 731: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBytes) }()
-        case 732: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufDouble) }()
-        case 733: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufEnumMap) }()
-        case 734: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtension) }()
-        case 735: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed32) }()
-        case 736: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed64) }()
-        case 737: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFloat) }()
-        case 738: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt32) }()
-        case 739: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt64) }()
-        case 740: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMap) }()
-        case 741: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMessageMap) }()
-        case 742: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed32) }()
-        case 743: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed64) }()
-        case 744: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint32) }()
-        case 745: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint64) }()
-        case 746: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufString) }()
-        case 747: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint32) }()
-        case 748: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint64) }()
-        case 749: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtensionFieldValues) }()
-        case 750: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFieldNumber) }()
-        case 751: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufGeneratedIsEqualTo) }()
-        case 752: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNameMap) }()
-        case 753: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNewField) }()
-        case 754: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufPackage) }()
-        case 755: try { try decoder.decodeSingularInt32Field(value: &_storage._protocol) }()
-        case 756: try { try decoder.decodeSingularInt32Field(value: &_storage._protoFieldName) }()
-        case 757: try { try decoder.decodeSingularInt32Field(value: &_storage._protoMessageName) }()
-        case 758: try { try decoder.decodeSingularInt32Field(value: &_storage._protoNameProviding) }()
-        case 759: try { try decoder.decodeSingularInt32Field(value: &_storage._protoPaths) }()
-        case 760: try { try decoder.decodeSingularInt32Field(value: &_storage._public) }()
-        case 761: try { try decoder.decodeSingularInt32Field(value: &_storage._publicDependency) }()
-        case 762: try { try decoder.decodeSingularInt32Field(value: &_storage._putBoolValue) }()
-        case 763: try { try decoder.decodeSingularInt32Field(value: &_storage._putBytesValue) }()
-        case 764: try { try decoder.decodeSingularInt32Field(value: &_storage._putDoubleValue) }()
-        case 765: try { try decoder.decodeSingularInt32Field(value: &_storage._putEnumValue) }()
-        case 766: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint32) }()
-        case 767: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint64) }()
-        case 768: try { try decoder.decodeSingularInt32Field(value: &_storage._putFloatValue) }()
-        case 769: try { try decoder.decodeSingularInt32Field(value: &_storage._putInt64) }()
-        case 770: try { try decoder.decodeSingularInt32Field(value: &_storage._putStringValue) }()
-        case 771: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64) }()
-        case 772: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64Hex) }()
-        case 773: try { try decoder.decodeSingularInt32Field(value: &_storage._putVarInt) }()
-        case 774: try { try decoder.decodeSingularInt32Field(value: &_storage._putZigZagVarInt) }()
-        case 775: try { try decoder.decodeSingularInt32Field(value: &_storage._pyGenericServices) }()
-        case 776: try { try decoder.decodeSingularInt32Field(value: &_storage._r) }()
-        case 777: try { try decoder.decodeSingularInt32Field(value: &_storage._rawChars) }()
-        case 778: try { try decoder.decodeSingularInt32Field(value: &_storage._rawRepresentable) }()
-        case 779: try { try decoder.decodeSingularInt32Field(value: &_storage._rawValue) }()
-        case 780: try { try decoder.decodeSingularInt32Field(value: &_storage._read4HexDigits) }()
-        case 781: try { try decoder.decodeSingularInt32Field(value: &_storage._readBytes) }()
-        case 782: try { try decoder.decodeSingularInt32Field(value: &_storage._register) }()
-        case 783: try { try decoder.decodeSingularInt32Field(value: &_storage._removingAllFieldsOf) }()
-        case 784: try { try decoder.decodeSingularInt32Field(value: &_storage._repeated) }()
-        case 785: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedEnumExtensionField) }()
-        case 786: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedExtensionField) }()
-        case 787: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedFieldEncoding) }()
-        case 788: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedGroupExtensionField) }()
-        case 789: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedMessageExtensionField) }()
-        case 790: try { try decoder.decodeSingularInt32Field(value: &_storage._repeating) }()
-        case 791: try { try decoder.decodeSingularInt32Field(value: &_storage._replaceRepeatedFields) }()
-        case 792: try { try decoder.decodeSingularInt32Field(value: &_storage._requestStreaming) }()
-        case 793: try { try decoder.decodeSingularInt32Field(value: &_storage._requestTypeURL) }()
-        case 794: try { try decoder.decodeSingularInt32Field(value: &_storage._requiredSize) }()
-        case 795: try { try decoder.decodeSingularInt32Field(value: &_storage._responseStreaming) }()
-        case 796: try { try decoder.decodeSingularInt32Field(value: &_storage._responseTypeURL) }()
-        case 797: try { try decoder.decodeSingularInt32Field(value: &_storage._result) }()
-        case 798: try { try decoder.decodeSingularInt32Field(value: &_storage._retention) }()
-        case 799: try { try decoder.decodeSingularInt32Field(value: &_storage._rethrows) }()
-        case 800: try { try decoder.decodeSingularInt32Field(value: &_storage._return) }()
-        case 801: try { try decoder.decodeSingularInt32Field(value: &_storage._returnType) }()
-        case 802: try { try decoder.decodeSingularInt32Field(value: &_storage._revision) }()
-        case 803: try { try decoder.decodeSingularInt32Field(value: &_storage._rhs) }()
-        case 804: try { try decoder.decodeSingularInt32Field(value: &_storage._root) }()
-        case 805: try { try decoder.decodeSingularInt32Field(value: &_storage._rubyPackage) }()
-        case 806: try { try decoder.decodeSingularInt32Field(value: &_storage._s) }()
-        case 807: try { try decoder.decodeSingularInt32Field(value: &_storage._sawBackslash) }()
-        case 808: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection4Characters) }()
-        case 809: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection5Characters) }()
-        case 810: try { try decoder.decodeSingularInt32Field(value: &_storage._scan) }()
-        case 811: try { try decoder.decodeSingularInt32Field(value: &_storage._scanner) }()
-        case 812: try { try decoder.decodeSingularInt32Field(value: &_storage._seconds) }()
-        case 813: try { try decoder.decodeSingularInt32Field(value: &_storage._self_p) }()
-        case 814: try { try decoder.decodeSingularInt32Field(value: &_storage._semantic) }()
-        case 815: try { try decoder.decodeSingularInt32Field(value: &_storage._sendable) }()
-        case 816: try { try decoder.decodeSingularInt32Field(value: &_storage._separator) }()
-        case 817: try { try decoder.decodeSingularInt32Field(value: &_storage._serialize) }()
-        case 818: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedBytes) }()
-        case 819: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedData) }()
-        case 820: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedSize) }()
-        case 821: try { try decoder.decodeSingularInt32Field(value: &_storage._serverStreaming) }()
-        case 822: try { try decoder.decodeSingularInt32Field(value: &_storage._service) }()
-        case 823: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceDescriptorProto) }()
-        case 824: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceOptions) }()
-        case 825: try { try decoder.decodeSingularInt32Field(value: &_storage._set) }()
-        case 826: try { try decoder.decodeSingularInt32Field(value: &_storage._setExtensionValue) }()
-        case 827: try { try decoder.decodeSingularInt32Field(value: &_storage._shift) }()
-        case 828: try { try decoder.decodeSingularInt32Field(value: &_storage._simpleExtensionMap) }()
-        case 829: try { try decoder.decodeSingularInt32Field(value: &_storage._size) }()
-        case 830: try { try decoder.decodeSingularInt32Field(value: &_storage._sizer) }()
-        case 831: try { try decoder.decodeSingularInt32Field(value: &_storage._source) }()
-        case 832: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceCodeInfo) }()
-        case 833: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceContext) }()
-        case 834: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceEncoding) }()
-        case 835: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceFile) }()
-        case 836: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceLocation) }()
-        case 837: try { try decoder.decodeSingularInt32Field(value: &_storage._span) }()
-        case 838: try { try decoder.decodeSingularInt32Field(value: &_storage._split) }()
-        case 839: try { try decoder.decodeSingularInt32Field(value: &_storage._start) }()
-        case 840: try { try decoder.decodeSingularInt32Field(value: &_storage._startArray) }()
-        case 841: try { try decoder.decodeSingularInt32Field(value: &_storage._startArrayObject) }()
-        case 842: try { try decoder.decodeSingularInt32Field(value: &_storage._startField) }()
-        case 843: try { try decoder.decodeSingularInt32Field(value: &_storage._startIndex) }()
-        case 844: try { try decoder.decodeSingularInt32Field(value: &_storage._startMessageField) }()
-        case 845: try { try decoder.decodeSingularInt32Field(value: &_storage._startObject) }()
-        case 846: try { try decoder.decodeSingularInt32Field(value: &_storage._startRegularField) }()
-        case 847: try { try decoder.decodeSingularInt32Field(value: &_storage._state) }()
-        case 848: try { try decoder.decodeSingularInt32Field(value: &_storage._static) }()
-        case 849: try { try decoder.decodeSingularInt32Field(value: &_storage._staticString) }()
-        case 850: try { try decoder.decodeSingularInt32Field(value: &_storage._storage) }()
-        case 851: try { try decoder.decodeSingularInt32Field(value: &_storage._string) }()
-        case 852: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteral) }()
-        case 853: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteralType) }()
-        case 854: try { try decoder.decodeSingularInt32Field(value: &_storage._stringResult) }()
-        case 855: try { try decoder.decodeSingularInt32Field(value: &_storage._stringValue) }()
-        case 856: try { try decoder.decodeSingularInt32Field(value: &_storage._struct) }()
-        case 857: try { try decoder.decodeSingularInt32Field(value: &_storage._structValue) }()
-        case 858: try { try decoder.decodeSingularInt32Field(value: &_storage._subDecoder) }()
-        case 859: try { try decoder.decodeSingularInt32Field(value: &_storage._subscript) }()
-        case 860: try { try decoder.decodeSingularInt32Field(value: &_storage._subtract) }()
-        case 861: try { try decoder.decodeSingularInt32Field(value: &_storage._subVisitor) }()
-        case 862: try { try decoder.decodeSingularInt32Field(value: &_storage._swift) }()
-        case 863: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftPrefix) }()
-        case 864: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufContiguousBytes) }()
-        case 865: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufError) }()
-        case 866: try { try decoder.decodeSingularInt32Field(value: &_storage._syntax) }()
-        case 867: try { try decoder.decodeSingularInt32Field(value: &_storage._t) }()
-        case 868: try { try decoder.decodeSingularInt32Field(value: &_storage._tag) }()
-        case 869: try { try decoder.decodeSingularInt32Field(value: &_storage._targets) }()
-        case 870: try { try decoder.decodeSingularInt32Field(value: &_storage._terminator) }()
-        case 871: try { try decoder.decodeSingularInt32Field(value: &_storage._testDecoder) }()
-        case 872: try { try decoder.decodeSingularInt32Field(value: &_storage._text) }()
-        case 873: try { try decoder.decodeSingularInt32Field(value: &_storage._textDecoder) }()
-        case 874: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecoder) }()
-        case 875: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingError) }()
-        case 876: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingOptions) }()
-        case 877: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingOptions) }()
-        case 878: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingVisitor) }()
-        case 879: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatString) }()
-        case 880: try { try decoder.decodeSingularInt32Field(value: &_storage._throwOrIgnore) }()
-        case 881: try { try decoder.decodeSingularInt32Field(value: &_storage._throws) }()
-        case 882: try { try decoder.decodeSingularInt32Field(value: &_storage._timeInterval) }()
-        case 883: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSince1970) }()
-        case 884: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSinceReferenceDate) }()
-        case 885: try { try decoder.decodeSingularInt32Field(value: &_storage._timestamp) }()
-        case 886: try { try decoder.decodeSingularInt32Field(value: &_storage._tmp) }()
-        case 887: try { try decoder.decodeSingularInt32Field(value: &_storage._tooLarge) }()
-        case 888: try { try decoder.decodeSingularInt32Field(value: &_storage._total) }()
-        case 889: try { try decoder.decodeSingularInt32Field(value: &_storage._totalArrayDepth) }()
-        case 890: try { try decoder.decodeSingularInt32Field(value: &_storage._totalSize) }()
-        case 891: try { try decoder.decodeSingularInt32Field(value: &_storage._trailingComments) }()
-        case 892: try { try decoder.decodeSingularInt32Field(value: &_storage._traverse) }()
-        case 893: try { try decoder.decodeSingularInt32Field(value: &_storage._trim) }()
-        case 894: try { try decoder.decodeSingularInt32Field(value: &_storage._true) }()
-        case 895: try { try decoder.decodeSingularInt32Field(value: &_storage._try) }()
-        case 896: try { try decoder.decodeSingularInt32Field(value: &_storage._type) }()
-        case 897: try { try decoder.decodeSingularInt32Field(value: &_storage._typealias) }()
-        case 898: try { try decoder.decodeSingularInt32Field(value: &_storage._typeEnum) }()
-        case 899: try { try decoder.decodeSingularInt32Field(value: &_storage._typeName) }()
-        case 900: try { try decoder.decodeSingularInt32Field(value: &_storage._typePrefix) }()
-        case 901: try { try decoder.decodeSingularInt32Field(value: &_storage._typeStart) }()
-        case 902: try { try decoder.decodeSingularInt32Field(value: &_storage._typeUnknown) }()
-        case 903: try { try decoder.decodeSingularInt32Field(value: &_storage._typeURL) }()
-        case 904: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32) }()
-        case 905: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32Value) }()
-        case 906: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64) }()
-        case 907: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64Value) }()
-        case 908: try { try decoder.decodeSingularInt32Field(value: &_storage._uint8) }()
-        case 909: try { try decoder.decodeSingularInt32Field(value: &_storage._unchecked) }()
-        case 910: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteral) }()
-        case 911: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteralType) }()
-        case 912: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalars) }()
-        case 913: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarView) }()
-        case 914: try { try decoder.decodeSingularInt32Field(value: &_storage._uninterpretedOption) }()
-        case 915: try { try decoder.decodeSingularInt32Field(value: &_storage._union) }()
-        case 916: try { try decoder.decodeSingularInt32Field(value: &_storage._uniqueStorage) }()
-        case 917: try { try decoder.decodeSingularInt32Field(value: &_storage._unknown) }()
-        case 918: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownFields_p) }()
-        case 919: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownStorage) }()
-        case 920: try { try decoder.decodeSingularInt32Field(value: &_storage._unpackTo) }()
-        case 921: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeBufferPointer) }()
-        case 922: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutablePointer) }()
-        case 923: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutableRawBufferPointer) }()
-        case 924: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawBufferPointer) }()
-        case 925: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawPointer) }()
-        case 926: try { try decoder.decodeSingularInt32Field(value: &_storage._unverifiedLazy) }()
-        case 927: try { try decoder.decodeSingularInt32Field(value: &_storage._updatedOptions) }()
-        case 928: try { try decoder.decodeSingularInt32Field(value: &_storage._url) }()
-        case 929: try { try decoder.decodeSingularInt32Field(value: &_storage._useDeterministicOrdering) }()
-        case 930: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8) }()
-        case 931: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Ptr) }()
-        case 932: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8ToDouble) }()
-        case 933: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Validation) }()
-        case 934: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8View) }()
-        case 935: try { try decoder.decodeSingularInt32Field(value: &_storage._v) }()
-        case 936: try { try decoder.decodeSingularInt32Field(value: &_storage._value) }()
-        case 937: try { try decoder.decodeSingularInt32Field(value: &_storage._valueField) }()
-        case 938: try { try decoder.decodeSingularInt32Field(value: &_storage._values) }()
-        case 939: try { try decoder.decodeSingularInt32Field(value: &_storage._valueType) }()
-        case 940: try { try decoder.decodeSingularInt32Field(value: &_storage._var) }()
-        case 941: try { try decoder.decodeSingularInt32Field(value: &_storage._verification) }()
-        case 942: try { try decoder.decodeSingularInt32Field(value: &_storage._verificationState) }()
-        case 943: try { try decoder.decodeSingularInt32Field(value: &_storage._version) }()
-        case 944: try { try decoder.decodeSingularInt32Field(value: &_storage._versionString) }()
-        case 945: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFields) }()
-        case 946: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFieldsAsMessageSet) }()
-        case 947: try { try decoder.decodeSingularInt32Field(value: &_storage._visitMapField) }()
-        case 948: try { try decoder.decodeSingularInt32Field(value: &_storage._visitor) }()
-        case 949: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPacked) }()
-        case 950: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedBoolField) }()
-        case 951: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedDoubleField) }()
-        case 952: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedEnumField) }()
-        case 953: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed32Field) }()
-        case 954: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed64Field) }()
-        case 955: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFloatField) }()
-        case 956: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt32Field) }()
-        case 957: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt64Field) }()
-        case 958: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed32Field) }()
-        case 959: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed64Field) }()
-        case 960: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint32Field) }()
-        case 961: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint64Field) }()
-        case 962: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint32Field) }()
-        case 963: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint64Field) }()
-        case 964: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeated) }()
-        case 965: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBoolField) }()
-        case 966: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBytesField) }()
-        case 967: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedDoubleField) }()
-        case 968: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedEnumField) }()
-        case 969: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed32Field) }()
-        case 970: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed64Field) }()
-        case 971: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFloatField) }()
-        case 972: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedGroupField) }()
-        case 973: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt32Field) }()
-        case 974: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt64Field) }()
-        case 975: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedMessageField) }()
-        case 976: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed32Field) }()
-        case 977: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed64Field) }()
-        case 978: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint32Field) }()
-        case 979: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint64Field) }()
-        case 980: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedStringField) }()
-        case 981: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint32Field) }()
-        case 982: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint64Field) }()
-        case 983: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingular) }()
-        case 984: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBoolField) }()
-        case 985: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBytesField) }()
-        case 986: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularDoubleField) }()
-        case 987: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularEnumField) }()
-        case 988: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed32Field) }()
-        case 989: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed64Field) }()
-        case 990: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFloatField) }()
-        case 991: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularGroupField) }()
-        case 992: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt32Field) }()
-        case 993: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt64Field) }()
-        case 994: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularMessageField) }()
-        case 995: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed32Field) }()
-        case 996: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed64Field) }()
-        case 997: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint32Field) }()
-        case 998: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint64Field) }()
-        case 999: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularStringField) }()
-        case 1000: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint32Field) }()
-        case 1001: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint64Field) }()
-        case 1002: try { try decoder.decodeSingularInt32Field(value: &_storage._visitUnknown) }()
-        case 1003: try { try decoder.decodeSingularInt32Field(value: &_storage._wasDecoded) }()
-        case 1004: try { try decoder.decodeSingularInt32Field(value: &_storage._weak) }()
-        case 1005: try { try decoder.decodeSingularInt32Field(value: &_storage._weakDependency) }()
-        case 1006: try { try decoder.decodeSingularInt32Field(value: &_storage._where) }()
-        case 1007: try { try decoder.decodeSingularInt32Field(value: &_storage._wireFormat) }()
-        case 1008: try { try decoder.decodeSingularInt32Field(value: &_storage._with) }()
-        case 1009: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeBytes) }()
-        case 1010: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeMutableBytes) }()
-        case 1011: try { try decoder.decodeSingularInt32Field(value: &_storage._work) }()
-        case 1012: try { try decoder.decodeSingularInt32Field(value: &_storage._wrapped) }()
-        case 1013: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedType) }()
-        case 1014: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedValue) }()
-        case 1015: try { try decoder.decodeSingularInt32Field(value: &_storage._written) }()
-        case 1016: try { try decoder.decodeSingularInt32Field(value: &_storage._yday) }()
+        case 97: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnforceNamingStyle_p) }()
+        case 98: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnumType_p) }()
+        case 99: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtendee_p) }()
+        case 100: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtensionValue_p) }()
+        case 101: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatures_p) }()
+        case 102: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatureSupport_p) }()
+        case 103: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFieldPresence_p) }()
+        case 104: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFixedFeatures_p) }()
+        case 105: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFullName_p) }()
+        case 106: try { try decoder.decodeSingularInt32Field(value: &_storage._clearGoPackage_p) }()
+        case 107: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdempotencyLevel_p) }()
+        case 108: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdentifierValue_p) }()
+        case 109: try { try decoder.decodeSingularInt32Field(value: &_storage._clearInputType_p) }()
+        case 110: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIsExtension_p) }()
+        case 111: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenerateEqualsAndHash_p) }()
+        case 112: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenericServices_p) }()
+        case 113: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaMultipleFiles_p) }()
+        case 114: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaOuterClassname_p) }()
+        case 115: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaPackage_p) }()
+        case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaStringCheckUtf8_p) }()
+        case 117: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonFormat_p) }()
+        case 118: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonName_p) }()
+        case 119: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJstype_p) }()
+        case 120: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLabel_p) }()
+        case 121: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLazy_p) }()
+        case 122: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLeadingComments_p) }()
+        case 123: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMapEntry_p) }()
+        case 124: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMaximumEdition_p) }()
+        case 125: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageEncoding_p) }()
+        case 126: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageSetWireFormat_p) }()
+        case 127: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMinimumEdition_p) }()
+        case 128: try { try decoder.decodeSingularInt32Field(value: &_storage._clearName_p) }()
+        case 129: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNamePart_p) }()
+        case 130: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNegativeIntValue_p) }()
+        case 131: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNoStandardDescriptorAccessor_p) }()
+        case 132: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNumber_p) }()
+        case 133: try { try decoder.decodeSingularInt32Field(value: &_storage._clearObjcClassPrefix_p) }()
+        case 134: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOneofIndex_p) }()
+        case 135: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptimizeFor_p) }()
+        case 136: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptions_p) }()
+        case 137: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOutputType_p) }()
+        case 138: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOverridableFeatures_p) }()
+        case 139: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPackage_p) }()
+        case 140: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPacked_p) }()
+        case 141: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpClassPrefix_p) }()
+        case 142: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpMetadataNamespace_p) }()
+        case 143: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpNamespace_p) }()
+        case 144: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPositiveIntValue_p) }()
+        case 145: try { try decoder.decodeSingularInt32Field(value: &_storage._clearProto3Optional_p) }()
+        case 146: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPyGenericServices_p) }()
+        case 147: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeated_p) }()
+        case 148: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeatedFieldEncoding_p) }()
+        case 149: try { try decoder.decodeSingularInt32Field(value: &_storage._clearReserved_p) }()
+        case 150: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRetention_p) }()
+        case 151: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRubyPackage_p) }()
+        case 152: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSemantic_p) }()
+        case 153: try { try decoder.decodeSingularInt32Field(value: &_storage._clearServerStreaming_p) }()
+        case 154: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceCodeInfo_p) }()
+        case 155: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceContext_p) }()
+        case 156: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceFile_p) }()
+        case 157: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStart_p) }()
+        case 158: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStringValue_p) }()
+        case 159: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSwiftPrefix_p) }()
+        case 160: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSyntax_p) }()
+        case 161: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTrailingComments_p) }()
+        case 162: try { try decoder.decodeSingularInt32Field(value: &_storage._clearType_p) }()
+        case 163: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTypeName_p) }()
+        case 164: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUnverifiedLazy_p) }()
+        case 165: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUtf8Validation_p) }()
+        case 166: try { try decoder.decodeSingularInt32Field(value: &_storage._clearValue_p) }()
+        case 167: try { try decoder.decodeSingularInt32Field(value: &_storage._clearVerification_p) }()
+        case 168: try { try decoder.decodeSingularInt32Field(value: &_storage._clearWeak_p) }()
+        case 169: try { try decoder.decodeSingularInt32Field(value: &_storage._clientStreaming) }()
+        case 170: try { try decoder.decodeSingularInt32Field(value: &_storage._code) }()
+        case 171: try { try decoder.decodeSingularInt32Field(value: &_storage._codePoint) }()
+        case 172: try { try decoder.decodeSingularInt32Field(value: &_storage._codeUnits) }()
+        case 173: try { try decoder.decodeSingularInt32Field(value: &_storage._collection) }()
+        case 174: try { try decoder.decodeSingularInt32Field(value: &_storage._com) }()
+        case 175: try { try decoder.decodeSingularInt32Field(value: &_storage._comma) }()
+        case 176: try { try decoder.decodeSingularInt32Field(value: &_storage._consumedBytes) }()
+        case 177: try { try decoder.decodeSingularInt32Field(value: &_storage._contains) }()
+        case 178: try { try decoder.decodeSingularInt32Field(value: &_storage._contentsOf) }()
+        case 179: try { try decoder.decodeSingularInt32Field(value: &_storage._contiguousBytes) }()
+        case 180: try { try decoder.decodeSingularInt32Field(value: &_storage._copy) }()
+        case 181: try { try decoder.decodeSingularInt32Field(value: &_storage._count) }()
+        case 182: try { try decoder.decodeSingularInt32Field(value: &_storage._countVarintsInBuffer) }()
+        case 183: try { try decoder.decodeSingularInt32Field(value: &_storage._csharpNamespace) }()
+        case 184: try { try decoder.decodeSingularInt32Field(value: &_storage._ctype) }()
+        case 185: try { try decoder.decodeSingularInt32Field(value: &_storage._customCodable) }()
+        case 186: try { try decoder.decodeSingularInt32Field(value: &_storage._customDebugStringConvertible) }()
+        case 187: try { try decoder.decodeSingularInt32Field(value: &_storage._customStringConvertible) }()
+        case 188: try { try decoder.decodeSingularInt32Field(value: &_storage._d) }()
+        case 189: try { try decoder.decodeSingularInt32Field(value: &_storage._data) }()
+        case 190: try { try decoder.decodeSingularInt32Field(value: &_storage._dataResult) }()
+        case 191: try { try decoder.decodeSingularInt32Field(value: &_storage._date) }()
+        case 192: try { try decoder.decodeSingularInt32Field(value: &_storage._daySec) }()
+        case 193: try { try decoder.decodeSingularInt32Field(value: &_storage._daysSinceEpoch) }()
+        case 194: try { try decoder.decodeSingularInt32Field(value: &_storage._debugDescription_p) }()
+        case 195: try { try decoder.decodeSingularInt32Field(value: &_storage._debugRedact) }()
+        case 196: try { try decoder.decodeSingularInt32Field(value: &_storage._declaration) }()
+        case 197: try { try decoder.decodeSingularInt32Field(value: &_storage._decoded) }()
+        case 198: try { try decoder.decodeSingularInt32Field(value: &_storage._decodedFromJsonnull) }()
+        case 199: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionField) }()
+        case 200: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionFieldsAsMessageSet) }()
+        case 201: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeJson) }()
+        case 202: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMapField) }()
+        case 203: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMessage) }()
+        case 204: try { try decoder.decodeSingularInt32Field(value: &_storage._decoder) }()
+        case 205: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeated) }()
+        case 206: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBoolField) }()
+        case 207: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBytesField) }()
+        case 208: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedDoubleField) }()
+        case 209: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedEnumField) }()
+        case 210: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed32Field) }()
+        case 211: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed64Field) }()
+        case 212: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFloatField) }()
+        case 213: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedGroupField) }()
+        case 214: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt32Field) }()
+        case 215: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt64Field) }()
+        case 216: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedMessageField) }()
+        case 217: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed32Field) }()
+        case 218: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed64Field) }()
+        case 219: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint32Field) }()
+        case 220: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint64Field) }()
+        case 221: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedStringField) }()
+        case 222: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint32Field) }()
+        case 223: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint64Field) }()
+        case 224: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingular) }()
+        case 225: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBoolField) }()
+        case 226: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBytesField) }()
+        case 227: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularDoubleField) }()
+        case 228: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularEnumField) }()
+        case 229: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed32Field) }()
+        case 230: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed64Field) }()
+        case 231: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFloatField) }()
+        case 232: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularGroupField) }()
+        case 233: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt32Field) }()
+        case 234: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt64Field) }()
+        case 235: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularMessageField) }()
+        case 236: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed32Field) }()
+        case 237: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed64Field) }()
+        case 238: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint32Field) }()
+        case 239: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint64Field) }()
+        case 240: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularStringField) }()
+        case 241: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint32Field) }()
+        case 242: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint64Field) }()
+        case 243: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeTextFormat) }()
+        case 244: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultAnyTypeUrlprefix) }()
+        case 245: try { try decoder.decodeSingularInt32Field(value: &_storage._defaults) }()
+        case 246: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultValue) }()
+        case 247: try { try decoder.decodeSingularInt32Field(value: &_storage._dependency) }()
+        case 248: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecated) }()
+        case 249: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecatedLegacyJsonFieldConflicts) }()
+        case 250: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecationWarning) }()
+        case 251: try { try decoder.decodeSingularInt32Field(value: &_storage._description_p) }()
+        case 252: try { try decoder.decodeSingularInt32Field(value: &_storage._descriptorProto) }()
+        case 253: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionary) }()
+        case 254: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionaryLiteral) }()
+        case 255: try { try decoder.decodeSingularInt32Field(value: &_storage._digit) }()
+        case 256: try { try decoder.decodeSingularInt32Field(value: &_storage._digit0) }()
+        case 257: try { try decoder.decodeSingularInt32Field(value: &_storage._digit1) }()
+        case 258: try { try decoder.decodeSingularInt32Field(value: &_storage._digitCount) }()
+        case 259: try { try decoder.decodeSingularInt32Field(value: &_storage._digits) }()
+        case 260: try { try decoder.decodeSingularInt32Field(value: &_storage._digitValue) }()
+        case 261: try { try decoder.decodeSingularInt32Field(value: &_storage._discardableResult) }()
+        case 262: try { try decoder.decodeSingularInt32Field(value: &_storage._discardUnknownFields) }()
+        case 263: try { try decoder.decodeSingularInt32Field(value: &_storage._double) }()
+        case 264: try { try decoder.decodeSingularInt32Field(value: &_storage._doubleValue) }()
+        case 265: try { try decoder.decodeSingularInt32Field(value: &_storage._duration) }()
+        case 266: try { try decoder.decodeSingularInt32Field(value: &_storage._e) }()
+        case 267: try { try decoder.decodeSingularInt32Field(value: &_storage._edition) }()
+        case 268: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefault) }()
+        case 269: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefaults) }()
+        case 270: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDeprecated) }()
+        case 271: try { try decoder.decodeSingularInt32Field(value: &_storage._editionIntroduced) }()
+        case 272: try { try decoder.decodeSingularInt32Field(value: &_storage._editionRemoved) }()
+        case 273: try { try decoder.decodeSingularInt32Field(value: &_storage._element) }()
+        case 274: try { try decoder.decodeSingularInt32Field(value: &_storage._elements) }()
+        case 275: try { try decoder.decodeSingularInt32Field(value: &_storage._else) }()
+        case 276: try { try decoder.decodeSingularInt32Field(value: &_storage._emitExtensionFieldName) }()
+        case 277: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldName) }()
+        case 278: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldNumber) }()
+        case 279: try { try decoder.decodeSingularInt32Field(value: &_storage._empty) }()
+        case 280: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyAnyTypeURL) }()
+        case 281: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyData) }()
+        case 282: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeAsBytes) }()
+        case 283: try { try decoder.decodeSingularInt32Field(value: &_storage._encoded) }()
+        case 284: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedJsonstring) }()
+        case 285: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedSize) }()
+        case 286: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeField) }()
+        case 287: try { try decoder.decodeSingularInt32Field(value: &_storage._encoder) }()
+        case 288: try { try decoder.decodeSingularInt32Field(value: &_storage._end) }()
+        case 289: try { try decoder.decodeSingularInt32Field(value: &_storage._endArray) }()
+        case 290: try { try decoder.decodeSingularInt32Field(value: &_storage._endMessageField) }()
+        case 291: try { try decoder.decodeSingularInt32Field(value: &_storage._endObject) }()
+        case 292: try { try decoder.decodeSingularInt32Field(value: &_storage._endRegularField) }()
+        case 293: try { try decoder.decodeSingularInt32Field(value: &_storage._enforceNamingStyle) }()
+        case 294: try { try decoder.decodeSingularInt32Field(value: &_storage._enum) }()
+        case 295: try { try decoder.decodeSingularInt32Field(value: &_storage._enumDescriptorProto) }()
+        case 296: try { try decoder.decodeSingularInt32Field(value: &_storage._enumOptions) }()
+        case 297: try { try decoder.decodeSingularInt32Field(value: &_storage._enumReservedRange) }()
+        case 298: try { try decoder.decodeSingularInt32Field(value: &_storage._enumType) }()
+        case 299: try { try decoder.decodeSingularInt32Field(value: &_storage._enumvalue) }()
+        case 300: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueDescriptorProto) }()
+        case 301: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueOptions) }()
+        case 302: try { try decoder.decodeSingularInt32Field(value: &_storage._equatable) }()
+        case 303: try { try decoder.decodeSingularInt32Field(value: &_storage._error) }()
+        case 304: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByArrayLiteral) }()
+        case 305: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByDictionaryLiteral) }()
+        case 306: try { try decoder.decodeSingularInt32Field(value: &_storage._ext) }()
+        case 307: try { try decoder.decodeSingularInt32Field(value: &_storage._extDecoder) }()
+        case 308: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteral) }()
+        case 309: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteralType) }()
+        case 310: try { try decoder.decodeSingularInt32Field(value: &_storage._extendee) }()
+        case 311: try { try decoder.decodeSingularInt32Field(value: &_storage._extensibleMessage) }()
+        case 312: try { try decoder.decodeSingularInt32Field(value: &_storage._extension) }()
+        case 313: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionField) }()
+        case 314: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldNumber) }()
+        case 315: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldValueSet) }()
+        case 316: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionMap) }()
+        case 317: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRange) }()
+        case 318: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRangeOptions) }()
+        case 319: try { try decoder.decodeSingularInt32Field(value: &_storage._extensions) }()
+        case 320: try { try decoder.decodeSingularInt32Field(value: &_storage._extras) }()
+        case 321: try { try decoder.decodeSingularInt32Field(value: &_storage._f) }()
+        case 322: try { try decoder.decodeSingularInt32Field(value: &_storage._false) }()
+        case 323: try { try decoder.decodeSingularInt32Field(value: &_storage._features) }()
+        case 324: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSet) }()
+        case 325: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetDefaults) }()
+        case 326: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetEditionDefault) }()
+        case 327: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSupport) }()
+        case 328: try { try decoder.decodeSingularInt32Field(value: &_storage._field) }()
+        case 329: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldData) }()
+        case 330: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldDescriptorProto) }()
+        case 331: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMask) }()
+        case 332: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMaskError) }()
+        case 333: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName) }()
+        case 334: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNameCount) }()
+        case 335: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNum) }()
+        case 336: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumber) }()
+        case 337: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumberForProto) }()
+        case 338: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldOptions) }()
+        case 339: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldPresence) }()
+        case 340: try { try decoder.decodeSingularInt32Field(value: &_storage._fields) }()
+        case 341: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldSize) }()
+        case 342: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldTag) }()
+        case 343: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldType) }()
+        case 344: try { try decoder.decodeSingularInt32Field(value: &_storage._file) }()
+        case 345: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorProto) }()
+        case 346: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorSet) }()
+        case 347: try { try decoder.decodeSingularInt32Field(value: &_storage._fileName) }()
+        case 348: try { try decoder.decodeSingularInt32Field(value: &_storage._fileOptions) }()
+        case 349: try { try decoder.decodeSingularInt32Field(value: &_storage._filter) }()
+        case 350: try { try decoder.decodeSingularInt32Field(value: &_storage._final) }()
+        case 351: try { try decoder.decodeSingularInt32Field(value: &_storage._finiteOnly) }()
+        case 352: try { try decoder.decodeSingularInt32Field(value: &_storage._first) }()
+        case 353: try { try decoder.decodeSingularInt32Field(value: &_storage._firstItem) }()
+        case 354: try { try decoder.decodeSingularInt32Field(value: &_storage._fixedFeatures) }()
+        case 355: try { try decoder.decodeSingularInt32Field(value: &_storage._float) }()
+        case 356: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteral) }()
+        case 357: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteralType) }()
+        case 358: try { try decoder.decodeSingularInt32Field(value: &_storage._floatValue) }()
+        case 359: try { try decoder.decodeSingularInt32Field(value: &_storage._for) }()
+        case 360: try { try decoder.decodeSingularInt32Field(value: &_storage._forMessageName) }()
+        case 361: try { try decoder.decodeSingularInt32Field(value: &_storage._formUnion) }()
+        case 362: try { try decoder.decodeSingularInt32Field(value: &_storage._forReadingFrom) }()
+        case 363: try { try decoder.decodeSingularInt32Field(value: &_storage._forTypeURL) }()
+        case 364: try { try decoder.decodeSingularInt32Field(value: &_storage._forwardParser) }()
+        case 365: try { try decoder.decodeSingularInt32Field(value: &_storage._forWritingInto) }()
+        case 366: try { try decoder.decodeSingularInt32Field(value: &_storage._from) }()
+        case 367: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii2) }()
+        case 368: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii4) }()
+        case 369: try { try decoder.decodeSingularInt32Field(value: &_storage._fromByteOffset) }()
+        case 370: try { try decoder.decodeSingularInt32Field(value: &_storage._fromHexDigit) }()
+        case 371: try { try decoder.decodeSingularInt32Field(value: &_storage._fullName) }()
+        case 372: try { try decoder.decodeSingularInt32Field(value: &_storage._func) }()
+        case 373: try { try decoder.decodeSingularInt32Field(value: &_storage._function) }()
+        case 374: try { try decoder.decodeSingularInt32Field(value: &_storage._g) }()
+        case 375: try { try decoder.decodeSingularInt32Field(value: &_storage._generatedCodeInfo) }()
+        case 376: try { try decoder.decodeSingularInt32Field(value: &_storage._get) }()
+        case 377: try { try decoder.decodeSingularInt32Field(value: &_storage._getExtensionValue) }()
+        case 378: try { try decoder.decodeSingularInt32Field(value: &_storage._googleapis) }()
+        case 379: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufAny) }()
+        case 380: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufApi) }()
+        case 381: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBoolValue) }()
+        case 382: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBytesValue) }()
+        case 383: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDescriptorProto) }()
+        case 384: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDoubleValue) }()
+        case 385: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDuration) }()
+        case 386: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEdition) }()
+        case 387: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEmpty) }()
+        case 388: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnum) }()
+        case 389: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumDescriptorProto) }()
+        case 390: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumOptions) }()
+        case 391: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValue) }()
+        case 392: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueDescriptorProto) }()
+        case 393: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueOptions) }()
+        case 394: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufExtensionRangeOptions) }()
+        case 395: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSet) }()
+        case 396: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSetDefaults) }()
+        case 397: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufField) }()
+        case 398: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldDescriptorProto) }()
+        case 399: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldMask) }()
+        case 400: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldOptions) }()
+        case 401: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorProto) }()
+        case 402: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorSet) }()
+        case 403: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileOptions) }()
+        case 404: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFloatValue) }()
+        case 405: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufGeneratedCodeInfo) }()
+        case 406: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt32Value) }()
+        case 407: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt64Value) }()
+        case 408: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufListValue) }()
+        case 409: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMessageOptions) }()
+        case 410: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethod) }()
+        case 411: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodDescriptorProto) }()
+        case 412: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodOptions) }()
+        case 413: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMixin) }()
+        case 414: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufNullValue) }()
+        case 415: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofDescriptorProto) }()
+        case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofOptions) }()
+        case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOption) }()
+        case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceDescriptorProto) }()
+        case 419: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceOptions) }()
+        case 420: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceCodeInfo) }()
+        case 421: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceContext) }()
+        case 422: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStringValue) }()
+        case 423: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStruct) }()
+        case 424: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSyntax) }()
+        case 425: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufTimestamp) }()
+        case 426: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufType) }()
+        case 427: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint32Value) }()
+        case 428: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint64Value) }()
+        case 429: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUninterpretedOption) }()
+        case 430: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufValue) }()
+        case 431: try { try decoder.decodeSingularInt32Field(value: &_storage._goPackage) }()
+        case 432: try { try decoder.decodeSingularInt32Field(value: &_storage._group) }()
+        case 433: try { try decoder.decodeSingularInt32Field(value: &_storage._groupFieldNumberStack) }()
+        case 434: try { try decoder.decodeSingularInt32Field(value: &_storage._groupSize) }()
+        case 435: try { try decoder.decodeSingularInt32Field(value: &_storage._guard) }()
+        case 436: try { try decoder.decodeSingularInt32Field(value: &_storage._hadOneofValue) }()
+        case 437: try { try decoder.decodeSingularInt32Field(value: &_storage._handleConflictingOneOf) }()
+        case 438: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAggregateValue_p) }()
+        case 439: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAllowAlias_p) }()
+        case 440: try { try decoder.decodeSingularInt32Field(value: &_storage._hasBegin_p) }()
+        case 441: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcEnableArenas_p) }()
+        case 442: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcGenericServices_p) }()
+        case 443: try { try decoder.decodeSingularInt32Field(value: &_storage._hasClientStreaming_p) }()
+        case 444: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCsharpNamespace_p) }()
+        case 445: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCtype_p) }()
+        case 446: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDebugRedact_p) }()
+        case 447: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDefaultValue_p) }()
+        case 448: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecated_p) }()
+        case 449: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecatedLegacyJsonFieldConflicts_p) }()
+        case 450: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecationWarning_p) }()
+        case 451: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDoubleValue_p) }()
+        case 452: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEdition_p) }()
+        case 453: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionDeprecated_p) }()
+        case 454: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionIntroduced_p) }()
+        case 455: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionRemoved_p) }()
+        case 456: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnd_p) }()
+        case 457: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnforceNamingStyle_p) }()
+        case 458: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnumType_p) }()
+        case 459: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtendee_p) }()
+        case 460: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtensionValue_p) }()
+        case 461: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatures_p) }()
+        case 462: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatureSupport_p) }()
+        case 463: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFieldPresence_p) }()
+        case 464: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFixedFeatures_p) }()
+        case 465: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFullName_p) }()
+        case 466: try { try decoder.decodeSingularInt32Field(value: &_storage._hasGoPackage_p) }()
+        case 467: try { try decoder.decodeSingularInt32Field(value: &_storage._hash) }()
+        case 468: try { try decoder.decodeSingularInt32Field(value: &_storage._hashable) }()
+        case 469: try { try decoder.decodeSingularInt32Field(value: &_storage._hasher) }()
+        case 470: try { try decoder.decodeSingularInt32Field(value: &_storage._hashVisitor) }()
+        case 471: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdempotencyLevel_p) }()
+        case 472: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdentifierValue_p) }()
+        case 473: try { try decoder.decodeSingularInt32Field(value: &_storage._hasInputType_p) }()
+        case 474: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIsExtension_p) }()
+        case 475: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenerateEqualsAndHash_p) }()
+        case 476: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenericServices_p) }()
+        case 477: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaMultipleFiles_p) }()
+        case 478: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaOuterClassname_p) }()
+        case 479: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaPackage_p) }()
+        case 480: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaStringCheckUtf8_p) }()
+        case 481: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonFormat_p) }()
+        case 482: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonName_p) }()
+        case 483: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJstype_p) }()
+        case 484: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLabel_p) }()
+        case 485: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLazy_p) }()
+        case 486: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLeadingComments_p) }()
+        case 487: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMapEntry_p) }()
+        case 488: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMaximumEdition_p) }()
+        case 489: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageEncoding_p) }()
+        case 490: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageSetWireFormat_p) }()
+        case 491: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMinimumEdition_p) }()
+        case 492: try { try decoder.decodeSingularInt32Field(value: &_storage._hasName_p) }()
+        case 493: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNamePart_p) }()
+        case 494: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNegativeIntValue_p) }()
+        case 495: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNoStandardDescriptorAccessor_p) }()
+        case 496: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNumber_p) }()
+        case 497: try { try decoder.decodeSingularInt32Field(value: &_storage._hasObjcClassPrefix_p) }()
+        case 498: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOneofIndex_p) }()
+        case 499: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptimizeFor_p) }()
+        case 500: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptions_p) }()
+        case 501: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOutputType_p) }()
+        case 502: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOverridableFeatures_p) }()
+        case 503: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPackage_p) }()
+        case 504: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPacked_p) }()
+        case 505: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpClassPrefix_p) }()
+        case 506: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpMetadataNamespace_p) }()
+        case 507: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpNamespace_p) }()
+        case 508: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPositiveIntValue_p) }()
+        case 509: try { try decoder.decodeSingularInt32Field(value: &_storage._hasProto3Optional_p) }()
+        case 510: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPyGenericServices_p) }()
+        case 511: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeated_p) }()
+        case 512: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeatedFieldEncoding_p) }()
+        case 513: try { try decoder.decodeSingularInt32Field(value: &_storage._hasReserved_p) }()
+        case 514: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRetention_p) }()
+        case 515: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRubyPackage_p) }()
+        case 516: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSemantic_p) }()
+        case 517: try { try decoder.decodeSingularInt32Field(value: &_storage._hasServerStreaming_p) }()
+        case 518: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceCodeInfo_p) }()
+        case 519: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceContext_p) }()
+        case 520: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceFile_p) }()
+        case 521: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStart_p) }()
+        case 522: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStringValue_p) }()
+        case 523: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSwiftPrefix_p) }()
+        case 524: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSyntax_p) }()
+        case 525: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTrailingComments_p) }()
+        case 526: try { try decoder.decodeSingularInt32Field(value: &_storage._hasType_p) }()
+        case 527: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTypeName_p) }()
+        case 528: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUnverifiedLazy_p) }()
+        case 529: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUtf8Validation_p) }()
+        case 530: try { try decoder.decodeSingularInt32Field(value: &_storage._hasValue_p) }()
+        case 531: try { try decoder.decodeSingularInt32Field(value: &_storage._hasVerification_p) }()
+        case 532: try { try decoder.decodeSingularInt32Field(value: &_storage._hasWeak_p) }()
+        case 533: try { try decoder.decodeSingularInt32Field(value: &_storage._hour) }()
+        case 534: try { try decoder.decodeSingularInt32Field(value: &_storage._i) }()
+        case 535: try { try decoder.decodeSingularInt32Field(value: &_storage._idempotencyLevel) }()
+        case 536: try { try decoder.decodeSingularInt32Field(value: &_storage._identifierValue) }()
+        case 537: try { try decoder.decodeSingularInt32Field(value: &_storage._if) }()
+        case 538: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownExtensionFields) }()
+        case 539: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownFields) }()
+        case 540: try { try decoder.decodeSingularInt32Field(value: &_storage._index) }()
+        case 541: try { try decoder.decodeSingularInt32Field(value: &_storage._init_p) }()
+        case 542: try { try decoder.decodeSingularInt32Field(value: &_storage._inout) }()
+        case 543: try { try decoder.decodeSingularInt32Field(value: &_storage._inputType) }()
+        case 544: try { try decoder.decodeSingularInt32Field(value: &_storage._insert) }()
+        case 545: try { try decoder.decodeSingularInt32Field(value: &_storage._int) }()
+        case 546: try { try decoder.decodeSingularInt32Field(value: &_storage._int32) }()
+        case 547: try { try decoder.decodeSingularInt32Field(value: &_storage._int32Value) }()
+        case 548: try { try decoder.decodeSingularInt32Field(value: &_storage._int64) }()
+        case 549: try { try decoder.decodeSingularInt32Field(value: &_storage._int64Value) }()
+        case 550: try { try decoder.decodeSingularInt32Field(value: &_storage._int8) }()
+        case 551: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteral) }()
+        case 552: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteralType) }()
+        case 553: try { try decoder.decodeSingularInt32Field(value: &_storage._intern) }()
+        case 554: try { try decoder.decodeSingularInt32Field(value: &_storage._internal) }()
+        case 555: try { try decoder.decodeSingularInt32Field(value: &_storage._internalState) }()
+        case 556: try { try decoder.decodeSingularInt32Field(value: &_storage._intersect) }()
+        case 557: try { try decoder.decodeSingularInt32Field(value: &_storage._into) }()
+        case 558: try { try decoder.decodeSingularInt32Field(value: &_storage._ints) }()
+        case 559: try { try decoder.decodeSingularInt32Field(value: &_storage._invalidAnyTypeURL) }()
+        case 560: try { try decoder.decodeSingularInt32Field(value: &_storage._isA) }()
+        case 561: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqual) }()
+        case 562: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqualTo) }()
+        case 563: try { try decoder.decodeSingularInt32Field(value: &_storage._isExtension) }()
+        case 564: try { try decoder.decodeSingularInt32Field(value: &_storage._isInitialized_p) }()
+        case 565: try { try decoder.decodeSingularInt32Field(value: &_storage._isNegative) }()
+        case 566: try { try decoder.decodeSingularInt32Field(value: &_storage._isPathValid) }()
+        case 567: try { try decoder.decodeSingularInt32Field(value: &_storage._isValid) }()
+        case 568: try { try decoder.decodeSingularInt32Field(value: &_storage._itemTagsEncodedSize) }()
+        case 569: try { try decoder.decodeSingularInt32Field(value: &_storage._iterator) }()
+        case 570: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenerateEqualsAndHash) }()
+        case 571: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenericServices) }()
+        case 572: try { try decoder.decodeSingularInt32Field(value: &_storage._javaMultipleFiles) }()
+        case 573: try { try decoder.decodeSingularInt32Field(value: &_storage._javaOuterClassname) }()
+        case 574: try { try decoder.decodeSingularInt32Field(value: &_storage._javaPackage) }()
+        case 575: try { try decoder.decodeSingularInt32Field(value: &_storage._javaStringCheckUtf8) }()
+        case 576: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoder) }()
+        case 577: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoding) }()
+        case 578: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingError) }()
+        case 579: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingOptions) }()
+        case 580: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonEncoder) }()
+        case 581: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencoding) }()
+        case 582: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingError) }()
+        case 583: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingOptions) }()
+        case 584: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingVisitor) }()
+        case 585: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonFormat) }()
+        case 586: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonmapEncodingVisitor) }()
+        case 587: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonName) }()
+        case 588: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPath) }()
+        case 589: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPaths) }()
+        case 590: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonscanner) }()
+        case 591: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonString) }()
+        case 592: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonText) }()
+        case 593: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Bytes) }()
+        case 594: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Data) }()
+        case 595: try { try decoder.decodeSingularInt32Field(value: &_storage._jstype) }()
+        case 596: try { try decoder.decodeSingularInt32Field(value: &_storage._k) }()
+        case 597: try { try decoder.decodeSingularInt32Field(value: &_storage._kChunkSize) }()
+        case 598: try { try decoder.decodeSingularInt32Field(value: &_storage._key) }()
+        case 599: try { try decoder.decodeSingularInt32Field(value: &_storage._keyField) }()
+        case 600: try { try decoder.decodeSingularInt32Field(value: &_storage._keyFieldOpt) }()
+        case 601: try { try decoder.decodeSingularInt32Field(value: &_storage._keyType) }()
+        case 602: try { try decoder.decodeSingularInt32Field(value: &_storage._kind) }()
+        case 603: try { try decoder.decodeSingularInt32Field(value: &_storage._l) }()
+        case 604: try { try decoder.decodeSingularInt32Field(value: &_storage._label) }()
+        case 605: try { try decoder.decodeSingularInt32Field(value: &_storage._lazy) }()
+        case 606: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingComments) }()
+        case 607: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingDetachedComments) }()
+        case 608: try { try decoder.decodeSingularInt32Field(value: &_storage._length) }()
+        case 609: try { try decoder.decodeSingularInt32Field(value: &_storage._lessThan) }()
+        case 610: try { try decoder.decodeSingularInt32Field(value: &_storage._let) }()
+        case 611: try { try decoder.decodeSingularInt32Field(value: &_storage._lhs) }()
+        case 612: try { try decoder.decodeSingularInt32Field(value: &_storage._line) }()
+        case 613: try { try decoder.decodeSingularInt32Field(value: &_storage._list) }()
+        case 614: try { try decoder.decodeSingularInt32Field(value: &_storage._listOfMessages) }()
+        case 615: try { try decoder.decodeSingularInt32Field(value: &_storage._listValue) }()
+        case 616: try { try decoder.decodeSingularInt32Field(value: &_storage._littleEndian) }()
+        case 617: try { try decoder.decodeSingularInt32Field(value: &_storage._load) }()
+        case 618: try { try decoder.decodeSingularInt32Field(value: &_storage._localHasher) }()
+        case 619: try { try decoder.decodeSingularInt32Field(value: &_storage._location) }()
+        case 620: try { try decoder.decodeSingularInt32Field(value: &_storage._m) }()
+        case 621: try { try decoder.decodeSingularInt32Field(value: &_storage._major) }()
+        case 622: try { try decoder.decodeSingularInt32Field(value: &_storage._makeAsyncIterator) }()
+        case 623: try { try decoder.decodeSingularInt32Field(value: &_storage._makeIterator) }()
+        case 624: try { try decoder.decodeSingularInt32Field(value: &_storage._malformedLength) }()
+        case 625: try { try decoder.decodeSingularInt32Field(value: &_storage._mapEntry) }()
+        case 626: try { try decoder.decodeSingularInt32Field(value: &_storage._mapKeyType) }()
+        case 627: try { try decoder.decodeSingularInt32Field(value: &_storage._mapToMessages) }()
+        case 628: try { try decoder.decodeSingularInt32Field(value: &_storage._mapValueType) }()
+        case 629: try { try decoder.decodeSingularInt32Field(value: &_storage._mapVisitor) }()
+        case 630: try { try decoder.decodeSingularInt32Field(value: &_storage._mask) }()
+        case 631: try { try decoder.decodeSingularInt32Field(value: &_storage._maximumEdition) }()
+        case 632: try { try decoder.decodeSingularInt32Field(value: &_storage._mdayStart) }()
+        case 633: try { try decoder.decodeSingularInt32Field(value: &_storage._merge) }()
+        case 634: try { try decoder.decodeSingularInt32Field(value: &_storage._mergeOptions) }()
+        case 635: try { try decoder.decodeSingularInt32Field(value: &_storage._message) }()
+        case 636: try { try decoder.decodeSingularInt32Field(value: &_storage._messageDepthLimit) }()
+        case 637: try { try decoder.decodeSingularInt32Field(value: &_storage._messageEncoding) }()
+        case 638: try { try decoder.decodeSingularInt32Field(value: &_storage._messageExtension) }()
+        case 639: try { try decoder.decodeSingularInt32Field(value: &_storage._messageImplementationBase) }()
+        case 640: try { try decoder.decodeSingularInt32Field(value: &_storage._messageOptions) }()
+        case 641: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSet) }()
+        case 642: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSetWireFormat) }()
+        case 643: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSize) }()
+        case 644: try { try decoder.decodeSingularInt32Field(value: &_storage._messageType) }()
+        case 645: try { try decoder.decodeSingularInt32Field(value: &_storage._method) }()
+        case 646: try { try decoder.decodeSingularInt32Field(value: &_storage._methodDescriptorProto) }()
+        case 647: try { try decoder.decodeSingularInt32Field(value: &_storage._methodOptions) }()
+        case 648: try { try decoder.decodeSingularInt32Field(value: &_storage._methods) }()
+        case 649: try { try decoder.decodeSingularInt32Field(value: &_storage._min) }()
+        case 650: try { try decoder.decodeSingularInt32Field(value: &_storage._minimumEdition) }()
+        case 651: try { try decoder.decodeSingularInt32Field(value: &_storage._minor) }()
+        case 652: try { try decoder.decodeSingularInt32Field(value: &_storage._mixin) }()
+        case 653: try { try decoder.decodeSingularInt32Field(value: &_storage._mixins) }()
+        case 654: try { try decoder.decodeSingularInt32Field(value: &_storage._modify) }()
+        case 655: try { try decoder.decodeSingularInt32Field(value: &_storage._month) }()
+        case 656: try { try decoder.decodeSingularInt32Field(value: &_storage._msgExtension) }()
+        case 657: try { try decoder.decodeSingularInt32Field(value: &_storage._mutating) }()
+        case 658: try { try decoder.decodeSingularInt32Field(value: &_storage._n) }()
+        case 659: try { try decoder.decodeSingularInt32Field(value: &_storage._name) }()
+        case 660: try { try decoder.decodeSingularInt32Field(value: &_storage._nameDescription) }()
+        case 661: try { try decoder.decodeSingularInt32Field(value: &_storage._nameMap) }()
+        case 662: try { try decoder.decodeSingularInt32Field(value: &_storage._namePart) }()
+        case 663: try { try decoder.decodeSingularInt32Field(value: &_storage._names) }()
+        case 664: try { try decoder.decodeSingularInt32Field(value: &_storage._nanos) }()
+        case 665: try { try decoder.decodeSingularInt32Field(value: &_storage._negativeIntValue) }()
+        case 666: try { try decoder.decodeSingularInt32Field(value: &_storage._nestedType) }()
+        case 667: try { try decoder.decodeSingularInt32Field(value: &_storage._newExtensible) }()
+        case 668: try { try decoder.decodeSingularInt32Field(value: &_storage._newL) }()
+        case 669: try { try decoder.decodeSingularInt32Field(value: &_storage._newList) }()
+        case 670: try { try decoder.decodeSingularInt32Field(value: &_storage._newMessage) }()
+        case 671: try { try decoder.decodeSingularInt32Field(value: &_storage._newValue) }()
+        case 672: try { try decoder.decodeSingularInt32Field(value: &_storage._next) }()
+        case 673: try { try decoder.decodeSingularInt32Field(value: &_storage._nextByte) }()
+        case 674: try { try decoder.decodeSingularInt32Field(value: &_storage._nextFieldNumber) }()
+        case 675: try { try decoder.decodeSingularInt32Field(value: &_storage._nextVarInt) }()
+        case 676: try { try decoder.decodeSingularInt32Field(value: &_storage._nil) }()
+        case 677: try { try decoder.decodeSingularInt32Field(value: &_storage._nilLiteral) }()
+        case 678: try { try decoder.decodeSingularInt32Field(value: &_storage._noBytesAvailable) }()
+        case 679: try { try decoder.decodeSingularInt32Field(value: &_storage._noStandardDescriptorAccessor) }()
+        case 680: try { try decoder.decodeSingularInt32Field(value: &_storage._nullValue) }()
+        case 681: try { try decoder.decodeSingularInt32Field(value: &_storage._number) }()
+        case 682: try { try decoder.decodeSingularInt32Field(value: &_storage._numberValue) }()
+        case 683: try { try decoder.decodeSingularInt32Field(value: &_storage._objcClassPrefix) }()
+        case 684: try { try decoder.decodeSingularInt32Field(value: &_storage._of) }()
+        case 685: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDecl) }()
+        case 686: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDescriptorProto) }()
+        case 687: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofIndex) }()
+        case 688: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofOptions) }()
+        case 689: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofs) }()
+        case 690: try { try decoder.decodeSingularInt32Field(value: &_storage._oneOfKind) }()
+        case 691: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeFor) }()
+        case 692: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeMode) }()
+        case 693: try { try decoder.decodeSingularInt32Field(value: &_storage._option) }()
+        case 694: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalEnumExtensionField) }()
+        case 695: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalExtensionField) }()
+        case 696: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalGroupExtensionField) }()
+        case 697: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalMessageExtensionField) }()
+        case 698: try { try decoder.decodeSingularInt32Field(value: &_storage._optionRetention) }()
+        case 699: try { try decoder.decodeSingularInt32Field(value: &_storage._options) }()
+        case 700: try { try decoder.decodeSingularInt32Field(value: &_storage._optionTargetType) }()
+        case 701: try { try decoder.decodeSingularInt32Field(value: &_storage._other) }()
+        case 702: try { try decoder.decodeSingularInt32Field(value: &_storage._others) }()
+        case 703: try { try decoder.decodeSingularInt32Field(value: &_storage._out) }()
+        case 704: try { try decoder.decodeSingularInt32Field(value: &_storage._outputType) }()
+        case 705: try { try decoder.decodeSingularInt32Field(value: &_storage._overridableFeatures) }()
+        case 706: try { try decoder.decodeSingularInt32Field(value: &_storage._p) }()
+        case 707: try { try decoder.decodeSingularInt32Field(value: &_storage._package) }()
+        case 708: try { try decoder.decodeSingularInt32Field(value: &_storage._packed) }()
+        case 709: try { try decoder.decodeSingularInt32Field(value: &_storage._packedEnumExtensionField) }()
+        case 710: try { try decoder.decodeSingularInt32Field(value: &_storage._packedExtensionField) }()
+        case 711: try { try decoder.decodeSingularInt32Field(value: &_storage._padding) }()
+        case 712: try { try decoder.decodeSingularInt32Field(value: &_storage._parent) }()
+        case 713: try { try decoder.decodeSingularInt32Field(value: &_storage._parse) }()
+        case 714: try { try decoder.decodeSingularInt32Field(value: &_storage._partial) }()
+        case 715: try { try decoder.decodeSingularInt32Field(value: &_storage._path) }()
+        case 716: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecoder) }()
+        case 717: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecodingError) }()
+        case 718: try { try decoder.decodeSingularInt32Field(value: &_storage._paths) }()
+        case 719: try { try decoder.decodeSingularInt32Field(value: &_storage._pathVisitor) }()
+        case 720: try { try decoder.decodeSingularInt32Field(value: &_storage._payload) }()
+        case 721: try { try decoder.decodeSingularInt32Field(value: &_storage._payloadSize) }()
+        case 722: try { try decoder.decodeSingularInt32Field(value: &_storage._phpClassPrefix) }()
+        case 723: try { try decoder.decodeSingularInt32Field(value: &_storage._phpMetadataNamespace) }()
+        case 724: try { try decoder.decodeSingularInt32Field(value: &_storage._phpNamespace) }()
+        case 725: try { try decoder.decodeSingularInt32Field(value: &_storage._pos) }()
+        case 726: try { try decoder.decodeSingularInt32Field(value: &_storage._positiveIntValue) }()
+        case 727: try { try decoder.decodeSingularInt32Field(value: &_storage._prefix) }()
+        case 728: try { try decoder.decodeSingularInt32Field(value: &_storage._preserveProtoFieldNames) }()
+        case 729: try { try decoder.decodeSingularInt32Field(value: &_storage._preTraverse) }()
+        case 730: try { try decoder.decodeSingularInt32Field(value: &_storage._prevPath) }()
+        case 731: try { try decoder.decodeSingularInt32Field(value: &_storage._printUnknownFields) }()
+        case 732: try { try decoder.decodeSingularInt32Field(value: &_storage._proto2) }()
+        case 733: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3DefaultValue) }()
+        case 734: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3Optional) }()
+        case 735: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversionCheck) }()
+        case 736: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversion2) }()
+        case 737: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBool) }()
+        case 738: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBytes) }()
+        case 739: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufDouble) }()
+        case 740: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufEnumMap) }()
+        case 741: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtension) }()
+        case 742: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed32) }()
+        case 743: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed64) }()
+        case 744: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFloat) }()
+        case 745: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt32) }()
+        case 746: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt64) }()
+        case 747: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMap) }()
+        case 748: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMessageMap) }()
+        case 749: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed32) }()
+        case 750: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed64) }()
+        case 751: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint32) }()
+        case 752: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint64) }()
+        case 753: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufString) }()
+        case 754: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint32) }()
+        case 755: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint64) }()
+        case 756: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtensionFieldValues) }()
+        case 757: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFieldNumber) }()
+        case 758: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufGeneratedIsEqualTo) }()
+        case 759: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNameMap) }()
+        case 760: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNewField) }()
+        case 761: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufPackage) }()
+        case 762: try { try decoder.decodeSingularInt32Field(value: &_storage._protocol) }()
+        case 763: try { try decoder.decodeSingularInt32Field(value: &_storage._protoFieldName) }()
+        case 764: try { try decoder.decodeSingularInt32Field(value: &_storage._protoMessageName) }()
+        case 765: try { try decoder.decodeSingularInt32Field(value: &_storage._protoNameProviding) }()
+        case 766: try { try decoder.decodeSingularInt32Field(value: &_storage._protoPaths) }()
+        case 767: try { try decoder.decodeSingularInt32Field(value: &_storage._public) }()
+        case 768: try { try decoder.decodeSingularInt32Field(value: &_storage._publicDependency) }()
+        case 769: try { try decoder.decodeSingularInt32Field(value: &_storage._putBoolValue) }()
+        case 770: try { try decoder.decodeSingularInt32Field(value: &_storage._putBytesValue) }()
+        case 771: try { try decoder.decodeSingularInt32Field(value: &_storage._putDoubleValue) }()
+        case 772: try { try decoder.decodeSingularInt32Field(value: &_storage._putEnumValue) }()
+        case 773: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint32) }()
+        case 774: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint64) }()
+        case 775: try { try decoder.decodeSingularInt32Field(value: &_storage._putFloatValue) }()
+        case 776: try { try decoder.decodeSingularInt32Field(value: &_storage._putInt64) }()
+        case 777: try { try decoder.decodeSingularInt32Field(value: &_storage._putStringValue) }()
+        case 778: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64) }()
+        case 779: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64Hex) }()
+        case 780: try { try decoder.decodeSingularInt32Field(value: &_storage._putVarInt) }()
+        case 781: try { try decoder.decodeSingularInt32Field(value: &_storage._putZigZagVarInt) }()
+        case 782: try { try decoder.decodeSingularInt32Field(value: &_storage._pyGenericServices) }()
+        case 783: try { try decoder.decodeSingularInt32Field(value: &_storage._r) }()
+        case 784: try { try decoder.decodeSingularInt32Field(value: &_storage._rawChars) }()
+        case 785: try { try decoder.decodeSingularInt32Field(value: &_storage._rawRepresentable) }()
+        case 786: try { try decoder.decodeSingularInt32Field(value: &_storage._rawValue) }()
+        case 787: try { try decoder.decodeSingularInt32Field(value: &_storage._read4HexDigits) }()
+        case 788: try { try decoder.decodeSingularInt32Field(value: &_storage._readBytes) }()
+        case 789: try { try decoder.decodeSingularInt32Field(value: &_storage._register) }()
+        case 790: try { try decoder.decodeSingularInt32Field(value: &_storage._removingAllFieldsOf) }()
+        case 791: try { try decoder.decodeSingularInt32Field(value: &_storage._repeated) }()
+        case 792: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedEnumExtensionField) }()
+        case 793: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedExtensionField) }()
+        case 794: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedFieldEncoding) }()
+        case 795: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedGroupExtensionField) }()
+        case 796: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedMessageExtensionField) }()
+        case 797: try { try decoder.decodeSingularInt32Field(value: &_storage._repeating) }()
+        case 798: try { try decoder.decodeSingularInt32Field(value: &_storage._replaceRepeatedFields) }()
+        case 799: try { try decoder.decodeSingularInt32Field(value: &_storage._requestStreaming) }()
+        case 800: try { try decoder.decodeSingularInt32Field(value: &_storage._requestTypeURL) }()
+        case 801: try { try decoder.decodeSingularInt32Field(value: &_storage._requiredSize) }()
+        case 802: try { try decoder.decodeSingularInt32Field(value: &_storage._responseStreaming) }()
+        case 803: try { try decoder.decodeSingularInt32Field(value: &_storage._responseTypeURL) }()
+        case 804: try { try decoder.decodeSingularInt32Field(value: &_storage._result) }()
+        case 805: try { try decoder.decodeSingularInt32Field(value: &_storage._retention) }()
+        case 806: try { try decoder.decodeSingularInt32Field(value: &_storage._rethrows) }()
+        case 807: try { try decoder.decodeSingularInt32Field(value: &_storage._return) }()
+        case 808: try { try decoder.decodeSingularInt32Field(value: &_storage._returnType) }()
+        case 809: try { try decoder.decodeSingularInt32Field(value: &_storage._revision) }()
+        case 810: try { try decoder.decodeSingularInt32Field(value: &_storage._rhs) }()
+        case 811: try { try decoder.decodeSingularInt32Field(value: &_storage._root) }()
+        case 812: try { try decoder.decodeSingularInt32Field(value: &_storage._rubyPackage) }()
+        case 813: try { try decoder.decodeSingularInt32Field(value: &_storage._s) }()
+        case 814: try { try decoder.decodeSingularInt32Field(value: &_storage._sawBackslash) }()
+        case 815: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection4Characters) }()
+        case 816: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection5Characters) }()
+        case 817: try { try decoder.decodeSingularInt32Field(value: &_storage._scan) }()
+        case 818: try { try decoder.decodeSingularInt32Field(value: &_storage._scanner) }()
+        case 819: try { try decoder.decodeSingularInt32Field(value: &_storage._seconds) }()
+        case 820: try { try decoder.decodeSingularInt32Field(value: &_storage._self_p) }()
+        case 821: try { try decoder.decodeSingularInt32Field(value: &_storage._semantic) }()
+        case 822: try { try decoder.decodeSingularInt32Field(value: &_storage._sendable) }()
+        case 823: try { try decoder.decodeSingularInt32Field(value: &_storage._separator) }()
+        case 824: try { try decoder.decodeSingularInt32Field(value: &_storage._serialize) }()
+        case 825: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedBytes) }()
+        case 826: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedData) }()
+        case 827: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedSize) }()
+        case 828: try { try decoder.decodeSingularInt32Field(value: &_storage._serverStreaming) }()
+        case 829: try { try decoder.decodeSingularInt32Field(value: &_storage._service) }()
+        case 830: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceDescriptorProto) }()
+        case 831: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceOptions) }()
+        case 832: try { try decoder.decodeSingularInt32Field(value: &_storage._set) }()
+        case 833: try { try decoder.decodeSingularInt32Field(value: &_storage._setExtensionValue) }()
+        case 834: try { try decoder.decodeSingularInt32Field(value: &_storage._shift) }()
+        case 835: try { try decoder.decodeSingularInt32Field(value: &_storage._simpleExtensionMap) }()
+        case 836: try { try decoder.decodeSingularInt32Field(value: &_storage._size) }()
+        case 837: try { try decoder.decodeSingularInt32Field(value: &_storage._sizer) }()
+        case 838: try { try decoder.decodeSingularInt32Field(value: &_storage._source) }()
+        case 839: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceCodeInfo) }()
+        case 840: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceContext) }()
+        case 841: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceEncoding) }()
+        case 842: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceFile) }()
+        case 843: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceLocation) }()
+        case 844: try { try decoder.decodeSingularInt32Field(value: &_storage._span) }()
+        case 845: try { try decoder.decodeSingularInt32Field(value: &_storage._split) }()
+        case 846: try { try decoder.decodeSingularInt32Field(value: &_storage._start) }()
+        case 847: try { try decoder.decodeSingularInt32Field(value: &_storage._startArray) }()
+        case 848: try { try decoder.decodeSingularInt32Field(value: &_storage._startArrayObject) }()
+        case 849: try { try decoder.decodeSingularInt32Field(value: &_storage._startField) }()
+        case 850: try { try decoder.decodeSingularInt32Field(value: &_storage._startIndex) }()
+        case 851: try { try decoder.decodeSingularInt32Field(value: &_storage._startMessageField) }()
+        case 852: try { try decoder.decodeSingularInt32Field(value: &_storage._startObject) }()
+        case 853: try { try decoder.decodeSingularInt32Field(value: &_storage._startRegularField) }()
+        case 854: try { try decoder.decodeSingularInt32Field(value: &_storage._state) }()
+        case 855: try { try decoder.decodeSingularInt32Field(value: &_storage._static) }()
+        case 856: try { try decoder.decodeSingularInt32Field(value: &_storage._staticString) }()
+        case 857: try { try decoder.decodeSingularInt32Field(value: &_storage._storage) }()
+        case 858: try { try decoder.decodeSingularInt32Field(value: &_storage._string) }()
+        case 859: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteral) }()
+        case 860: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteralType) }()
+        case 861: try { try decoder.decodeSingularInt32Field(value: &_storage._stringResult) }()
+        case 862: try { try decoder.decodeSingularInt32Field(value: &_storage._stringValue) }()
+        case 863: try { try decoder.decodeSingularInt32Field(value: &_storage._struct) }()
+        case 864: try { try decoder.decodeSingularInt32Field(value: &_storage._structValue) }()
+        case 865: try { try decoder.decodeSingularInt32Field(value: &_storage._subDecoder) }()
+        case 866: try { try decoder.decodeSingularInt32Field(value: &_storage._subscript) }()
+        case 867: try { try decoder.decodeSingularInt32Field(value: &_storage._subtract) }()
+        case 868: try { try decoder.decodeSingularInt32Field(value: &_storage._subVisitor) }()
+        case 869: try { try decoder.decodeSingularInt32Field(value: &_storage._swift) }()
+        case 870: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftPrefix) }()
+        case 871: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufContiguousBytes) }()
+        case 872: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufError) }()
+        case 873: try { try decoder.decodeSingularInt32Field(value: &_storage._syntax) }()
+        case 874: try { try decoder.decodeSingularInt32Field(value: &_storage._t) }()
+        case 875: try { try decoder.decodeSingularInt32Field(value: &_storage._tag) }()
+        case 876: try { try decoder.decodeSingularInt32Field(value: &_storage._targets) }()
+        case 877: try { try decoder.decodeSingularInt32Field(value: &_storage._terminator) }()
+        case 878: try { try decoder.decodeSingularInt32Field(value: &_storage._testDecoder) }()
+        case 879: try { try decoder.decodeSingularInt32Field(value: &_storage._text) }()
+        case 880: try { try decoder.decodeSingularInt32Field(value: &_storage._textDecoder) }()
+        case 881: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecoder) }()
+        case 882: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingError) }()
+        case 883: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingOptions) }()
+        case 884: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingOptions) }()
+        case 885: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingVisitor) }()
+        case 886: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatString) }()
+        case 887: try { try decoder.decodeSingularInt32Field(value: &_storage._throwOrIgnore) }()
+        case 888: try { try decoder.decodeSingularInt32Field(value: &_storage._throws) }()
+        case 889: try { try decoder.decodeSingularInt32Field(value: &_storage._timeInterval) }()
+        case 890: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSince1970) }()
+        case 891: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSinceReferenceDate) }()
+        case 892: try { try decoder.decodeSingularInt32Field(value: &_storage._timestamp) }()
+        case 893: try { try decoder.decodeSingularInt32Field(value: &_storage._tmp) }()
+        case 894: try { try decoder.decodeSingularInt32Field(value: &_storage._tooLarge) }()
+        case 895: try { try decoder.decodeSingularInt32Field(value: &_storage._total) }()
+        case 896: try { try decoder.decodeSingularInt32Field(value: &_storage._totalArrayDepth) }()
+        case 897: try { try decoder.decodeSingularInt32Field(value: &_storage._totalSize) }()
+        case 898: try { try decoder.decodeSingularInt32Field(value: &_storage._trailingComments) }()
+        case 899: try { try decoder.decodeSingularInt32Field(value: &_storage._traverse) }()
+        case 900: try { try decoder.decodeSingularInt32Field(value: &_storage._trim) }()
+        case 901: try { try decoder.decodeSingularInt32Field(value: &_storage._true) }()
+        case 902: try { try decoder.decodeSingularInt32Field(value: &_storage._try) }()
+        case 903: try { try decoder.decodeSingularInt32Field(value: &_storage._type) }()
+        case 904: try { try decoder.decodeSingularInt32Field(value: &_storage._typealias) }()
+        case 905: try { try decoder.decodeSingularInt32Field(value: &_storage._typeEnum) }()
+        case 906: try { try decoder.decodeSingularInt32Field(value: &_storage._typeName) }()
+        case 907: try { try decoder.decodeSingularInt32Field(value: &_storage._typePrefix) }()
+        case 908: try { try decoder.decodeSingularInt32Field(value: &_storage._typeStart) }()
+        case 909: try { try decoder.decodeSingularInt32Field(value: &_storage._typeUnknown) }()
+        case 910: try { try decoder.decodeSingularInt32Field(value: &_storage._typeURL) }()
+        case 911: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32) }()
+        case 912: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32Value) }()
+        case 913: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64) }()
+        case 914: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64Value) }()
+        case 915: try { try decoder.decodeSingularInt32Field(value: &_storage._uint8) }()
+        case 916: try { try decoder.decodeSingularInt32Field(value: &_storage._unchecked) }()
+        case 917: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteral) }()
+        case 918: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteralType) }()
+        case 919: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalars) }()
+        case 920: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarView) }()
+        case 921: try { try decoder.decodeSingularInt32Field(value: &_storage._uninterpretedOption) }()
+        case 922: try { try decoder.decodeSingularInt32Field(value: &_storage._union) }()
+        case 923: try { try decoder.decodeSingularInt32Field(value: &_storage._uniqueStorage) }()
+        case 924: try { try decoder.decodeSingularInt32Field(value: &_storage._unknown) }()
+        case 925: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownFields_p) }()
+        case 926: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownStorage) }()
+        case 927: try { try decoder.decodeSingularInt32Field(value: &_storage._unpackTo) }()
+        case 928: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeBufferPointer) }()
+        case 929: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutablePointer) }()
+        case 930: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutableRawBufferPointer) }()
+        case 931: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawBufferPointer) }()
+        case 932: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawPointer) }()
+        case 933: try { try decoder.decodeSingularInt32Field(value: &_storage._unverifiedLazy) }()
+        case 934: try { try decoder.decodeSingularInt32Field(value: &_storage._updatedOptions) }()
+        case 935: try { try decoder.decodeSingularInt32Field(value: &_storage._url) }()
+        case 936: try { try decoder.decodeSingularInt32Field(value: &_storage._useDeterministicOrdering) }()
+        case 937: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8) }()
+        case 938: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Ptr) }()
+        case 939: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8ToDouble) }()
+        case 940: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Validation) }()
+        case 941: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8View) }()
+        case 942: try { try decoder.decodeSingularInt32Field(value: &_storage._v) }()
+        case 943: try { try decoder.decodeSingularInt32Field(value: &_storage._value) }()
+        case 944: try { try decoder.decodeSingularInt32Field(value: &_storage._valueField) }()
+        case 945: try { try decoder.decodeSingularInt32Field(value: &_storage._values) }()
+        case 946: try { try decoder.decodeSingularInt32Field(value: &_storage._valueType) }()
+        case 947: try { try decoder.decodeSingularInt32Field(value: &_storage._var) }()
+        case 948: try { try decoder.decodeSingularInt32Field(value: &_storage._verification) }()
+        case 949: try { try decoder.decodeSingularInt32Field(value: &_storage._verificationState) }()
+        case 950: try { try decoder.decodeSingularInt32Field(value: &_storage._version) }()
+        case 951: try { try decoder.decodeSingularInt32Field(value: &_storage._versionString) }()
+        case 952: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFields) }()
+        case 953: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFieldsAsMessageSet) }()
+        case 954: try { try decoder.decodeSingularInt32Field(value: &_storage._visitMapField) }()
+        case 955: try { try decoder.decodeSingularInt32Field(value: &_storage._visitor) }()
+        case 956: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPacked) }()
+        case 957: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedBoolField) }()
+        case 958: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedDoubleField) }()
+        case 959: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedEnumField) }()
+        case 960: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed32Field) }()
+        case 961: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed64Field) }()
+        case 962: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFloatField) }()
+        case 963: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt32Field) }()
+        case 964: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt64Field) }()
+        case 965: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed32Field) }()
+        case 966: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed64Field) }()
+        case 967: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint32Field) }()
+        case 968: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint64Field) }()
+        case 969: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint32Field) }()
+        case 970: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint64Field) }()
+        case 971: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeated) }()
+        case 972: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBoolField) }()
+        case 973: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBytesField) }()
+        case 974: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedDoubleField) }()
+        case 975: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedEnumField) }()
+        case 976: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed32Field) }()
+        case 977: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed64Field) }()
+        case 978: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFloatField) }()
+        case 979: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedGroupField) }()
+        case 980: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt32Field) }()
+        case 981: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt64Field) }()
+        case 982: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedMessageField) }()
+        case 983: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed32Field) }()
+        case 984: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed64Field) }()
+        case 985: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint32Field) }()
+        case 986: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint64Field) }()
+        case 987: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedStringField) }()
+        case 988: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint32Field) }()
+        case 989: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint64Field) }()
+        case 990: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingular) }()
+        case 991: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBoolField) }()
+        case 992: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBytesField) }()
+        case 993: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularDoubleField) }()
+        case 994: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularEnumField) }()
+        case 995: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed32Field) }()
+        case 996: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed64Field) }()
+        case 997: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFloatField) }()
+        case 998: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularGroupField) }()
+        case 999: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt32Field) }()
+        case 1000: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt64Field) }()
+        case 1001: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularMessageField) }()
+        case 1002: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed32Field) }()
+        case 1003: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed64Field) }()
+        case 1004: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint32Field) }()
+        case 1005: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint64Field) }()
+        case 1006: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularStringField) }()
+        case 1007: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint32Field) }()
+        case 1008: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint64Field) }()
+        case 1009: try { try decoder.decodeSingularInt32Field(value: &_storage._visitUnknown) }()
+        case 1010: try { try decoder.decodeSingularInt32Field(value: &_storage._wasDecoded) }()
+        case 1011: try { try decoder.decodeSingularInt32Field(value: &_storage._weak) }()
+        case 1012: try { try decoder.decodeSingularInt32Field(value: &_storage._weakDependency) }()
+        case 1013: try { try decoder.decodeSingularInt32Field(value: &_storage._where) }()
+        case 1014: try { try decoder.decodeSingularInt32Field(value: &_storage._wireFormat) }()
+        case 1015: try { try decoder.decodeSingularInt32Field(value: &_storage._with) }()
+        case 1016: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeBytes) }()
+        case 1017: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeMutableBytes) }()
+        case 1018: try { try decoder.decodeSingularInt32Field(value: &_storage._work) }()
+        case 1019: try { try decoder.decodeSingularInt32Field(value: &_storage._wrapped) }()
+        case 1020: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedType) }()
+        case 1021: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedValue) }()
+        case 1022: try { try decoder.decodeSingularInt32Field(value: &_storage._written) }()
+        case 1023: try { try decoder.decodeSingularInt32Field(value: &_storage._yday) }()
         default: break
         }
       }
@@ -9518,2765 +9581,2786 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       if _storage._clearEnd_p != 0 {
         try visitor.visitSingularInt32Field(value: _storage._clearEnd_p, fieldNumber: 96)
       }
+      if _storage._clearEnforceNamingStyle_p != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._clearEnforceNamingStyle_p, fieldNumber: 97)
+      }
       if _storage._clearEnumType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearEnumType_p, fieldNumber: 97)
+        try visitor.visitSingularInt32Field(value: _storage._clearEnumType_p, fieldNumber: 98)
       }
       if _storage._clearExtendee_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearExtendee_p, fieldNumber: 98)
+        try visitor.visitSingularInt32Field(value: _storage._clearExtendee_p, fieldNumber: 99)
       }
       if _storage._clearExtensionValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearExtensionValue_p, fieldNumber: 99)
+        try visitor.visitSingularInt32Field(value: _storage._clearExtensionValue_p, fieldNumber: 100)
       }
       if _storage._clearFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFeatures_p, fieldNumber: 100)
+        try visitor.visitSingularInt32Field(value: _storage._clearFeatures_p, fieldNumber: 101)
       }
       if _storage._clearFeatureSupport_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFeatureSupport_p, fieldNumber: 101)
+        try visitor.visitSingularInt32Field(value: _storage._clearFeatureSupport_p, fieldNumber: 102)
       }
       if _storage._clearFieldPresence_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFieldPresence_p, fieldNumber: 102)
+        try visitor.visitSingularInt32Field(value: _storage._clearFieldPresence_p, fieldNumber: 103)
       }
       if _storage._clearFixedFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFixedFeatures_p, fieldNumber: 103)
+        try visitor.visitSingularInt32Field(value: _storage._clearFixedFeatures_p, fieldNumber: 104)
       }
       if _storage._clearFullName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFullName_p, fieldNumber: 104)
+        try visitor.visitSingularInt32Field(value: _storage._clearFullName_p, fieldNumber: 105)
       }
       if _storage._clearGoPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearGoPackage_p, fieldNumber: 105)
+        try visitor.visitSingularInt32Field(value: _storage._clearGoPackage_p, fieldNumber: 106)
       }
       if _storage._clearIdempotencyLevel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIdempotencyLevel_p, fieldNumber: 106)
+        try visitor.visitSingularInt32Field(value: _storage._clearIdempotencyLevel_p, fieldNumber: 107)
       }
       if _storage._clearIdentifierValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIdentifierValue_p, fieldNumber: 107)
+        try visitor.visitSingularInt32Field(value: _storage._clearIdentifierValue_p, fieldNumber: 108)
       }
       if _storage._clearInputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearInputType_p, fieldNumber: 108)
+        try visitor.visitSingularInt32Field(value: _storage._clearInputType_p, fieldNumber: 109)
       }
       if _storage._clearIsExtension_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIsExtension_p, fieldNumber: 109)
+        try visitor.visitSingularInt32Field(value: _storage._clearIsExtension_p, fieldNumber: 110)
       }
       if _storage._clearJavaGenerateEqualsAndHash_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenerateEqualsAndHash_p, fieldNumber: 110)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenerateEqualsAndHash_p, fieldNumber: 111)
       }
       if _storage._clearJavaGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenericServices_p, fieldNumber: 111)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenericServices_p, fieldNumber: 112)
       }
       if _storage._clearJavaMultipleFiles_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaMultipleFiles_p, fieldNumber: 112)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaMultipleFiles_p, fieldNumber: 113)
       }
       if _storage._clearJavaOuterClassname_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaOuterClassname_p, fieldNumber: 113)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaOuterClassname_p, fieldNumber: 114)
       }
       if _storage._clearJavaPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaPackage_p, fieldNumber: 114)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaPackage_p, fieldNumber: 115)
       }
       if _storage._clearJavaStringCheckUtf8_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaStringCheckUtf8_p, fieldNumber: 115)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaStringCheckUtf8_p, fieldNumber: 116)
       }
       if _storage._clearJsonFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJsonFormat_p, fieldNumber: 116)
+        try visitor.visitSingularInt32Field(value: _storage._clearJsonFormat_p, fieldNumber: 117)
       }
       if _storage._clearJsonName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJsonName_p, fieldNumber: 117)
+        try visitor.visitSingularInt32Field(value: _storage._clearJsonName_p, fieldNumber: 118)
       }
       if _storage._clearJstype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJstype_p, fieldNumber: 118)
+        try visitor.visitSingularInt32Field(value: _storage._clearJstype_p, fieldNumber: 119)
       }
       if _storage._clearLabel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLabel_p, fieldNumber: 119)
+        try visitor.visitSingularInt32Field(value: _storage._clearLabel_p, fieldNumber: 120)
       }
       if _storage._clearLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLazy_p, fieldNumber: 120)
+        try visitor.visitSingularInt32Field(value: _storage._clearLazy_p, fieldNumber: 121)
       }
       if _storage._clearLeadingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLeadingComments_p, fieldNumber: 121)
+        try visitor.visitSingularInt32Field(value: _storage._clearLeadingComments_p, fieldNumber: 122)
       }
       if _storage._clearMapEntry_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMapEntry_p, fieldNumber: 122)
+        try visitor.visitSingularInt32Field(value: _storage._clearMapEntry_p, fieldNumber: 123)
       }
       if _storage._clearMaximumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMaximumEdition_p, fieldNumber: 123)
+        try visitor.visitSingularInt32Field(value: _storage._clearMaximumEdition_p, fieldNumber: 124)
       }
       if _storage._clearMessageEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMessageEncoding_p, fieldNumber: 124)
+        try visitor.visitSingularInt32Field(value: _storage._clearMessageEncoding_p, fieldNumber: 125)
       }
       if _storage._clearMessageSetWireFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMessageSetWireFormat_p, fieldNumber: 125)
+        try visitor.visitSingularInt32Field(value: _storage._clearMessageSetWireFormat_p, fieldNumber: 126)
       }
       if _storage._clearMinimumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMinimumEdition_p, fieldNumber: 126)
+        try visitor.visitSingularInt32Field(value: _storage._clearMinimumEdition_p, fieldNumber: 127)
       }
       if _storage._clearName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearName_p, fieldNumber: 127)
+        try visitor.visitSingularInt32Field(value: _storage._clearName_p, fieldNumber: 128)
       }
       if _storage._clearNamePart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNamePart_p, fieldNumber: 128)
+        try visitor.visitSingularInt32Field(value: _storage._clearNamePart_p, fieldNumber: 129)
       }
       if _storage._clearNegativeIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNegativeIntValue_p, fieldNumber: 129)
+        try visitor.visitSingularInt32Field(value: _storage._clearNegativeIntValue_p, fieldNumber: 130)
       }
       if _storage._clearNoStandardDescriptorAccessor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNoStandardDescriptorAccessor_p, fieldNumber: 130)
+        try visitor.visitSingularInt32Field(value: _storage._clearNoStandardDescriptorAccessor_p, fieldNumber: 131)
       }
       if _storage._clearNumber_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNumber_p, fieldNumber: 131)
+        try visitor.visitSingularInt32Field(value: _storage._clearNumber_p, fieldNumber: 132)
       }
       if _storage._clearObjcClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearObjcClassPrefix_p, fieldNumber: 132)
+        try visitor.visitSingularInt32Field(value: _storage._clearObjcClassPrefix_p, fieldNumber: 133)
       }
       if _storage._clearOneofIndex_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOneofIndex_p, fieldNumber: 133)
+        try visitor.visitSingularInt32Field(value: _storage._clearOneofIndex_p, fieldNumber: 134)
       }
       if _storage._clearOptimizeFor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOptimizeFor_p, fieldNumber: 134)
+        try visitor.visitSingularInt32Field(value: _storage._clearOptimizeFor_p, fieldNumber: 135)
       }
       if _storage._clearOptions_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOptions_p, fieldNumber: 135)
+        try visitor.visitSingularInt32Field(value: _storage._clearOptions_p, fieldNumber: 136)
       }
       if _storage._clearOutputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOutputType_p, fieldNumber: 136)
+        try visitor.visitSingularInt32Field(value: _storage._clearOutputType_p, fieldNumber: 137)
       }
       if _storage._clearOverridableFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOverridableFeatures_p, fieldNumber: 137)
+        try visitor.visitSingularInt32Field(value: _storage._clearOverridableFeatures_p, fieldNumber: 138)
       }
       if _storage._clearPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPackage_p, fieldNumber: 138)
+        try visitor.visitSingularInt32Field(value: _storage._clearPackage_p, fieldNumber: 139)
       }
       if _storage._clearPacked_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPacked_p, fieldNumber: 139)
+        try visitor.visitSingularInt32Field(value: _storage._clearPacked_p, fieldNumber: 140)
       }
       if _storage._clearPhpClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpClassPrefix_p, fieldNumber: 140)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpClassPrefix_p, fieldNumber: 141)
       }
       if _storage._clearPhpMetadataNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpMetadataNamespace_p, fieldNumber: 141)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpMetadataNamespace_p, fieldNumber: 142)
       }
       if _storage._clearPhpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpNamespace_p, fieldNumber: 142)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpNamespace_p, fieldNumber: 143)
       }
       if _storage._clearPositiveIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPositiveIntValue_p, fieldNumber: 143)
+        try visitor.visitSingularInt32Field(value: _storage._clearPositiveIntValue_p, fieldNumber: 144)
       }
       if _storage._clearProto3Optional_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearProto3Optional_p, fieldNumber: 144)
+        try visitor.visitSingularInt32Field(value: _storage._clearProto3Optional_p, fieldNumber: 145)
       }
       if _storage._clearPyGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPyGenericServices_p, fieldNumber: 145)
+        try visitor.visitSingularInt32Field(value: _storage._clearPyGenericServices_p, fieldNumber: 146)
       }
       if _storage._clearRepeated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRepeated_p, fieldNumber: 146)
+        try visitor.visitSingularInt32Field(value: _storage._clearRepeated_p, fieldNumber: 147)
       }
       if _storage._clearRepeatedFieldEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRepeatedFieldEncoding_p, fieldNumber: 147)
+        try visitor.visitSingularInt32Field(value: _storage._clearRepeatedFieldEncoding_p, fieldNumber: 148)
       }
       if _storage._clearReserved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearReserved_p, fieldNumber: 148)
+        try visitor.visitSingularInt32Field(value: _storage._clearReserved_p, fieldNumber: 149)
       }
       if _storage._clearRetention_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRetention_p, fieldNumber: 149)
+        try visitor.visitSingularInt32Field(value: _storage._clearRetention_p, fieldNumber: 150)
       }
       if _storage._clearRubyPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRubyPackage_p, fieldNumber: 150)
+        try visitor.visitSingularInt32Field(value: _storage._clearRubyPackage_p, fieldNumber: 151)
       }
       if _storage._clearSemantic_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSemantic_p, fieldNumber: 151)
+        try visitor.visitSingularInt32Field(value: _storage._clearSemantic_p, fieldNumber: 152)
       }
       if _storage._clearServerStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearServerStreaming_p, fieldNumber: 152)
+        try visitor.visitSingularInt32Field(value: _storage._clearServerStreaming_p, fieldNumber: 153)
       }
       if _storage._clearSourceCodeInfo_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceCodeInfo_p, fieldNumber: 153)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceCodeInfo_p, fieldNumber: 154)
       }
       if _storage._clearSourceContext_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceContext_p, fieldNumber: 154)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceContext_p, fieldNumber: 155)
       }
       if _storage._clearSourceFile_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceFile_p, fieldNumber: 155)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceFile_p, fieldNumber: 156)
       }
       if _storage._clearStart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearStart_p, fieldNumber: 156)
+        try visitor.visitSingularInt32Field(value: _storage._clearStart_p, fieldNumber: 157)
       }
       if _storage._clearStringValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearStringValue_p, fieldNumber: 157)
+        try visitor.visitSingularInt32Field(value: _storage._clearStringValue_p, fieldNumber: 158)
       }
       if _storage._clearSwiftPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSwiftPrefix_p, fieldNumber: 158)
+        try visitor.visitSingularInt32Field(value: _storage._clearSwiftPrefix_p, fieldNumber: 159)
       }
       if _storage._clearSyntax_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSyntax_p, fieldNumber: 159)
+        try visitor.visitSingularInt32Field(value: _storage._clearSyntax_p, fieldNumber: 160)
       }
       if _storage._clearTrailingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearTrailingComments_p, fieldNumber: 160)
+        try visitor.visitSingularInt32Field(value: _storage._clearTrailingComments_p, fieldNumber: 161)
       }
       if _storage._clearType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearType_p, fieldNumber: 161)
+        try visitor.visitSingularInt32Field(value: _storage._clearType_p, fieldNumber: 162)
       }
       if _storage._clearTypeName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearTypeName_p, fieldNumber: 162)
+        try visitor.visitSingularInt32Field(value: _storage._clearTypeName_p, fieldNumber: 163)
       }
       if _storage._clearUnverifiedLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearUnverifiedLazy_p, fieldNumber: 163)
+        try visitor.visitSingularInt32Field(value: _storage._clearUnverifiedLazy_p, fieldNumber: 164)
       }
       if _storage._clearUtf8Validation_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearUtf8Validation_p, fieldNumber: 164)
+        try visitor.visitSingularInt32Field(value: _storage._clearUtf8Validation_p, fieldNumber: 165)
       }
       if _storage._clearValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearValue_p, fieldNumber: 165)
+        try visitor.visitSingularInt32Field(value: _storage._clearValue_p, fieldNumber: 166)
       }
       if _storage._clearVerification_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearVerification_p, fieldNumber: 166)
+        try visitor.visitSingularInt32Field(value: _storage._clearVerification_p, fieldNumber: 167)
       }
       if _storage._clearWeak_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearWeak_p, fieldNumber: 167)
+        try visitor.visitSingularInt32Field(value: _storage._clearWeak_p, fieldNumber: 168)
       }
       if _storage._clientStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clientStreaming, fieldNumber: 168)
+        try visitor.visitSingularInt32Field(value: _storage._clientStreaming, fieldNumber: 169)
       }
       if _storage._code != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._code, fieldNumber: 169)
+        try visitor.visitSingularInt32Field(value: _storage._code, fieldNumber: 170)
       }
       if _storage._codePoint != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._codePoint, fieldNumber: 170)
+        try visitor.visitSingularInt32Field(value: _storage._codePoint, fieldNumber: 171)
       }
       if _storage._codeUnits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._codeUnits, fieldNumber: 171)
+        try visitor.visitSingularInt32Field(value: _storage._codeUnits, fieldNumber: 172)
       }
       if _storage._collection != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._collection, fieldNumber: 172)
+        try visitor.visitSingularInt32Field(value: _storage._collection, fieldNumber: 173)
       }
       if _storage._com != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._com, fieldNumber: 173)
+        try visitor.visitSingularInt32Field(value: _storage._com, fieldNumber: 174)
       }
       if _storage._comma != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._comma, fieldNumber: 174)
+        try visitor.visitSingularInt32Field(value: _storage._comma, fieldNumber: 175)
       }
       if _storage._consumedBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._consumedBytes, fieldNumber: 175)
+        try visitor.visitSingularInt32Field(value: _storage._consumedBytes, fieldNumber: 176)
       }
       if _storage._contains != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contains, fieldNumber: 176)
+        try visitor.visitSingularInt32Field(value: _storage._contains, fieldNumber: 177)
       }
       if _storage._contentsOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contentsOf, fieldNumber: 177)
+        try visitor.visitSingularInt32Field(value: _storage._contentsOf, fieldNumber: 178)
       }
       if _storage._contiguousBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contiguousBytes, fieldNumber: 178)
+        try visitor.visitSingularInt32Field(value: _storage._contiguousBytes, fieldNumber: 179)
       }
       if _storage._copy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._copy, fieldNumber: 179)
+        try visitor.visitSingularInt32Field(value: _storage._copy, fieldNumber: 180)
       }
       if _storage._count != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._count, fieldNumber: 180)
+        try visitor.visitSingularInt32Field(value: _storage._count, fieldNumber: 181)
       }
       if _storage._countVarintsInBuffer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._countVarintsInBuffer, fieldNumber: 181)
+        try visitor.visitSingularInt32Field(value: _storage._countVarintsInBuffer, fieldNumber: 182)
       }
       if _storage._csharpNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._csharpNamespace, fieldNumber: 182)
+        try visitor.visitSingularInt32Field(value: _storage._csharpNamespace, fieldNumber: 183)
       }
       if _storage._ctype != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ctype, fieldNumber: 183)
+        try visitor.visitSingularInt32Field(value: _storage._ctype, fieldNumber: 184)
       }
       if _storage._customCodable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customCodable, fieldNumber: 184)
+        try visitor.visitSingularInt32Field(value: _storage._customCodable, fieldNumber: 185)
       }
       if _storage._customDebugStringConvertible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customDebugStringConvertible, fieldNumber: 185)
+        try visitor.visitSingularInt32Field(value: _storage._customDebugStringConvertible, fieldNumber: 186)
       }
       if _storage._customStringConvertible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customStringConvertible, fieldNumber: 186)
+        try visitor.visitSingularInt32Field(value: _storage._customStringConvertible, fieldNumber: 187)
       }
       if _storage._d != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._d, fieldNumber: 187)
+        try visitor.visitSingularInt32Field(value: _storage._d, fieldNumber: 188)
       }
       if _storage._data != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._data, fieldNumber: 188)
+        try visitor.visitSingularInt32Field(value: _storage._data, fieldNumber: 189)
       }
       if _storage._dataResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dataResult, fieldNumber: 189)
+        try visitor.visitSingularInt32Field(value: _storage._dataResult, fieldNumber: 190)
       }
       if _storage._date != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._date, fieldNumber: 190)
+        try visitor.visitSingularInt32Field(value: _storage._date, fieldNumber: 191)
       }
       if _storage._daySec != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._daySec, fieldNumber: 191)
+        try visitor.visitSingularInt32Field(value: _storage._daySec, fieldNumber: 192)
       }
       if _storage._daysSinceEpoch != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._daysSinceEpoch, fieldNumber: 192)
+        try visitor.visitSingularInt32Field(value: _storage._daysSinceEpoch, fieldNumber: 193)
       }
       if _storage._debugDescription_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._debugDescription_p, fieldNumber: 193)
+        try visitor.visitSingularInt32Field(value: _storage._debugDescription_p, fieldNumber: 194)
       }
       if _storage._debugRedact != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._debugRedact, fieldNumber: 194)
+        try visitor.visitSingularInt32Field(value: _storage._debugRedact, fieldNumber: 195)
       }
       if _storage._declaration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._declaration, fieldNumber: 195)
+        try visitor.visitSingularInt32Field(value: _storage._declaration, fieldNumber: 196)
       }
       if _storage._decoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decoded, fieldNumber: 196)
+        try visitor.visitSingularInt32Field(value: _storage._decoded, fieldNumber: 197)
       }
       if _storage._decodedFromJsonnull != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodedFromJsonnull, fieldNumber: 197)
+        try visitor.visitSingularInt32Field(value: _storage._decodedFromJsonnull, fieldNumber: 198)
       }
       if _storage._decodeExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionField, fieldNumber: 198)
+        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionField, fieldNumber: 199)
       }
       if _storage._decodeExtensionFieldsAsMessageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionFieldsAsMessageSet, fieldNumber: 199)
+        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionFieldsAsMessageSet, fieldNumber: 200)
       }
       if _storage._decodeJson != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeJson, fieldNumber: 200)
+        try visitor.visitSingularInt32Field(value: _storage._decodeJson, fieldNumber: 201)
       }
       if _storage._decodeMapField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeMapField, fieldNumber: 201)
+        try visitor.visitSingularInt32Field(value: _storage._decodeMapField, fieldNumber: 202)
       }
       if _storage._decodeMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeMessage, fieldNumber: 202)
+        try visitor.visitSingularInt32Field(value: _storage._decodeMessage, fieldNumber: 203)
       }
       if _storage._decoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decoder, fieldNumber: 203)
+        try visitor.visitSingularInt32Field(value: _storage._decoder, fieldNumber: 204)
       }
       if _storage._decodeRepeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeated, fieldNumber: 204)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeated, fieldNumber: 205)
       }
       if _storage._decodeRepeatedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBoolField, fieldNumber: 205)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBoolField, fieldNumber: 206)
       }
       if _storage._decodeRepeatedBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBytesField, fieldNumber: 206)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBytesField, fieldNumber: 207)
       }
       if _storage._decodeRepeatedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedDoubleField, fieldNumber: 207)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedDoubleField, fieldNumber: 208)
       }
       if _storage._decodeRepeatedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedEnumField, fieldNumber: 208)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedEnumField, fieldNumber: 209)
       }
       if _storage._decodeRepeatedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed32Field, fieldNumber: 209)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed32Field, fieldNumber: 210)
       }
       if _storage._decodeRepeatedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed64Field, fieldNumber: 210)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed64Field, fieldNumber: 211)
       }
       if _storage._decodeRepeatedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFloatField, fieldNumber: 211)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFloatField, fieldNumber: 212)
       }
       if _storage._decodeRepeatedGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedGroupField, fieldNumber: 212)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedGroupField, fieldNumber: 213)
       }
       if _storage._decodeRepeatedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt32Field, fieldNumber: 213)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt32Field, fieldNumber: 214)
       }
       if _storage._decodeRepeatedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt64Field, fieldNumber: 214)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt64Field, fieldNumber: 215)
       }
       if _storage._decodeRepeatedMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedMessageField, fieldNumber: 215)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedMessageField, fieldNumber: 216)
       }
       if _storage._decodeRepeatedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed32Field, fieldNumber: 216)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed32Field, fieldNumber: 217)
       }
       if _storage._decodeRepeatedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed64Field, fieldNumber: 217)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed64Field, fieldNumber: 218)
       }
       if _storage._decodeRepeatedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint32Field, fieldNumber: 218)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint32Field, fieldNumber: 219)
       }
       if _storage._decodeRepeatedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint64Field, fieldNumber: 219)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint64Field, fieldNumber: 220)
       }
       if _storage._decodeRepeatedStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedStringField, fieldNumber: 220)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedStringField, fieldNumber: 221)
       }
       if _storage._decodeRepeatedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint32Field, fieldNumber: 221)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint32Field, fieldNumber: 222)
       }
       if _storage._decodeRepeatedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint64Field, fieldNumber: 222)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint64Field, fieldNumber: 223)
       }
       if _storage._decodeSingular != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingular, fieldNumber: 223)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingular, fieldNumber: 224)
       }
       if _storage._decodeSingularBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBoolField, fieldNumber: 224)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBoolField, fieldNumber: 225)
       }
       if _storage._decodeSingularBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBytesField, fieldNumber: 225)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBytesField, fieldNumber: 226)
       }
       if _storage._decodeSingularDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularDoubleField, fieldNumber: 226)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularDoubleField, fieldNumber: 227)
       }
       if _storage._decodeSingularEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularEnumField, fieldNumber: 227)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularEnumField, fieldNumber: 228)
       }
       if _storage._decodeSingularFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed32Field, fieldNumber: 228)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed32Field, fieldNumber: 229)
       }
       if _storage._decodeSingularFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed64Field, fieldNumber: 229)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed64Field, fieldNumber: 230)
       }
       if _storage._decodeSingularFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFloatField, fieldNumber: 230)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFloatField, fieldNumber: 231)
       }
       if _storage._decodeSingularGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularGroupField, fieldNumber: 231)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularGroupField, fieldNumber: 232)
       }
       if _storage._decodeSingularInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt32Field, fieldNumber: 232)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt32Field, fieldNumber: 233)
       }
       if _storage._decodeSingularInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt64Field, fieldNumber: 233)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt64Field, fieldNumber: 234)
       }
       if _storage._decodeSingularMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularMessageField, fieldNumber: 234)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularMessageField, fieldNumber: 235)
       }
       if _storage._decodeSingularSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed32Field, fieldNumber: 235)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed32Field, fieldNumber: 236)
       }
       if _storage._decodeSingularSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed64Field, fieldNumber: 236)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed64Field, fieldNumber: 237)
       }
       if _storage._decodeSingularSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint32Field, fieldNumber: 237)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint32Field, fieldNumber: 238)
       }
       if _storage._decodeSingularSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint64Field, fieldNumber: 238)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint64Field, fieldNumber: 239)
       }
       if _storage._decodeSingularStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularStringField, fieldNumber: 239)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularStringField, fieldNumber: 240)
       }
       if _storage._decodeSingularUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint32Field, fieldNumber: 240)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint32Field, fieldNumber: 241)
       }
       if _storage._decodeSingularUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint64Field, fieldNumber: 241)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint64Field, fieldNumber: 242)
       }
       if _storage._decodeTextFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeTextFormat, fieldNumber: 242)
+        try visitor.visitSingularInt32Field(value: _storage._decodeTextFormat, fieldNumber: 243)
       }
       if _storage._defaultAnyTypeUrlprefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaultAnyTypeUrlprefix, fieldNumber: 243)
+        try visitor.visitSingularInt32Field(value: _storage._defaultAnyTypeUrlprefix, fieldNumber: 244)
       }
       if _storage._defaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaults, fieldNumber: 244)
+        try visitor.visitSingularInt32Field(value: _storage._defaults, fieldNumber: 245)
       }
       if _storage._defaultValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaultValue, fieldNumber: 245)
+        try visitor.visitSingularInt32Field(value: _storage._defaultValue, fieldNumber: 246)
       }
       if _storage._dependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dependency, fieldNumber: 246)
+        try visitor.visitSingularInt32Field(value: _storage._dependency, fieldNumber: 247)
       }
       if _storage._deprecated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecated, fieldNumber: 247)
+        try visitor.visitSingularInt32Field(value: _storage._deprecated, fieldNumber: 248)
       }
       if _storage._deprecatedLegacyJsonFieldConflicts != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecatedLegacyJsonFieldConflicts, fieldNumber: 248)
+        try visitor.visitSingularInt32Field(value: _storage._deprecatedLegacyJsonFieldConflicts, fieldNumber: 249)
       }
       if _storage._deprecationWarning != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecationWarning, fieldNumber: 249)
+        try visitor.visitSingularInt32Field(value: _storage._deprecationWarning, fieldNumber: 250)
       }
       if _storage._description_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._description_p, fieldNumber: 250)
+        try visitor.visitSingularInt32Field(value: _storage._description_p, fieldNumber: 251)
       }
       if _storage._descriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._descriptorProto, fieldNumber: 251)
+        try visitor.visitSingularInt32Field(value: _storage._descriptorProto, fieldNumber: 252)
       }
       if _storage._dictionary != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dictionary, fieldNumber: 252)
+        try visitor.visitSingularInt32Field(value: _storage._dictionary, fieldNumber: 253)
       }
       if _storage._dictionaryLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dictionaryLiteral, fieldNumber: 253)
+        try visitor.visitSingularInt32Field(value: _storage._dictionaryLiteral, fieldNumber: 254)
       }
       if _storage._digit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit, fieldNumber: 254)
+        try visitor.visitSingularInt32Field(value: _storage._digit, fieldNumber: 255)
       }
       if _storage._digit0 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit0, fieldNumber: 255)
+        try visitor.visitSingularInt32Field(value: _storage._digit0, fieldNumber: 256)
       }
       if _storage._digit1 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit1, fieldNumber: 256)
+        try visitor.visitSingularInt32Field(value: _storage._digit1, fieldNumber: 257)
       }
       if _storage._digitCount != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digitCount, fieldNumber: 257)
+        try visitor.visitSingularInt32Field(value: _storage._digitCount, fieldNumber: 258)
       }
       if _storage._digits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digits, fieldNumber: 258)
+        try visitor.visitSingularInt32Field(value: _storage._digits, fieldNumber: 259)
       }
       if _storage._digitValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digitValue, fieldNumber: 259)
+        try visitor.visitSingularInt32Field(value: _storage._digitValue, fieldNumber: 260)
       }
       if _storage._discardableResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._discardableResult, fieldNumber: 260)
+        try visitor.visitSingularInt32Field(value: _storage._discardableResult, fieldNumber: 261)
       }
       if _storage._discardUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._discardUnknownFields, fieldNumber: 261)
+        try visitor.visitSingularInt32Field(value: _storage._discardUnknownFields, fieldNumber: 262)
       }
       if _storage._double != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._double, fieldNumber: 262)
+        try visitor.visitSingularInt32Field(value: _storage._double, fieldNumber: 263)
       }
       if _storage._doubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._doubleValue, fieldNumber: 263)
+        try visitor.visitSingularInt32Field(value: _storage._doubleValue, fieldNumber: 264)
       }
       if _storage._duration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._duration, fieldNumber: 264)
+        try visitor.visitSingularInt32Field(value: _storage._duration, fieldNumber: 265)
       }
       if _storage._e != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._e, fieldNumber: 265)
+        try visitor.visitSingularInt32Field(value: _storage._e, fieldNumber: 266)
       }
       if _storage._edition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._edition, fieldNumber: 266)
+        try visitor.visitSingularInt32Field(value: _storage._edition, fieldNumber: 267)
       }
       if _storage._editionDefault != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDefault, fieldNumber: 267)
+        try visitor.visitSingularInt32Field(value: _storage._editionDefault, fieldNumber: 268)
       }
       if _storage._editionDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDefaults, fieldNumber: 268)
+        try visitor.visitSingularInt32Field(value: _storage._editionDefaults, fieldNumber: 269)
       }
       if _storage._editionDeprecated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDeprecated, fieldNumber: 269)
+        try visitor.visitSingularInt32Field(value: _storage._editionDeprecated, fieldNumber: 270)
       }
       if _storage._editionIntroduced != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionIntroduced, fieldNumber: 270)
+        try visitor.visitSingularInt32Field(value: _storage._editionIntroduced, fieldNumber: 271)
       }
       if _storage._editionRemoved != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionRemoved, fieldNumber: 271)
+        try visitor.visitSingularInt32Field(value: _storage._editionRemoved, fieldNumber: 272)
       }
       if _storage._element != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._element, fieldNumber: 272)
+        try visitor.visitSingularInt32Field(value: _storage._element, fieldNumber: 273)
       }
       if _storage._elements != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._elements, fieldNumber: 273)
+        try visitor.visitSingularInt32Field(value: _storage._elements, fieldNumber: 274)
       }
       if _storage._else != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._else, fieldNumber: 274)
+        try visitor.visitSingularInt32Field(value: _storage._else, fieldNumber: 275)
       }
       if _storage._emitExtensionFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitExtensionFieldName, fieldNumber: 275)
+        try visitor.visitSingularInt32Field(value: _storage._emitExtensionFieldName, fieldNumber: 276)
       }
       if _storage._emitFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitFieldName, fieldNumber: 276)
+        try visitor.visitSingularInt32Field(value: _storage._emitFieldName, fieldNumber: 277)
       }
       if _storage._emitFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitFieldNumber, fieldNumber: 277)
+        try visitor.visitSingularInt32Field(value: _storage._emitFieldNumber, fieldNumber: 278)
       }
       if _storage._empty != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._empty, fieldNumber: 278)
+        try visitor.visitSingularInt32Field(value: _storage._empty, fieldNumber: 279)
+      }
+      if _storage._emptyAnyTypeURL != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._emptyAnyTypeURL, fieldNumber: 280)
       }
       if _storage._emptyData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emptyData, fieldNumber: 279)
+        try visitor.visitSingularInt32Field(value: _storage._emptyData, fieldNumber: 281)
       }
       if _storage._encodeAsBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodeAsBytes, fieldNumber: 280)
+        try visitor.visitSingularInt32Field(value: _storage._encodeAsBytes, fieldNumber: 282)
       }
       if _storage._encoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encoded, fieldNumber: 281)
+        try visitor.visitSingularInt32Field(value: _storage._encoded, fieldNumber: 283)
       }
       if _storage._encodedJsonstring != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodedJsonstring, fieldNumber: 282)
+        try visitor.visitSingularInt32Field(value: _storage._encodedJsonstring, fieldNumber: 284)
       }
       if _storage._encodedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodedSize, fieldNumber: 283)
+        try visitor.visitSingularInt32Field(value: _storage._encodedSize, fieldNumber: 285)
       }
       if _storage._encodeField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodeField, fieldNumber: 284)
+        try visitor.visitSingularInt32Field(value: _storage._encodeField, fieldNumber: 286)
       }
       if _storage._encoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encoder, fieldNumber: 285)
+        try visitor.visitSingularInt32Field(value: _storage._encoder, fieldNumber: 287)
       }
       if _storage._end != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._end, fieldNumber: 286)
+        try visitor.visitSingularInt32Field(value: _storage._end, fieldNumber: 288)
       }
       if _storage._endArray != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endArray, fieldNumber: 287)
+        try visitor.visitSingularInt32Field(value: _storage._endArray, fieldNumber: 289)
       }
       if _storage._endMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endMessageField, fieldNumber: 288)
+        try visitor.visitSingularInt32Field(value: _storage._endMessageField, fieldNumber: 290)
       }
       if _storage._endObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endObject, fieldNumber: 289)
+        try visitor.visitSingularInt32Field(value: _storage._endObject, fieldNumber: 291)
       }
       if _storage._endRegularField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endRegularField, fieldNumber: 290)
+        try visitor.visitSingularInt32Field(value: _storage._endRegularField, fieldNumber: 292)
+      }
+      if _storage._enforceNamingStyle != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._enforceNamingStyle, fieldNumber: 293)
       }
       if _storage._enum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enum, fieldNumber: 291)
+        try visitor.visitSingularInt32Field(value: _storage._enum, fieldNumber: 294)
       }
       if _storage._enumDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumDescriptorProto, fieldNumber: 292)
+        try visitor.visitSingularInt32Field(value: _storage._enumDescriptorProto, fieldNumber: 295)
       }
       if _storage._enumOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumOptions, fieldNumber: 293)
+        try visitor.visitSingularInt32Field(value: _storage._enumOptions, fieldNumber: 296)
       }
       if _storage._enumReservedRange != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumReservedRange, fieldNumber: 294)
+        try visitor.visitSingularInt32Field(value: _storage._enumReservedRange, fieldNumber: 297)
       }
       if _storage._enumType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumType, fieldNumber: 295)
+        try visitor.visitSingularInt32Field(value: _storage._enumType, fieldNumber: 298)
       }
       if _storage._enumvalue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumvalue, fieldNumber: 296)
+        try visitor.visitSingularInt32Field(value: _storage._enumvalue, fieldNumber: 299)
       }
       if _storage._enumValueDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumValueDescriptorProto, fieldNumber: 297)
+        try visitor.visitSingularInt32Field(value: _storage._enumValueDescriptorProto, fieldNumber: 300)
       }
       if _storage._enumValueOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumValueOptions, fieldNumber: 298)
+        try visitor.visitSingularInt32Field(value: _storage._enumValueOptions, fieldNumber: 301)
       }
       if _storage._equatable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._equatable, fieldNumber: 299)
+        try visitor.visitSingularInt32Field(value: _storage._equatable, fieldNumber: 302)
       }
       if _storage._error != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._error, fieldNumber: 300)
+        try visitor.visitSingularInt32Field(value: _storage._error, fieldNumber: 303)
       }
       if _storage._expressibleByArrayLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._expressibleByArrayLiteral, fieldNumber: 301)
+        try visitor.visitSingularInt32Field(value: _storage._expressibleByArrayLiteral, fieldNumber: 304)
       }
       if _storage._expressibleByDictionaryLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._expressibleByDictionaryLiteral, fieldNumber: 302)
+        try visitor.visitSingularInt32Field(value: _storage._expressibleByDictionaryLiteral, fieldNumber: 305)
       }
       if _storage._ext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ext, fieldNumber: 303)
+        try visitor.visitSingularInt32Field(value: _storage._ext, fieldNumber: 306)
       }
       if _storage._extDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extDecoder, fieldNumber: 304)
+        try visitor.visitSingularInt32Field(value: _storage._extDecoder, fieldNumber: 307)
       }
       if _storage._extendedGraphemeClusterLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteral, fieldNumber: 305)
+        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteral, fieldNumber: 308)
       }
       if _storage._extendedGraphemeClusterLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteralType, fieldNumber: 306)
+        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteralType, fieldNumber: 309)
       }
       if _storage._extendee != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendee, fieldNumber: 307)
+        try visitor.visitSingularInt32Field(value: _storage._extendee, fieldNumber: 310)
       }
       if _storage._extensibleMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensibleMessage, fieldNumber: 308)
+        try visitor.visitSingularInt32Field(value: _storage._extensibleMessage, fieldNumber: 311)
       }
       if _storage._extension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extension, fieldNumber: 309)
+        try visitor.visitSingularInt32Field(value: _storage._extension, fieldNumber: 312)
       }
       if _storage._extensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionField, fieldNumber: 310)
+        try visitor.visitSingularInt32Field(value: _storage._extensionField, fieldNumber: 313)
       }
       if _storage._extensionFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionFieldNumber, fieldNumber: 311)
+        try visitor.visitSingularInt32Field(value: _storage._extensionFieldNumber, fieldNumber: 314)
       }
       if _storage._extensionFieldValueSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionFieldValueSet, fieldNumber: 312)
+        try visitor.visitSingularInt32Field(value: _storage._extensionFieldValueSet, fieldNumber: 315)
       }
       if _storage._extensionMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionMap, fieldNumber: 313)
+        try visitor.visitSingularInt32Field(value: _storage._extensionMap, fieldNumber: 316)
       }
       if _storage._extensionRange != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionRange, fieldNumber: 314)
+        try visitor.visitSingularInt32Field(value: _storage._extensionRange, fieldNumber: 317)
       }
       if _storage._extensionRangeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionRangeOptions, fieldNumber: 315)
+        try visitor.visitSingularInt32Field(value: _storage._extensionRangeOptions, fieldNumber: 318)
       }
       if _storage._extensions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensions, fieldNumber: 316)
+        try visitor.visitSingularInt32Field(value: _storage._extensions, fieldNumber: 319)
       }
       if _storage._extras != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extras, fieldNumber: 317)
+        try visitor.visitSingularInt32Field(value: _storage._extras, fieldNumber: 320)
       }
       if _storage._f != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._f, fieldNumber: 318)
+        try visitor.visitSingularInt32Field(value: _storage._f, fieldNumber: 321)
       }
       if _storage._false != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._false, fieldNumber: 319)
+        try visitor.visitSingularInt32Field(value: _storage._false, fieldNumber: 322)
       }
       if _storage._features != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._features, fieldNumber: 320)
+        try visitor.visitSingularInt32Field(value: _storage._features, fieldNumber: 323)
       }
       if _storage._featureSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSet, fieldNumber: 321)
+        try visitor.visitSingularInt32Field(value: _storage._featureSet, fieldNumber: 324)
       }
       if _storage._featureSetDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSetDefaults, fieldNumber: 322)
+        try visitor.visitSingularInt32Field(value: _storage._featureSetDefaults, fieldNumber: 325)
       }
       if _storage._featureSetEditionDefault != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSetEditionDefault, fieldNumber: 323)
+        try visitor.visitSingularInt32Field(value: _storage._featureSetEditionDefault, fieldNumber: 326)
       }
       if _storage._featureSupport != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSupport, fieldNumber: 324)
+        try visitor.visitSingularInt32Field(value: _storage._featureSupport, fieldNumber: 327)
       }
       if _storage._field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._field, fieldNumber: 325)
+        try visitor.visitSingularInt32Field(value: _storage._field, fieldNumber: 328)
       }
       if _storage._fieldData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldData, fieldNumber: 326)
+        try visitor.visitSingularInt32Field(value: _storage._fieldData, fieldNumber: 329)
       }
       if _storage._fieldDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldDescriptorProto, fieldNumber: 327)
+        try visitor.visitSingularInt32Field(value: _storage._fieldDescriptorProto, fieldNumber: 330)
       }
       if _storage._fieldMask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldMask, fieldNumber: 328)
+        try visitor.visitSingularInt32Field(value: _storage._fieldMask, fieldNumber: 331)
       }
       if _storage._fieldMaskError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldMaskError, fieldNumber: 329)
+        try visitor.visitSingularInt32Field(value: _storage._fieldMaskError, fieldNumber: 332)
       }
       if _storage._fieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldName, fieldNumber: 330)
+        try visitor.visitSingularInt32Field(value: _storage._fieldName, fieldNumber: 333)
       }
       if _storage._fieldNameCount != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNameCount, fieldNumber: 331)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNameCount, fieldNumber: 334)
       }
       if _storage._fieldNum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNum, fieldNumber: 332)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNum, fieldNumber: 335)
       }
       if _storage._fieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNumber, fieldNumber: 333)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNumber, fieldNumber: 336)
       }
       if _storage._fieldNumberForProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNumberForProto, fieldNumber: 334)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNumberForProto, fieldNumber: 337)
       }
       if _storage._fieldOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldOptions, fieldNumber: 335)
+        try visitor.visitSingularInt32Field(value: _storage._fieldOptions, fieldNumber: 338)
       }
       if _storage._fieldPresence != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldPresence, fieldNumber: 336)
+        try visitor.visitSingularInt32Field(value: _storage._fieldPresence, fieldNumber: 339)
       }
       if _storage._fields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fields, fieldNumber: 337)
+        try visitor.visitSingularInt32Field(value: _storage._fields, fieldNumber: 340)
       }
       if _storage._fieldSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldSize, fieldNumber: 338)
+        try visitor.visitSingularInt32Field(value: _storage._fieldSize, fieldNumber: 341)
       }
       if _storage._fieldTag != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldTag, fieldNumber: 339)
+        try visitor.visitSingularInt32Field(value: _storage._fieldTag, fieldNumber: 342)
       }
       if _storage._fieldType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldType, fieldNumber: 340)
+        try visitor.visitSingularInt32Field(value: _storage._fieldType, fieldNumber: 343)
       }
       if _storage._file != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._file, fieldNumber: 341)
+        try visitor.visitSingularInt32Field(value: _storage._file, fieldNumber: 344)
       }
       if _storage._fileDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorProto, fieldNumber: 342)
+        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorProto, fieldNumber: 345)
       }
       if _storage._fileDescriptorSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorSet, fieldNumber: 343)
+        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorSet, fieldNumber: 346)
       }
       if _storage._fileName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileName, fieldNumber: 344)
+        try visitor.visitSingularInt32Field(value: _storage._fileName, fieldNumber: 347)
       }
       if _storage._fileOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileOptions, fieldNumber: 345)
+        try visitor.visitSingularInt32Field(value: _storage._fileOptions, fieldNumber: 348)
       }
       if _storage._filter != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._filter, fieldNumber: 346)
+        try visitor.visitSingularInt32Field(value: _storage._filter, fieldNumber: 349)
       }
       if _storage._final != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._final, fieldNumber: 347)
+        try visitor.visitSingularInt32Field(value: _storage._final, fieldNumber: 350)
       }
       if _storage._finiteOnly != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._finiteOnly, fieldNumber: 348)
+        try visitor.visitSingularInt32Field(value: _storage._finiteOnly, fieldNumber: 351)
       }
       if _storage._first != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._first, fieldNumber: 349)
+        try visitor.visitSingularInt32Field(value: _storage._first, fieldNumber: 352)
       }
       if _storage._firstItem != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._firstItem, fieldNumber: 350)
+        try visitor.visitSingularInt32Field(value: _storage._firstItem, fieldNumber: 353)
       }
       if _storage._fixedFeatures != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fixedFeatures, fieldNumber: 351)
+        try visitor.visitSingularInt32Field(value: _storage._fixedFeatures, fieldNumber: 354)
       }
       if _storage._float != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._float, fieldNumber: 352)
+        try visitor.visitSingularInt32Field(value: _storage._float, fieldNumber: 355)
       }
       if _storage._floatLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatLiteral, fieldNumber: 353)
+        try visitor.visitSingularInt32Field(value: _storage._floatLiteral, fieldNumber: 356)
       }
       if _storage._floatLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatLiteralType, fieldNumber: 354)
+        try visitor.visitSingularInt32Field(value: _storage._floatLiteralType, fieldNumber: 357)
       }
       if _storage._floatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatValue, fieldNumber: 355)
+        try visitor.visitSingularInt32Field(value: _storage._floatValue, fieldNumber: 358)
       }
       if _storage._for != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._for, fieldNumber: 356)
+        try visitor.visitSingularInt32Field(value: _storage._for, fieldNumber: 359)
       }
       if _storage._forMessageName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forMessageName, fieldNumber: 357)
+        try visitor.visitSingularInt32Field(value: _storage._forMessageName, fieldNumber: 360)
       }
       if _storage._formUnion != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._formUnion, fieldNumber: 358)
+        try visitor.visitSingularInt32Field(value: _storage._formUnion, fieldNumber: 361)
       }
       if _storage._forReadingFrom != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forReadingFrom, fieldNumber: 359)
+        try visitor.visitSingularInt32Field(value: _storage._forReadingFrom, fieldNumber: 362)
       }
       if _storage._forTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forTypeURL, fieldNumber: 360)
+        try visitor.visitSingularInt32Field(value: _storage._forTypeURL, fieldNumber: 363)
       }
       if _storage._forwardParser != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forwardParser, fieldNumber: 361)
+        try visitor.visitSingularInt32Field(value: _storage._forwardParser, fieldNumber: 364)
       }
       if _storage._forWritingInto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forWritingInto, fieldNumber: 362)
+        try visitor.visitSingularInt32Field(value: _storage._forWritingInto, fieldNumber: 365)
       }
       if _storage._from != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._from, fieldNumber: 363)
+        try visitor.visitSingularInt32Field(value: _storage._from, fieldNumber: 366)
       }
       if _storage._fromAscii2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromAscii2, fieldNumber: 364)
+        try visitor.visitSingularInt32Field(value: _storage._fromAscii2, fieldNumber: 367)
       }
       if _storage._fromAscii4 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromAscii4, fieldNumber: 365)
+        try visitor.visitSingularInt32Field(value: _storage._fromAscii4, fieldNumber: 368)
       }
       if _storage._fromByteOffset != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromByteOffset, fieldNumber: 366)
+        try visitor.visitSingularInt32Field(value: _storage._fromByteOffset, fieldNumber: 369)
       }
       if _storage._fromHexDigit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromHexDigit, fieldNumber: 367)
+        try visitor.visitSingularInt32Field(value: _storage._fromHexDigit, fieldNumber: 370)
       }
       if _storage._fullName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fullName, fieldNumber: 368)
+        try visitor.visitSingularInt32Field(value: _storage._fullName, fieldNumber: 371)
       }
       if _storage._func != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._func, fieldNumber: 369)
+        try visitor.visitSingularInt32Field(value: _storage._func, fieldNumber: 372)
       }
       if _storage._function != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._function, fieldNumber: 370)
+        try visitor.visitSingularInt32Field(value: _storage._function, fieldNumber: 373)
       }
       if _storage._g != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._g, fieldNumber: 371)
+        try visitor.visitSingularInt32Field(value: _storage._g, fieldNumber: 374)
       }
       if _storage._generatedCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._generatedCodeInfo, fieldNumber: 372)
+        try visitor.visitSingularInt32Field(value: _storage._generatedCodeInfo, fieldNumber: 375)
       }
       if _storage._get != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._get, fieldNumber: 373)
+        try visitor.visitSingularInt32Field(value: _storage._get, fieldNumber: 376)
       }
       if _storage._getExtensionValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._getExtensionValue, fieldNumber: 374)
+        try visitor.visitSingularInt32Field(value: _storage._getExtensionValue, fieldNumber: 377)
       }
       if _storage._googleapis != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleapis, fieldNumber: 375)
+        try visitor.visitSingularInt32Field(value: _storage._googleapis, fieldNumber: 378)
       }
       if _storage._googleProtobufAny != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufAny, fieldNumber: 376)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufAny, fieldNumber: 379)
       }
       if _storage._googleProtobufApi != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufApi, fieldNumber: 377)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufApi, fieldNumber: 380)
       }
       if _storage._googleProtobufBoolValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBoolValue, fieldNumber: 378)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBoolValue, fieldNumber: 381)
       }
       if _storage._googleProtobufBytesValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBytesValue, fieldNumber: 379)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBytesValue, fieldNumber: 382)
       }
       if _storage._googleProtobufDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDescriptorProto, fieldNumber: 380)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDescriptorProto, fieldNumber: 383)
       }
       if _storage._googleProtobufDoubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDoubleValue, fieldNumber: 381)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDoubleValue, fieldNumber: 384)
       }
       if _storage._googleProtobufDuration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDuration, fieldNumber: 382)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDuration, fieldNumber: 385)
       }
       if _storage._googleProtobufEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEdition, fieldNumber: 383)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEdition, fieldNumber: 386)
       }
       if _storage._googleProtobufEmpty != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEmpty, fieldNumber: 384)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEmpty, fieldNumber: 387)
       }
       if _storage._googleProtobufEnum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnum, fieldNumber: 385)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnum, fieldNumber: 388)
       }
       if _storage._googleProtobufEnumDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumDescriptorProto, fieldNumber: 386)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumDescriptorProto, fieldNumber: 389)
       }
       if _storage._googleProtobufEnumOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumOptions, fieldNumber: 387)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumOptions, fieldNumber: 390)
       }
       if _storage._googleProtobufEnumValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValue, fieldNumber: 388)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValue, fieldNumber: 391)
       }
       if _storage._googleProtobufEnumValueDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueDescriptorProto, fieldNumber: 389)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueDescriptorProto, fieldNumber: 392)
       }
       if _storage._googleProtobufEnumValueOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueOptions, fieldNumber: 390)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueOptions, fieldNumber: 393)
       }
       if _storage._googleProtobufExtensionRangeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufExtensionRangeOptions, fieldNumber: 391)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufExtensionRangeOptions, fieldNumber: 394)
       }
       if _storage._googleProtobufFeatureSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSet, fieldNumber: 392)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSet, fieldNumber: 395)
       }
       if _storage._googleProtobufFeatureSetDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSetDefaults, fieldNumber: 393)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSetDefaults, fieldNumber: 396)
       }
       if _storage._googleProtobufField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufField, fieldNumber: 394)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufField, fieldNumber: 397)
       }
       if _storage._googleProtobufFieldDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldDescriptorProto, fieldNumber: 395)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldDescriptorProto, fieldNumber: 398)
       }
       if _storage._googleProtobufFieldMask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldMask, fieldNumber: 396)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldMask, fieldNumber: 399)
       }
       if _storage._googleProtobufFieldOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldOptions, fieldNumber: 397)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldOptions, fieldNumber: 400)
       }
       if _storage._googleProtobufFileDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorProto, fieldNumber: 398)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorProto, fieldNumber: 401)
       }
       if _storage._googleProtobufFileDescriptorSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorSet, fieldNumber: 399)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorSet, fieldNumber: 402)
       }
       if _storage._googleProtobufFileOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileOptions, fieldNumber: 400)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileOptions, fieldNumber: 403)
       }
       if _storage._googleProtobufFloatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFloatValue, fieldNumber: 401)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFloatValue, fieldNumber: 404)
       }
       if _storage._googleProtobufGeneratedCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufGeneratedCodeInfo, fieldNumber: 402)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufGeneratedCodeInfo, fieldNumber: 405)
       }
       if _storage._googleProtobufInt32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt32Value, fieldNumber: 403)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt32Value, fieldNumber: 406)
       }
       if _storage._googleProtobufInt64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt64Value, fieldNumber: 404)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt64Value, fieldNumber: 407)
       }
       if _storage._googleProtobufListValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufListValue, fieldNumber: 405)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufListValue, fieldNumber: 408)
       }
       if _storage._googleProtobufMessageOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMessageOptions, fieldNumber: 406)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMessageOptions, fieldNumber: 409)
       }
       if _storage._googleProtobufMethod != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethod, fieldNumber: 407)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethod, fieldNumber: 410)
       }
       if _storage._googleProtobufMethodDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodDescriptorProto, fieldNumber: 408)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodDescriptorProto, fieldNumber: 411)
       }
       if _storage._googleProtobufMethodOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodOptions, fieldNumber: 409)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodOptions, fieldNumber: 412)
       }
       if _storage._googleProtobufMixin != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMixin, fieldNumber: 410)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMixin, fieldNumber: 413)
       }
       if _storage._googleProtobufNullValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufNullValue, fieldNumber: 411)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufNullValue, fieldNumber: 414)
       }
       if _storage._googleProtobufOneofDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofDescriptorProto, fieldNumber: 412)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofDescriptorProto, fieldNumber: 415)
       }
       if _storage._googleProtobufOneofOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofOptions, fieldNumber: 413)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofOptions, fieldNumber: 416)
       }
       if _storage._googleProtobufOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOption, fieldNumber: 414)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOption, fieldNumber: 417)
       }
       if _storage._googleProtobufServiceDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceDescriptorProto, fieldNumber: 415)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceDescriptorProto, fieldNumber: 418)
       }
       if _storage._googleProtobufServiceOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceOptions, fieldNumber: 416)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceOptions, fieldNumber: 419)
       }
       if _storage._googleProtobufSourceCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceCodeInfo, fieldNumber: 417)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceCodeInfo, fieldNumber: 420)
       }
       if _storage._googleProtobufSourceContext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceContext, fieldNumber: 418)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceContext, fieldNumber: 421)
       }
       if _storage._googleProtobufStringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStringValue, fieldNumber: 419)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStringValue, fieldNumber: 422)
       }
       if _storage._googleProtobufStruct != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStruct, fieldNumber: 420)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStruct, fieldNumber: 423)
       }
       if _storage._googleProtobufSyntax != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSyntax, fieldNumber: 421)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSyntax, fieldNumber: 424)
       }
       if _storage._googleProtobufTimestamp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufTimestamp, fieldNumber: 422)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufTimestamp, fieldNumber: 425)
       }
       if _storage._googleProtobufType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufType, fieldNumber: 423)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufType, fieldNumber: 426)
       }
       if _storage._googleProtobufUint32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint32Value, fieldNumber: 424)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint32Value, fieldNumber: 427)
       }
       if _storage._googleProtobufUint64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint64Value, fieldNumber: 425)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint64Value, fieldNumber: 428)
       }
       if _storage._googleProtobufUninterpretedOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUninterpretedOption, fieldNumber: 426)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUninterpretedOption, fieldNumber: 429)
       }
       if _storage._googleProtobufValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufValue, fieldNumber: 427)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufValue, fieldNumber: 430)
       }
       if _storage._goPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._goPackage, fieldNumber: 428)
+        try visitor.visitSingularInt32Field(value: _storage._goPackage, fieldNumber: 431)
       }
       if _storage._group != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._group, fieldNumber: 429)
+        try visitor.visitSingularInt32Field(value: _storage._group, fieldNumber: 432)
       }
       if _storage._groupFieldNumberStack != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._groupFieldNumberStack, fieldNumber: 430)
+        try visitor.visitSingularInt32Field(value: _storage._groupFieldNumberStack, fieldNumber: 433)
       }
       if _storage._groupSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._groupSize, fieldNumber: 431)
+        try visitor.visitSingularInt32Field(value: _storage._groupSize, fieldNumber: 434)
       }
       if _storage._guard != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._guard, fieldNumber: 432)
+        try visitor.visitSingularInt32Field(value: _storage._guard, fieldNumber: 435)
       }
       if _storage._hadOneofValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hadOneofValue, fieldNumber: 433)
+        try visitor.visitSingularInt32Field(value: _storage._hadOneofValue, fieldNumber: 436)
       }
       if _storage._handleConflictingOneOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._handleConflictingOneOf, fieldNumber: 434)
+        try visitor.visitSingularInt32Field(value: _storage._handleConflictingOneOf, fieldNumber: 437)
       }
       if _storage._hasAggregateValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasAggregateValue_p, fieldNumber: 435)
+        try visitor.visitSingularInt32Field(value: _storage._hasAggregateValue_p, fieldNumber: 438)
       }
       if _storage._hasAllowAlias_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasAllowAlias_p, fieldNumber: 436)
+        try visitor.visitSingularInt32Field(value: _storage._hasAllowAlias_p, fieldNumber: 439)
       }
       if _storage._hasBegin_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasBegin_p, fieldNumber: 437)
+        try visitor.visitSingularInt32Field(value: _storage._hasBegin_p, fieldNumber: 440)
       }
       if _storage._hasCcEnableArenas_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCcEnableArenas_p, fieldNumber: 438)
+        try visitor.visitSingularInt32Field(value: _storage._hasCcEnableArenas_p, fieldNumber: 441)
       }
       if _storage._hasCcGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCcGenericServices_p, fieldNumber: 439)
+        try visitor.visitSingularInt32Field(value: _storage._hasCcGenericServices_p, fieldNumber: 442)
       }
       if _storage._hasClientStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasClientStreaming_p, fieldNumber: 440)
+        try visitor.visitSingularInt32Field(value: _storage._hasClientStreaming_p, fieldNumber: 443)
       }
       if _storage._hasCsharpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCsharpNamespace_p, fieldNumber: 441)
+        try visitor.visitSingularInt32Field(value: _storage._hasCsharpNamespace_p, fieldNumber: 444)
       }
       if _storage._hasCtype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCtype_p, fieldNumber: 442)
+        try visitor.visitSingularInt32Field(value: _storage._hasCtype_p, fieldNumber: 445)
       }
       if _storage._hasDebugRedact_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDebugRedact_p, fieldNumber: 443)
+        try visitor.visitSingularInt32Field(value: _storage._hasDebugRedact_p, fieldNumber: 446)
       }
       if _storage._hasDefaultValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDefaultValue_p, fieldNumber: 444)
+        try visitor.visitSingularInt32Field(value: _storage._hasDefaultValue_p, fieldNumber: 447)
       }
       if _storage._hasDeprecated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecated_p, fieldNumber: 445)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecated_p, fieldNumber: 448)
       }
       if _storage._hasDeprecatedLegacyJsonFieldConflicts_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecatedLegacyJsonFieldConflicts_p, fieldNumber: 446)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecatedLegacyJsonFieldConflicts_p, fieldNumber: 449)
       }
       if _storage._hasDeprecationWarning_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecationWarning_p, fieldNumber: 447)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecationWarning_p, fieldNumber: 450)
       }
       if _storage._hasDoubleValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDoubleValue_p, fieldNumber: 448)
+        try visitor.visitSingularInt32Field(value: _storage._hasDoubleValue_p, fieldNumber: 451)
       }
       if _storage._hasEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEdition_p, fieldNumber: 449)
+        try visitor.visitSingularInt32Field(value: _storage._hasEdition_p, fieldNumber: 452)
       }
       if _storage._hasEditionDeprecated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionDeprecated_p, fieldNumber: 450)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionDeprecated_p, fieldNumber: 453)
       }
       if _storage._hasEditionIntroduced_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionIntroduced_p, fieldNumber: 451)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionIntroduced_p, fieldNumber: 454)
       }
       if _storage._hasEditionRemoved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionRemoved_p, fieldNumber: 452)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionRemoved_p, fieldNumber: 455)
       }
       if _storage._hasEnd_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEnd_p, fieldNumber: 453)
+        try visitor.visitSingularInt32Field(value: _storage._hasEnd_p, fieldNumber: 456)
+      }
+      if _storage._hasEnforceNamingStyle_p != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._hasEnforceNamingStyle_p, fieldNumber: 457)
       }
       if _storage._hasEnumType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEnumType_p, fieldNumber: 454)
+        try visitor.visitSingularInt32Field(value: _storage._hasEnumType_p, fieldNumber: 458)
       }
       if _storage._hasExtendee_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasExtendee_p, fieldNumber: 455)
+        try visitor.visitSingularInt32Field(value: _storage._hasExtendee_p, fieldNumber: 459)
       }
       if _storage._hasExtensionValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasExtensionValue_p, fieldNumber: 456)
+        try visitor.visitSingularInt32Field(value: _storage._hasExtensionValue_p, fieldNumber: 460)
       }
       if _storage._hasFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFeatures_p, fieldNumber: 457)
+        try visitor.visitSingularInt32Field(value: _storage._hasFeatures_p, fieldNumber: 461)
       }
       if _storage._hasFeatureSupport_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFeatureSupport_p, fieldNumber: 458)
+        try visitor.visitSingularInt32Field(value: _storage._hasFeatureSupport_p, fieldNumber: 462)
       }
       if _storage._hasFieldPresence_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFieldPresence_p, fieldNumber: 459)
+        try visitor.visitSingularInt32Field(value: _storage._hasFieldPresence_p, fieldNumber: 463)
       }
       if _storage._hasFixedFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFixedFeatures_p, fieldNumber: 460)
+        try visitor.visitSingularInt32Field(value: _storage._hasFixedFeatures_p, fieldNumber: 464)
       }
       if _storage._hasFullName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFullName_p, fieldNumber: 461)
+        try visitor.visitSingularInt32Field(value: _storage._hasFullName_p, fieldNumber: 465)
       }
       if _storage._hasGoPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasGoPackage_p, fieldNumber: 462)
+        try visitor.visitSingularInt32Field(value: _storage._hasGoPackage_p, fieldNumber: 466)
       }
       if _storage._hash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hash, fieldNumber: 463)
+        try visitor.visitSingularInt32Field(value: _storage._hash, fieldNumber: 467)
       }
       if _storage._hashable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hashable, fieldNumber: 464)
+        try visitor.visitSingularInt32Field(value: _storage._hashable, fieldNumber: 468)
       }
       if _storage._hasher != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasher, fieldNumber: 465)
+        try visitor.visitSingularInt32Field(value: _storage._hasher, fieldNumber: 469)
       }
       if _storage._hashVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hashVisitor, fieldNumber: 466)
+        try visitor.visitSingularInt32Field(value: _storage._hashVisitor, fieldNumber: 470)
       }
       if _storage._hasIdempotencyLevel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIdempotencyLevel_p, fieldNumber: 467)
+        try visitor.visitSingularInt32Field(value: _storage._hasIdempotencyLevel_p, fieldNumber: 471)
       }
       if _storage._hasIdentifierValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIdentifierValue_p, fieldNumber: 468)
+        try visitor.visitSingularInt32Field(value: _storage._hasIdentifierValue_p, fieldNumber: 472)
       }
       if _storage._hasInputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasInputType_p, fieldNumber: 469)
+        try visitor.visitSingularInt32Field(value: _storage._hasInputType_p, fieldNumber: 473)
       }
       if _storage._hasIsExtension_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIsExtension_p, fieldNumber: 470)
+        try visitor.visitSingularInt32Field(value: _storage._hasIsExtension_p, fieldNumber: 474)
       }
       if _storage._hasJavaGenerateEqualsAndHash_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenerateEqualsAndHash_p, fieldNumber: 471)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenerateEqualsAndHash_p, fieldNumber: 475)
       }
       if _storage._hasJavaGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenericServices_p, fieldNumber: 472)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenericServices_p, fieldNumber: 476)
       }
       if _storage._hasJavaMultipleFiles_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaMultipleFiles_p, fieldNumber: 473)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaMultipleFiles_p, fieldNumber: 477)
       }
       if _storage._hasJavaOuterClassname_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaOuterClassname_p, fieldNumber: 474)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaOuterClassname_p, fieldNumber: 478)
       }
       if _storage._hasJavaPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaPackage_p, fieldNumber: 475)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaPackage_p, fieldNumber: 479)
       }
       if _storage._hasJavaStringCheckUtf8_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaStringCheckUtf8_p, fieldNumber: 476)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaStringCheckUtf8_p, fieldNumber: 480)
       }
       if _storage._hasJsonFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJsonFormat_p, fieldNumber: 477)
+        try visitor.visitSingularInt32Field(value: _storage._hasJsonFormat_p, fieldNumber: 481)
       }
       if _storage._hasJsonName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJsonName_p, fieldNumber: 478)
+        try visitor.visitSingularInt32Field(value: _storage._hasJsonName_p, fieldNumber: 482)
       }
       if _storage._hasJstype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJstype_p, fieldNumber: 479)
+        try visitor.visitSingularInt32Field(value: _storage._hasJstype_p, fieldNumber: 483)
       }
       if _storage._hasLabel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLabel_p, fieldNumber: 480)
+        try visitor.visitSingularInt32Field(value: _storage._hasLabel_p, fieldNumber: 484)
       }
       if _storage._hasLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLazy_p, fieldNumber: 481)
+        try visitor.visitSingularInt32Field(value: _storage._hasLazy_p, fieldNumber: 485)
       }
       if _storage._hasLeadingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLeadingComments_p, fieldNumber: 482)
+        try visitor.visitSingularInt32Field(value: _storage._hasLeadingComments_p, fieldNumber: 486)
       }
       if _storage._hasMapEntry_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMapEntry_p, fieldNumber: 483)
+        try visitor.visitSingularInt32Field(value: _storage._hasMapEntry_p, fieldNumber: 487)
       }
       if _storage._hasMaximumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMaximumEdition_p, fieldNumber: 484)
+        try visitor.visitSingularInt32Field(value: _storage._hasMaximumEdition_p, fieldNumber: 488)
       }
       if _storage._hasMessageEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMessageEncoding_p, fieldNumber: 485)
+        try visitor.visitSingularInt32Field(value: _storage._hasMessageEncoding_p, fieldNumber: 489)
       }
       if _storage._hasMessageSetWireFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMessageSetWireFormat_p, fieldNumber: 486)
+        try visitor.visitSingularInt32Field(value: _storage._hasMessageSetWireFormat_p, fieldNumber: 490)
       }
       if _storage._hasMinimumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMinimumEdition_p, fieldNumber: 487)
+        try visitor.visitSingularInt32Field(value: _storage._hasMinimumEdition_p, fieldNumber: 491)
       }
       if _storage._hasName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasName_p, fieldNumber: 488)
+        try visitor.visitSingularInt32Field(value: _storage._hasName_p, fieldNumber: 492)
       }
       if _storage._hasNamePart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNamePart_p, fieldNumber: 489)
+        try visitor.visitSingularInt32Field(value: _storage._hasNamePart_p, fieldNumber: 493)
       }
       if _storage._hasNegativeIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNegativeIntValue_p, fieldNumber: 490)
+        try visitor.visitSingularInt32Field(value: _storage._hasNegativeIntValue_p, fieldNumber: 494)
       }
       if _storage._hasNoStandardDescriptorAccessor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNoStandardDescriptorAccessor_p, fieldNumber: 491)
+        try visitor.visitSingularInt32Field(value: _storage._hasNoStandardDescriptorAccessor_p, fieldNumber: 495)
       }
       if _storage._hasNumber_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNumber_p, fieldNumber: 492)
+        try visitor.visitSingularInt32Field(value: _storage._hasNumber_p, fieldNumber: 496)
       }
       if _storage._hasObjcClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasObjcClassPrefix_p, fieldNumber: 493)
+        try visitor.visitSingularInt32Field(value: _storage._hasObjcClassPrefix_p, fieldNumber: 497)
       }
       if _storage._hasOneofIndex_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOneofIndex_p, fieldNumber: 494)
+        try visitor.visitSingularInt32Field(value: _storage._hasOneofIndex_p, fieldNumber: 498)
       }
       if _storage._hasOptimizeFor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOptimizeFor_p, fieldNumber: 495)
+        try visitor.visitSingularInt32Field(value: _storage._hasOptimizeFor_p, fieldNumber: 499)
       }
       if _storage._hasOptions_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOptions_p, fieldNumber: 496)
+        try visitor.visitSingularInt32Field(value: _storage._hasOptions_p, fieldNumber: 500)
       }
       if _storage._hasOutputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOutputType_p, fieldNumber: 497)
+        try visitor.visitSingularInt32Field(value: _storage._hasOutputType_p, fieldNumber: 501)
       }
       if _storage._hasOverridableFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOverridableFeatures_p, fieldNumber: 498)
+        try visitor.visitSingularInt32Field(value: _storage._hasOverridableFeatures_p, fieldNumber: 502)
       }
       if _storage._hasPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPackage_p, fieldNumber: 499)
+        try visitor.visitSingularInt32Field(value: _storage._hasPackage_p, fieldNumber: 503)
       }
       if _storage._hasPacked_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPacked_p, fieldNumber: 500)
+        try visitor.visitSingularInt32Field(value: _storage._hasPacked_p, fieldNumber: 504)
       }
       if _storage._hasPhpClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpClassPrefix_p, fieldNumber: 501)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpClassPrefix_p, fieldNumber: 505)
       }
       if _storage._hasPhpMetadataNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpMetadataNamespace_p, fieldNumber: 502)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpMetadataNamespace_p, fieldNumber: 506)
       }
       if _storage._hasPhpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpNamespace_p, fieldNumber: 503)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpNamespace_p, fieldNumber: 507)
       }
       if _storage._hasPositiveIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPositiveIntValue_p, fieldNumber: 504)
+        try visitor.visitSingularInt32Field(value: _storage._hasPositiveIntValue_p, fieldNumber: 508)
       }
       if _storage._hasProto3Optional_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasProto3Optional_p, fieldNumber: 505)
+        try visitor.visitSingularInt32Field(value: _storage._hasProto3Optional_p, fieldNumber: 509)
       }
       if _storage._hasPyGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPyGenericServices_p, fieldNumber: 506)
+        try visitor.visitSingularInt32Field(value: _storage._hasPyGenericServices_p, fieldNumber: 510)
       }
       if _storage._hasRepeated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRepeated_p, fieldNumber: 507)
+        try visitor.visitSingularInt32Field(value: _storage._hasRepeated_p, fieldNumber: 511)
       }
       if _storage._hasRepeatedFieldEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRepeatedFieldEncoding_p, fieldNumber: 508)
+        try visitor.visitSingularInt32Field(value: _storage._hasRepeatedFieldEncoding_p, fieldNumber: 512)
       }
       if _storage._hasReserved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasReserved_p, fieldNumber: 509)
+        try visitor.visitSingularInt32Field(value: _storage._hasReserved_p, fieldNumber: 513)
       }
       if _storage._hasRetention_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRetention_p, fieldNumber: 510)
+        try visitor.visitSingularInt32Field(value: _storage._hasRetention_p, fieldNumber: 514)
       }
       if _storage._hasRubyPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRubyPackage_p, fieldNumber: 511)
+        try visitor.visitSingularInt32Field(value: _storage._hasRubyPackage_p, fieldNumber: 515)
       }
       if _storage._hasSemantic_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSemantic_p, fieldNumber: 512)
+        try visitor.visitSingularInt32Field(value: _storage._hasSemantic_p, fieldNumber: 516)
       }
       if _storage._hasServerStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasServerStreaming_p, fieldNumber: 513)
+        try visitor.visitSingularInt32Field(value: _storage._hasServerStreaming_p, fieldNumber: 517)
       }
       if _storage._hasSourceCodeInfo_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceCodeInfo_p, fieldNumber: 514)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceCodeInfo_p, fieldNumber: 518)
       }
       if _storage._hasSourceContext_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceContext_p, fieldNumber: 515)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceContext_p, fieldNumber: 519)
       }
       if _storage._hasSourceFile_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceFile_p, fieldNumber: 516)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceFile_p, fieldNumber: 520)
       }
       if _storage._hasStart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasStart_p, fieldNumber: 517)
+        try visitor.visitSingularInt32Field(value: _storage._hasStart_p, fieldNumber: 521)
       }
       if _storage._hasStringValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasStringValue_p, fieldNumber: 518)
+        try visitor.visitSingularInt32Field(value: _storage._hasStringValue_p, fieldNumber: 522)
       }
       if _storage._hasSwiftPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSwiftPrefix_p, fieldNumber: 519)
+        try visitor.visitSingularInt32Field(value: _storage._hasSwiftPrefix_p, fieldNumber: 523)
       }
       if _storage._hasSyntax_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSyntax_p, fieldNumber: 520)
+        try visitor.visitSingularInt32Field(value: _storage._hasSyntax_p, fieldNumber: 524)
       }
       if _storage._hasTrailingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasTrailingComments_p, fieldNumber: 521)
+        try visitor.visitSingularInt32Field(value: _storage._hasTrailingComments_p, fieldNumber: 525)
       }
       if _storage._hasType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasType_p, fieldNumber: 522)
+        try visitor.visitSingularInt32Field(value: _storage._hasType_p, fieldNumber: 526)
       }
       if _storage._hasTypeName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasTypeName_p, fieldNumber: 523)
+        try visitor.visitSingularInt32Field(value: _storage._hasTypeName_p, fieldNumber: 527)
       }
       if _storage._hasUnverifiedLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasUnverifiedLazy_p, fieldNumber: 524)
+        try visitor.visitSingularInt32Field(value: _storage._hasUnverifiedLazy_p, fieldNumber: 528)
       }
       if _storage._hasUtf8Validation_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasUtf8Validation_p, fieldNumber: 525)
+        try visitor.visitSingularInt32Field(value: _storage._hasUtf8Validation_p, fieldNumber: 529)
       }
       if _storage._hasValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasValue_p, fieldNumber: 526)
+        try visitor.visitSingularInt32Field(value: _storage._hasValue_p, fieldNumber: 530)
       }
       if _storage._hasVerification_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasVerification_p, fieldNumber: 527)
+        try visitor.visitSingularInt32Field(value: _storage._hasVerification_p, fieldNumber: 531)
       }
       if _storage._hasWeak_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasWeak_p, fieldNumber: 528)
+        try visitor.visitSingularInt32Field(value: _storage._hasWeak_p, fieldNumber: 532)
       }
       if _storage._hour != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hour, fieldNumber: 529)
+        try visitor.visitSingularInt32Field(value: _storage._hour, fieldNumber: 533)
       }
       if _storage._i != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._i, fieldNumber: 530)
+        try visitor.visitSingularInt32Field(value: _storage._i, fieldNumber: 534)
       }
       if _storage._idempotencyLevel != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._idempotencyLevel, fieldNumber: 531)
+        try visitor.visitSingularInt32Field(value: _storage._idempotencyLevel, fieldNumber: 535)
       }
       if _storage._identifierValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._identifierValue, fieldNumber: 532)
+        try visitor.visitSingularInt32Field(value: _storage._identifierValue, fieldNumber: 536)
       }
       if _storage._if != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._if, fieldNumber: 533)
+        try visitor.visitSingularInt32Field(value: _storage._if, fieldNumber: 537)
       }
       if _storage._ignoreUnknownExtensionFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownExtensionFields, fieldNumber: 534)
+        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownExtensionFields, fieldNumber: 538)
       }
       if _storage._ignoreUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownFields, fieldNumber: 535)
+        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownFields, fieldNumber: 539)
       }
       if _storage._index != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._index, fieldNumber: 536)
+        try visitor.visitSingularInt32Field(value: _storage._index, fieldNumber: 540)
       }
       if _storage._init_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._init_p, fieldNumber: 537)
+        try visitor.visitSingularInt32Field(value: _storage._init_p, fieldNumber: 541)
       }
       if _storage._inout != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._inout, fieldNumber: 538)
+        try visitor.visitSingularInt32Field(value: _storage._inout, fieldNumber: 542)
       }
       if _storage._inputType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._inputType, fieldNumber: 539)
+        try visitor.visitSingularInt32Field(value: _storage._inputType, fieldNumber: 543)
       }
       if _storage._insert != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._insert, fieldNumber: 540)
+        try visitor.visitSingularInt32Field(value: _storage._insert, fieldNumber: 544)
       }
       if _storage._int != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int, fieldNumber: 541)
+        try visitor.visitSingularInt32Field(value: _storage._int, fieldNumber: 545)
       }
       if _storage._int32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int32, fieldNumber: 542)
+        try visitor.visitSingularInt32Field(value: _storage._int32, fieldNumber: 546)
       }
       if _storage._int32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int32Value, fieldNumber: 543)
+        try visitor.visitSingularInt32Field(value: _storage._int32Value, fieldNumber: 547)
       }
       if _storage._int64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int64, fieldNumber: 544)
+        try visitor.visitSingularInt32Field(value: _storage._int64, fieldNumber: 548)
       }
       if _storage._int64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int64Value, fieldNumber: 545)
+        try visitor.visitSingularInt32Field(value: _storage._int64Value, fieldNumber: 549)
       }
       if _storage._int8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int8, fieldNumber: 546)
+        try visitor.visitSingularInt32Field(value: _storage._int8, fieldNumber: 550)
       }
       if _storage._integerLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._integerLiteral, fieldNumber: 547)
+        try visitor.visitSingularInt32Field(value: _storage._integerLiteral, fieldNumber: 551)
       }
       if _storage._integerLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._integerLiteralType, fieldNumber: 548)
+        try visitor.visitSingularInt32Field(value: _storage._integerLiteralType, fieldNumber: 552)
       }
       if _storage._intern != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._intern, fieldNumber: 549)
+        try visitor.visitSingularInt32Field(value: _storage._intern, fieldNumber: 553)
       }
       if _storage._internal != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._internal, fieldNumber: 550)
+        try visitor.visitSingularInt32Field(value: _storage._internal, fieldNumber: 554)
       }
       if _storage._internalState != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._internalState, fieldNumber: 551)
+        try visitor.visitSingularInt32Field(value: _storage._internalState, fieldNumber: 555)
       }
       if _storage._intersect != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._intersect, fieldNumber: 552)
+        try visitor.visitSingularInt32Field(value: _storage._intersect, fieldNumber: 556)
       }
       if _storage._into != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._into, fieldNumber: 553)
+        try visitor.visitSingularInt32Field(value: _storage._into, fieldNumber: 557)
       }
       if _storage._ints != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ints, fieldNumber: 554)
+        try visitor.visitSingularInt32Field(value: _storage._ints, fieldNumber: 558)
+      }
+      if _storage._invalidAnyTypeURL != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._invalidAnyTypeURL, fieldNumber: 559)
       }
       if _storage._isA != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isA, fieldNumber: 555)
+        try visitor.visitSingularInt32Field(value: _storage._isA, fieldNumber: 560)
       }
       if _storage._isEqual != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isEqual, fieldNumber: 556)
+        try visitor.visitSingularInt32Field(value: _storage._isEqual, fieldNumber: 561)
       }
       if _storage._isEqualTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isEqualTo, fieldNumber: 557)
+        try visitor.visitSingularInt32Field(value: _storage._isEqualTo, fieldNumber: 562)
       }
       if _storage._isExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isExtension, fieldNumber: 558)
+        try visitor.visitSingularInt32Field(value: _storage._isExtension, fieldNumber: 563)
       }
       if _storage._isInitialized_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isInitialized_p, fieldNumber: 559)
+        try visitor.visitSingularInt32Field(value: _storage._isInitialized_p, fieldNumber: 564)
       }
       if _storage._isNegative != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isNegative, fieldNumber: 560)
+        try visitor.visitSingularInt32Field(value: _storage._isNegative, fieldNumber: 565)
       }
       if _storage._isPathValid != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isPathValid, fieldNumber: 561)
+        try visitor.visitSingularInt32Field(value: _storage._isPathValid, fieldNumber: 566)
       }
       if _storage._isValid != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isValid, fieldNumber: 562)
+        try visitor.visitSingularInt32Field(value: _storage._isValid, fieldNumber: 567)
       }
       if _storage._itemTagsEncodedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._itemTagsEncodedSize, fieldNumber: 563)
+        try visitor.visitSingularInt32Field(value: _storage._itemTagsEncodedSize, fieldNumber: 568)
       }
       if _storage._iterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._iterator, fieldNumber: 564)
+        try visitor.visitSingularInt32Field(value: _storage._iterator, fieldNumber: 569)
       }
       if _storage._javaGenerateEqualsAndHash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaGenerateEqualsAndHash, fieldNumber: 565)
+        try visitor.visitSingularInt32Field(value: _storage._javaGenerateEqualsAndHash, fieldNumber: 570)
       }
       if _storage._javaGenericServices != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaGenericServices, fieldNumber: 566)
+        try visitor.visitSingularInt32Field(value: _storage._javaGenericServices, fieldNumber: 571)
       }
       if _storage._javaMultipleFiles != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaMultipleFiles, fieldNumber: 567)
+        try visitor.visitSingularInt32Field(value: _storage._javaMultipleFiles, fieldNumber: 572)
       }
       if _storage._javaOuterClassname != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaOuterClassname, fieldNumber: 568)
+        try visitor.visitSingularInt32Field(value: _storage._javaOuterClassname, fieldNumber: 573)
       }
       if _storage._javaPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaPackage, fieldNumber: 569)
+        try visitor.visitSingularInt32Field(value: _storage._javaPackage, fieldNumber: 574)
       }
       if _storage._javaStringCheckUtf8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaStringCheckUtf8, fieldNumber: 570)
+        try visitor.visitSingularInt32Field(value: _storage._javaStringCheckUtf8, fieldNumber: 575)
       }
       if _storage._jsondecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecoder, fieldNumber: 571)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecoder, fieldNumber: 576)
+      }
+      if _storage._jsondecoding != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._jsondecoding, fieldNumber: 577)
       }
       if _storage._jsondecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecodingError, fieldNumber: 572)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecodingError, fieldNumber: 578)
       }
       if _storage._jsondecodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecodingOptions, fieldNumber: 573)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecodingOptions, fieldNumber: 579)
       }
       if _storage._jsonEncoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonEncoder, fieldNumber: 574)
+        try visitor.visitSingularInt32Field(value: _storage._jsonEncoder, fieldNumber: 580)
+      }
+      if _storage._jsonencoding != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._jsonencoding, fieldNumber: 581)
       }
       if _storage._jsonencodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingError, fieldNumber: 575)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingError, fieldNumber: 582)
       }
       if _storage._jsonencodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingOptions, fieldNumber: 576)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingOptions, fieldNumber: 583)
       }
       if _storage._jsonencodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingVisitor, fieldNumber: 577)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingVisitor, fieldNumber: 584)
       }
       if _storage._jsonFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonFormat, fieldNumber: 578)
+        try visitor.visitSingularInt32Field(value: _storage._jsonFormat, fieldNumber: 585)
       }
       if _storage._jsonmapEncodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonmapEncodingVisitor, fieldNumber: 579)
+        try visitor.visitSingularInt32Field(value: _storage._jsonmapEncodingVisitor, fieldNumber: 586)
       }
       if _storage._jsonName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonName, fieldNumber: 580)
+        try visitor.visitSingularInt32Field(value: _storage._jsonName, fieldNumber: 587)
       }
       if _storage._jsonPath != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonPath, fieldNumber: 581)
+        try visitor.visitSingularInt32Field(value: _storage._jsonPath, fieldNumber: 588)
       }
       if _storage._jsonPaths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonPaths, fieldNumber: 582)
+        try visitor.visitSingularInt32Field(value: _storage._jsonPaths, fieldNumber: 589)
       }
       if _storage._jsonscanner != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonscanner, fieldNumber: 583)
+        try visitor.visitSingularInt32Field(value: _storage._jsonscanner, fieldNumber: 590)
       }
       if _storage._jsonString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonString, fieldNumber: 584)
+        try visitor.visitSingularInt32Field(value: _storage._jsonString, fieldNumber: 591)
       }
       if _storage._jsonText != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonText, fieldNumber: 585)
+        try visitor.visitSingularInt32Field(value: _storage._jsonText, fieldNumber: 592)
       }
       if _storage._jsonUtf8Bytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Bytes, fieldNumber: 586)
+        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Bytes, fieldNumber: 593)
       }
       if _storage._jsonUtf8Data != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Data, fieldNumber: 587)
+        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Data, fieldNumber: 594)
       }
       if _storage._jstype != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jstype, fieldNumber: 588)
+        try visitor.visitSingularInt32Field(value: _storage._jstype, fieldNumber: 595)
       }
       if _storage._k != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._k, fieldNumber: 589)
+        try visitor.visitSingularInt32Field(value: _storage._k, fieldNumber: 596)
       }
       if _storage._kChunkSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._kChunkSize, fieldNumber: 590)
+        try visitor.visitSingularInt32Field(value: _storage._kChunkSize, fieldNumber: 597)
       }
       if _storage._key != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._key, fieldNumber: 591)
+        try visitor.visitSingularInt32Field(value: _storage._key, fieldNumber: 598)
       }
       if _storage._keyField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyField, fieldNumber: 592)
+        try visitor.visitSingularInt32Field(value: _storage._keyField, fieldNumber: 599)
       }
       if _storage._keyFieldOpt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyFieldOpt, fieldNumber: 593)
+        try visitor.visitSingularInt32Field(value: _storage._keyFieldOpt, fieldNumber: 600)
       }
       if _storage._keyType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyType, fieldNumber: 594)
+        try visitor.visitSingularInt32Field(value: _storage._keyType, fieldNumber: 601)
       }
       if _storage._kind != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._kind, fieldNumber: 595)
+        try visitor.visitSingularInt32Field(value: _storage._kind, fieldNumber: 602)
       }
       if _storage._l != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._l, fieldNumber: 596)
+        try visitor.visitSingularInt32Field(value: _storage._l, fieldNumber: 603)
       }
       if _storage._label != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._label, fieldNumber: 597)
+        try visitor.visitSingularInt32Field(value: _storage._label, fieldNumber: 604)
       }
       if _storage._lazy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lazy, fieldNumber: 598)
+        try visitor.visitSingularInt32Field(value: _storage._lazy, fieldNumber: 605)
       }
       if _storage._leadingComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._leadingComments, fieldNumber: 599)
+        try visitor.visitSingularInt32Field(value: _storage._leadingComments, fieldNumber: 606)
       }
       if _storage._leadingDetachedComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._leadingDetachedComments, fieldNumber: 600)
+        try visitor.visitSingularInt32Field(value: _storage._leadingDetachedComments, fieldNumber: 607)
       }
       if _storage._length != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._length, fieldNumber: 601)
+        try visitor.visitSingularInt32Field(value: _storage._length, fieldNumber: 608)
       }
       if _storage._lessThan != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lessThan, fieldNumber: 602)
+        try visitor.visitSingularInt32Field(value: _storage._lessThan, fieldNumber: 609)
       }
       if _storage._let != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._let, fieldNumber: 603)
+        try visitor.visitSingularInt32Field(value: _storage._let, fieldNumber: 610)
       }
       if _storage._lhs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lhs, fieldNumber: 604)
+        try visitor.visitSingularInt32Field(value: _storage._lhs, fieldNumber: 611)
       }
       if _storage._line != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._line, fieldNumber: 605)
+        try visitor.visitSingularInt32Field(value: _storage._line, fieldNumber: 612)
       }
       if _storage._list != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._list, fieldNumber: 606)
+        try visitor.visitSingularInt32Field(value: _storage._list, fieldNumber: 613)
       }
       if _storage._listOfMessages != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._listOfMessages, fieldNumber: 607)
+        try visitor.visitSingularInt32Field(value: _storage._listOfMessages, fieldNumber: 614)
       }
       if _storage._listValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._listValue, fieldNumber: 608)
+        try visitor.visitSingularInt32Field(value: _storage._listValue, fieldNumber: 615)
       }
       if _storage._littleEndian != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._littleEndian, fieldNumber: 609)
+        try visitor.visitSingularInt32Field(value: _storage._littleEndian, fieldNumber: 616)
       }
       if _storage._load != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._load, fieldNumber: 610)
+        try visitor.visitSingularInt32Field(value: _storage._load, fieldNumber: 617)
       }
       if _storage._localHasher != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._localHasher, fieldNumber: 611)
+        try visitor.visitSingularInt32Field(value: _storage._localHasher, fieldNumber: 618)
       }
       if _storage._location != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._location, fieldNumber: 612)
+        try visitor.visitSingularInt32Field(value: _storage._location, fieldNumber: 619)
       }
       if _storage._m != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._m, fieldNumber: 613)
+        try visitor.visitSingularInt32Field(value: _storage._m, fieldNumber: 620)
       }
       if _storage._major != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._major, fieldNumber: 614)
+        try visitor.visitSingularInt32Field(value: _storage._major, fieldNumber: 621)
       }
       if _storage._makeAsyncIterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._makeAsyncIterator, fieldNumber: 615)
+        try visitor.visitSingularInt32Field(value: _storage._makeAsyncIterator, fieldNumber: 622)
       }
       if _storage._makeIterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._makeIterator, fieldNumber: 616)
+        try visitor.visitSingularInt32Field(value: _storage._makeIterator, fieldNumber: 623)
       }
       if _storage._malformedLength != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._malformedLength, fieldNumber: 617)
+        try visitor.visitSingularInt32Field(value: _storage._malformedLength, fieldNumber: 624)
       }
       if _storage._mapEntry != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapEntry, fieldNumber: 618)
+        try visitor.visitSingularInt32Field(value: _storage._mapEntry, fieldNumber: 625)
       }
       if _storage._mapKeyType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapKeyType, fieldNumber: 619)
+        try visitor.visitSingularInt32Field(value: _storage._mapKeyType, fieldNumber: 626)
       }
       if _storage._mapToMessages != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapToMessages, fieldNumber: 620)
+        try visitor.visitSingularInt32Field(value: _storage._mapToMessages, fieldNumber: 627)
       }
       if _storage._mapValueType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapValueType, fieldNumber: 621)
+        try visitor.visitSingularInt32Field(value: _storage._mapValueType, fieldNumber: 628)
       }
       if _storage._mapVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapVisitor, fieldNumber: 622)
+        try visitor.visitSingularInt32Field(value: _storage._mapVisitor, fieldNumber: 629)
       }
       if _storage._mask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mask, fieldNumber: 623)
+        try visitor.visitSingularInt32Field(value: _storage._mask, fieldNumber: 630)
       }
       if _storage._maximumEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._maximumEdition, fieldNumber: 624)
+        try visitor.visitSingularInt32Field(value: _storage._maximumEdition, fieldNumber: 631)
       }
       if _storage._mdayStart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mdayStart, fieldNumber: 625)
+        try visitor.visitSingularInt32Field(value: _storage._mdayStart, fieldNumber: 632)
       }
       if _storage._merge != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._merge, fieldNumber: 626)
+        try visitor.visitSingularInt32Field(value: _storage._merge, fieldNumber: 633)
       }
       if _storage._mergeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mergeOptions, fieldNumber: 627)
+        try visitor.visitSingularInt32Field(value: _storage._mergeOptions, fieldNumber: 634)
       }
       if _storage._message != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._message, fieldNumber: 628)
+        try visitor.visitSingularInt32Field(value: _storage._message, fieldNumber: 635)
       }
       if _storage._messageDepthLimit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageDepthLimit, fieldNumber: 629)
+        try visitor.visitSingularInt32Field(value: _storage._messageDepthLimit, fieldNumber: 636)
       }
       if _storage._messageEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageEncoding, fieldNumber: 630)
+        try visitor.visitSingularInt32Field(value: _storage._messageEncoding, fieldNumber: 637)
       }
       if _storage._messageExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageExtension, fieldNumber: 631)
+        try visitor.visitSingularInt32Field(value: _storage._messageExtension, fieldNumber: 638)
       }
       if _storage._messageImplementationBase != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageImplementationBase, fieldNumber: 632)
+        try visitor.visitSingularInt32Field(value: _storage._messageImplementationBase, fieldNumber: 639)
       }
       if _storage._messageOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageOptions, fieldNumber: 633)
+        try visitor.visitSingularInt32Field(value: _storage._messageOptions, fieldNumber: 640)
       }
       if _storage._messageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSet, fieldNumber: 634)
+        try visitor.visitSingularInt32Field(value: _storage._messageSet, fieldNumber: 641)
       }
       if _storage._messageSetWireFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSetWireFormat, fieldNumber: 635)
+        try visitor.visitSingularInt32Field(value: _storage._messageSetWireFormat, fieldNumber: 642)
       }
       if _storage._messageSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSize, fieldNumber: 636)
+        try visitor.visitSingularInt32Field(value: _storage._messageSize, fieldNumber: 643)
       }
       if _storage._messageType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageType, fieldNumber: 637)
+        try visitor.visitSingularInt32Field(value: _storage._messageType, fieldNumber: 644)
       }
       if _storage._method != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._method, fieldNumber: 638)
+        try visitor.visitSingularInt32Field(value: _storage._method, fieldNumber: 645)
       }
       if _storage._methodDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methodDescriptorProto, fieldNumber: 639)
+        try visitor.visitSingularInt32Field(value: _storage._methodDescriptorProto, fieldNumber: 646)
       }
       if _storage._methodOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methodOptions, fieldNumber: 640)
+        try visitor.visitSingularInt32Field(value: _storage._methodOptions, fieldNumber: 647)
       }
       if _storage._methods != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methods, fieldNumber: 641)
+        try visitor.visitSingularInt32Field(value: _storage._methods, fieldNumber: 648)
       }
       if _storage._min != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._min, fieldNumber: 642)
+        try visitor.visitSingularInt32Field(value: _storage._min, fieldNumber: 649)
       }
       if _storage._minimumEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._minimumEdition, fieldNumber: 643)
+        try visitor.visitSingularInt32Field(value: _storage._minimumEdition, fieldNumber: 650)
       }
       if _storage._minor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._minor, fieldNumber: 644)
+        try visitor.visitSingularInt32Field(value: _storage._minor, fieldNumber: 651)
       }
       if _storage._mixin != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mixin, fieldNumber: 645)
+        try visitor.visitSingularInt32Field(value: _storage._mixin, fieldNumber: 652)
       }
       if _storage._mixins != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mixins, fieldNumber: 646)
+        try visitor.visitSingularInt32Field(value: _storage._mixins, fieldNumber: 653)
       }
       if _storage._modify != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._modify, fieldNumber: 647)
+        try visitor.visitSingularInt32Field(value: _storage._modify, fieldNumber: 654)
       }
       if _storage._month != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._month, fieldNumber: 648)
+        try visitor.visitSingularInt32Field(value: _storage._month, fieldNumber: 655)
       }
       if _storage._msgExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._msgExtension, fieldNumber: 649)
+        try visitor.visitSingularInt32Field(value: _storage._msgExtension, fieldNumber: 656)
       }
       if _storage._mutating != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mutating, fieldNumber: 650)
+        try visitor.visitSingularInt32Field(value: _storage._mutating, fieldNumber: 657)
       }
       if _storage._n != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._n, fieldNumber: 651)
+        try visitor.visitSingularInt32Field(value: _storage._n, fieldNumber: 658)
       }
       if _storage._name != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._name, fieldNumber: 652)
+        try visitor.visitSingularInt32Field(value: _storage._name, fieldNumber: 659)
       }
       if _storage._nameDescription != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nameDescription, fieldNumber: 653)
+        try visitor.visitSingularInt32Field(value: _storage._nameDescription, fieldNumber: 660)
       }
       if _storage._nameMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nameMap, fieldNumber: 654)
+        try visitor.visitSingularInt32Field(value: _storage._nameMap, fieldNumber: 661)
       }
       if _storage._namePart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._namePart, fieldNumber: 655)
+        try visitor.visitSingularInt32Field(value: _storage._namePart, fieldNumber: 662)
       }
       if _storage._names != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._names, fieldNumber: 656)
+        try visitor.visitSingularInt32Field(value: _storage._names, fieldNumber: 663)
       }
       if _storage._nanos != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nanos, fieldNumber: 657)
+        try visitor.visitSingularInt32Field(value: _storage._nanos, fieldNumber: 664)
       }
       if _storage._negativeIntValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._negativeIntValue, fieldNumber: 658)
+        try visitor.visitSingularInt32Field(value: _storage._negativeIntValue, fieldNumber: 665)
       }
       if _storage._nestedType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nestedType, fieldNumber: 659)
+        try visitor.visitSingularInt32Field(value: _storage._nestedType, fieldNumber: 666)
       }
       if _storage._newExtensible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newExtensible, fieldNumber: 660)
+        try visitor.visitSingularInt32Field(value: _storage._newExtensible, fieldNumber: 667)
       }
       if _storage._newL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newL, fieldNumber: 661)
+        try visitor.visitSingularInt32Field(value: _storage._newL, fieldNumber: 668)
       }
       if _storage._newList != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newList, fieldNumber: 662)
+        try visitor.visitSingularInt32Field(value: _storage._newList, fieldNumber: 669)
       }
       if _storage._newMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newMessage, fieldNumber: 663)
+        try visitor.visitSingularInt32Field(value: _storage._newMessage, fieldNumber: 670)
       }
       if _storage._newValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newValue, fieldNumber: 664)
+        try visitor.visitSingularInt32Field(value: _storage._newValue, fieldNumber: 671)
       }
       if _storage._next != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._next, fieldNumber: 665)
+        try visitor.visitSingularInt32Field(value: _storage._next, fieldNumber: 672)
       }
       if _storage._nextByte != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextByte, fieldNumber: 666)
+        try visitor.visitSingularInt32Field(value: _storage._nextByte, fieldNumber: 673)
       }
       if _storage._nextFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextFieldNumber, fieldNumber: 667)
+        try visitor.visitSingularInt32Field(value: _storage._nextFieldNumber, fieldNumber: 674)
       }
       if _storage._nextVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextVarInt, fieldNumber: 668)
+        try visitor.visitSingularInt32Field(value: _storage._nextVarInt, fieldNumber: 675)
       }
       if _storage._nil != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nil, fieldNumber: 669)
+        try visitor.visitSingularInt32Field(value: _storage._nil, fieldNumber: 676)
       }
       if _storage._nilLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nilLiteral, fieldNumber: 670)
+        try visitor.visitSingularInt32Field(value: _storage._nilLiteral, fieldNumber: 677)
       }
       if _storage._noBytesAvailable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._noBytesAvailable, fieldNumber: 671)
+        try visitor.visitSingularInt32Field(value: _storage._noBytesAvailable, fieldNumber: 678)
       }
       if _storage._noStandardDescriptorAccessor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._noStandardDescriptorAccessor, fieldNumber: 672)
+        try visitor.visitSingularInt32Field(value: _storage._noStandardDescriptorAccessor, fieldNumber: 679)
       }
       if _storage._nullValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nullValue, fieldNumber: 673)
+        try visitor.visitSingularInt32Field(value: _storage._nullValue, fieldNumber: 680)
       }
       if _storage._number != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._number, fieldNumber: 674)
+        try visitor.visitSingularInt32Field(value: _storage._number, fieldNumber: 681)
       }
       if _storage._numberValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._numberValue, fieldNumber: 675)
+        try visitor.visitSingularInt32Field(value: _storage._numberValue, fieldNumber: 682)
       }
       if _storage._objcClassPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._objcClassPrefix, fieldNumber: 676)
+        try visitor.visitSingularInt32Field(value: _storage._objcClassPrefix, fieldNumber: 683)
       }
       if _storage._of != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._of, fieldNumber: 677)
+        try visitor.visitSingularInt32Field(value: _storage._of, fieldNumber: 684)
       }
       if _storage._oneofDecl != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofDecl, fieldNumber: 678)
+        try visitor.visitSingularInt32Field(value: _storage._oneofDecl, fieldNumber: 685)
       }
       if _storage._oneofDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofDescriptorProto, fieldNumber: 679)
+        try visitor.visitSingularInt32Field(value: _storage._oneofDescriptorProto, fieldNumber: 686)
       }
       if _storage._oneofIndex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofIndex, fieldNumber: 680)
+        try visitor.visitSingularInt32Field(value: _storage._oneofIndex, fieldNumber: 687)
       }
       if _storage._oneofOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofOptions, fieldNumber: 681)
+        try visitor.visitSingularInt32Field(value: _storage._oneofOptions, fieldNumber: 688)
       }
       if _storage._oneofs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofs, fieldNumber: 682)
+        try visitor.visitSingularInt32Field(value: _storage._oneofs, fieldNumber: 689)
       }
       if _storage._oneOfKind != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneOfKind, fieldNumber: 683)
+        try visitor.visitSingularInt32Field(value: _storage._oneOfKind, fieldNumber: 690)
       }
       if _storage._optimizeFor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optimizeFor, fieldNumber: 684)
+        try visitor.visitSingularInt32Field(value: _storage._optimizeFor, fieldNumber: 691)
       }
       if _storage._optimizeMode != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optimizeMode, fieldNumber: 685)
+        try visitor.visitSingularInt32Field(value: _storage._optimizeMode, fieldNumber: 692)
       }
       if _storage._option != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._option, fieldNumber: 686)
+        try visitor.visitSingularInt32Field(value: _storage._option, fieldNumber: 693)
       }
       if _storage._optionalEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalEnumExtensionField, fieldNumber: 687)
+        try visitor.visitSingularInt32Field(value: _storage._optionalEnumExtensionField, fieldNumber: 694)
       }
       if _storage._optionalExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalExtensionField, fieldNumber: 688)
+        try visitor.visitSingularInt32Field(value: _storage._optionalExtensionField, fieldNumber: 695)
       }
       if _storage._optionalGroupExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalGroupExtensionField, fieldNumber: 689)
+        try visitor.visitSingularInt32Field(value: _storage._optionalGroupExtensionField, fieldNumber: 696)
       }
       if _storage._optionalMessageExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalMessageExtensionField, fieldNumber: 690)
+        try visitor.visitSingularInt32Field(value: _storage._optionalMessageExtensionField, fieldNumber: 697)
       }
       if _storage._optionRetention != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionRetention, fieldNumber: 691)
+        try visitor.visitSingularInt32Field(value: _storage._optionRetention, fieldNumber: 698)
       }
       if _storage._options != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._options, fieldNumber: 692)
+        try visitor.visitSingularInt32Field(value: _storage._options, fieldNumber: 699)
       }
       if _storage._optionTargetType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionTargetType, fieldNumber: 693)
+        try visitor.visitSingularInt32Field(value: _storage._optionTargetType, fieldNumber: 700)
       }
       if _storage._other != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._other, fieldNumber: 694)
+        try visitor.visitSingularInt32Field(value: _storage._other, fieldNumber: 701)
       }
       if _storage._others != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._others, fieldNumber: 695)
+        try visitor.visitSingularInt32Field(value: _storage._others, fieldNumber: 702)
       }
       if _storage._out != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._out, fieldNumber: 696)
+        try visitor.visitSingularInt32Field(value: _storage._out, fieldNumber: 703)
       }
       if _storage._outputType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._outputType, fieldNumber: 697)
+        try visitor.visitSingularInt32Field(value: _storage._outputType, fieldNumber: 704)
       }
       if _storage._overridableFeatures != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._overridableFeatures, fieldNumber: 698)
+        try visitor.visitSingularInt32Field(value: _storage._overridableFeatures, fieldNumber: 705)
       }
       if _storage._p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._p, fieldNumber: 699)
+        try visitor.visitSingularInt32Field(value: _storage._p, fieldNumber: 706)
       }
       if _storage._package != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._package, fieldNumber: 700)
+        try visitor.visitSingularInt32Field(value: _storage._package, fieldNumber: 707)
       }
       if _storage._packed != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packed, fieldNumber: 701)
+        try visitor.visitSingularInt32Field(value: _storage._packed, fieldNumber: 708)
       }
       if _storage._packedEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packedEnumExtensionField, fieldNumber: 702)
+        try visitor.visitSingularInt32Field(value: _storage._packedEnumExtensionField, fieldNumber: 709)
       }
       if _storage._packedExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packedExtensionField, fieldNumber: 703)
+        try visitor.visitSingularInt32Field(value: _storage._packedExtensionField, fieldNumber: 710)
       }
       if _storage._padding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._padding, fieldNumber: 704)
+        try visitor.visitSingularInt32Field(value: _storage._padding, fieldNumber: 711)
       }
       if _storage._parent != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._parent, fieldNumber: 705)
+        try visitor.visitSingularInt32Field(value: _storage._parent, fieldNumber: 712)
       }
       if _storage._parse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._parse, fieldNumber: 706)
+        try visitor.visitSingularInt32Field(value: _storage._parse, fieldNumber: 713)
       }
       if _storage._partial != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._partial, fieldNumber: 707)
+        try visitor.visitSingularInt32Field(value: _storage._partial, fieldNumber: 714)
       }
       if _storage._path != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._path, fieldNumber: 708)
+        try visitor.visitSingularInt32Field(value: _storage._path, fieldNumber: 715)
       }
       if _storage._pathDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathDecoder, fieldNumber: 709)
+        try visitor.visitSingularInt32Field(value: _storage._pathDecoder, fieldNumber: 716)
       }
       if _storage._pathDecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathDecodingError, fieldNumber: 710)
+        try visitor.visitSingularInt32Field(value: _storage._pathDecodingError, fieldNumber: 717)
       }
       if _storage._paths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._paths, fieldNumber: 711)
+        try visitor.visitSingularInt32Field(value: _storage._paths, fieldNumber: 718)
       }
       if _storage._pathVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathVisitor, fieldNumber: 712)
+        try visitor.visitSingularInt32Field(value: _storage._pathVisitor, fieldNumber: 719)
       }
       if _storage._payload != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._payload, fieldNumber: 713)
+        try visitor.visitSingularInt32Field(value: _storage._payload, fieldNumber: 720)
       }
       if _storage._payloadSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._payloadSize, fieldNumber: 714)
+        try visitor.visitSingularInt32Field(value: _storage._payloadSize, fieldNumber: 721)
       }
       if _storage._phpClassPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpClassPrefix, fieldNumber: 715)
+        try visitor.visitSingularInt32Field(value: _storage._phpClassPrefix, fieldNumber: 722)
       }
       if _storage._phpMetadataNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpMetadataNamespace, fieldNumber: 716)
+        try visitor.visitSingularInt32Field(value: _storage._phpMetadataNamespace, fieldNumber: 723)
       }
       if _storage._phpNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpNamespace, fieldNumber: 717)
+        try visitor.visitSingularInt32Field(value: _storage._phpNamespace, fieldNumber: 724)
       }
       if _storage._pos != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pos, fieldNumber: 718)
+        try visitor.visitSingularInt32Field(value: _storage._pos, fieldNumber: 725)
       }
       if _storage._positiveIntValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._positiveIntValue, fieldNumber: 719)
+        try visitor.visitSingularInt32Field(value: _storage._positiveIntValue, fieldNumber: 726)
       }
       if _storage._prefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._prefix, fieldNumber: 720)
+        try visitor.visitSingularInt32Field(value: _storage._prefix, fieldNumber: 727)
       }
       if _storage._preserveProtoFieldNames != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._preserveProtoFieldNames, fieldNumber: 721)
+        try visitor.visitSingularInt32Field(value: _storage._preserveProtoFieldNames, fieldNumber: 728)
       }
       if _storage._preTraverse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._preTraverse, fieldNumber: 722)
+        try visitor.visitSingularInt32Field(value: _storage._preTraverse, fieldNumber: 729)
       }
       if _storage._prevPath != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._prevPath, fieldNumber: 723)
+        try visitor.visitSingularInt32Field(value: _storage._prevPath, fieldNumber: 730)
       }
       if _storage._printUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._printUnknownFields, fieldNumber: 724)
+        try visitor.visitSingularInt32Field(value: _storage._printUnknownFields, fieldNumber: 731)
       }
       if _storage._proto2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto2, fieldNumber: 725)
+        try visitor.visitSingularInt32Field(value: _storage._proto2, fieldNumber: 732)
       }
       if _storage._proto3DefaultValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto3DefaultValue, fieldNumber: 726)
+        try visitor.visitSingularInt32Field(value: _storage._proto3DefaultValue, fieldNumber: 733)
       }
       if _storage._proto3Optional != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto3Optional, fieldNumber: 727)
+        try visitor.visitSingularInt32Field(value: _storage._proto3Optional, fieldNumber: 734)
       }
       if _storage._protobufApiversionCheck != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufApiversionCheck, fieldNumber: 728)
+        try visitor.visitSingularInt32Field(value: _storage._protobufApiversionCheck, fieldNumber: 735)
       }
       if _storage._protobufApiversion2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufApiversion2, fieldNumber: 729)
+        try visitor.visitSingularInt32Field(value: _storage._protobufApiversion2, fieldNumber: 736)
       }
       if _storage._protobufBool != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufBool, fieldNumber: 730)
+        try visitor.visitSingularInt32Field(value: _storage._protobufBool, fieldNumber: 737)
       }
       if _storage._protobufBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufBytes, fieldNumber: 731)
+        try visitor.visitSingularInt32Field(value: _storage._protobufBytes, fieldNumber: 738)
       }
       if _storage._protobufDouble != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufDouble, fieldNumber: 732)
+        try visitor.visitSingularInt32Field(value: _storage._protobufDouble, fieldNumber: 739)
       }
       if _storage._protobufEnumMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufEnumMap, fieldNumber: 733)
+        try visitor.visitSingularInt32Field(value: _storage._protobufEnumMap, fieldNumber: 740)
       }
       if _storage._protobufExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufExtension, fieldNumber: 734)
+        try visitor.visitSingularInt32Field(value: _storage._protobufExtension, fieldNumber: 741)
       }
       if _storage._protobufFixed32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFixed32, fieldNumber: 735)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFixed32, fieldNumber: 742)
       }
       if _storage._protobufFixed64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFixed64, fieldNumber: 736)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFixed64, fieldNumber: 743)
       }
       if _storage._protobufFloat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFloat, fieldNumber: 737)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFloat, fieldNumber: 744)
       }
       if _storage._protobufInt32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufInt32, fieldNumber: 738)
+        try visitor.visitSingularInt32Field(value: _storage._protobufInt32, fieldNumber: 745)
       }
       if _storage._protobufInt64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufInt64, fieldNumber: 739)
+        try visitor.visitSingularInt32Field(value: _storage._protobufInt64, fieldNumber: 746)
       }
       if _storage._protobufMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufMap, fieldNumber: 740)
+        try visitor.visitSingularInt32Field(value: _storage._protobufMap, fieldNumber: 747)
       }
       if _storage._protobufMessageMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufMessageMap, fieldNumber: 741)
+        try visitor.visitSingularInt32Field(value: _storage._protobufMessageMap, fieldNumber: 748)
       }
       if _storage._protobufSfixed32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed32, fieldNumber: 742)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed32, fieldNumber: 749)
       }
       if _storage._protobufSfixed64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed64, fieldNumber: 743)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed64, fieldNumber: 750)
       }
       if _storage._protobufSint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSint32, fieldNumber: 744)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSint32, fieldNumber: 751)
       }
       if _storage._protobufSint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSint64, fieldNumber: 745)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSint64, fieldNumber: 752)
       }
       if _storage._protobufString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufString, fieldNumber: 746)
+        try visitor.visitSingularInt32Field(value: _storage._protobufString, fieldNumber: 753)
       }
       if _storage._protobufUint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufUint32, fieldNumber: 747)
+        try visitor.visitSingularInt32Field(value: _storage._protobufUint32, fieldNumber: 754)
       }
       if _storage._protobufUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufUint64, fieldNumber: 748)
+        try visitor.visitSingularInt32Field(value: _storage._protobufUint64, fieldNumber: 755)
       }
       if _storage._protobufExtensionFieldValues != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufExtensionFieldValues, fieldNumber: 749)
+        try visitor.visitSingularInt32Field(value: _storage._protobufExtensionFieldValues, fieldNumber: 756)
       }
       if _storage._protobufFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFieldNumber, fieldNumber: 750)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFieldNumber, fieldNumber: 757)
       }
       if _storage._protobufGeneratedIsEqualTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufGeneratedIsEqualTo, fieldNumber: 751)
+        try visitor.visitSingularInt32Field(value: _storage._protobufGeneratedIsEqualTo, fieldNumber: 758)
       }
       if _storage._protobufNameMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufNameMap, fieldNumber: 752)
+        try visitor.visitSingularInt32Field(value: _storage._protobufNameMap, fieldNumber: 759)
       }
       if _storage._protobufNewField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufNewField, fieldNumber: 753)
+        try visitor.visitSingularInt32Field(value: _storage._protobufNewField, fieldNumber: 760)
       }
       if _storage._protobufPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufPackage, fieldNumber: 754)
+        try visitor.visitSingularInt32Field(value: _storage._protobufPackage, fieldNumber: 761)
       }
       if _storage._protocol != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protocol, fieldNumber: 755)
+        try visitor.visitSingularInt32Field(value: _storage._protocol, fieldNumber: 762)
       }
       if _storage._protoFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoFieldName, fieldNumber: 756)
+        try visitor.visitSingularInt32Field(value: _storage._protoFieldName, fieldNumber: 763)
       }
       if _storage._protoMessageName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoMessageName, fieldNumber: 757)
+        try visitor.visitSingularInt32Field(value: _storage._protoMessageName, fieldNumber: 764)
       }
       if _storage._protoNameProviding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoNameProviding, fieldNumber: 758)
+        try visitor.visitSingularInt32Field(value: _storage._protoNameProviding, fieldNumber: 765)
       }
       if _storage._protoPaths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoPaths, fieldNumber: 759)
+        try visitor.visitSingularInt32Field(value: _storage._protoPaths, fieldNumber: 766)
       }
       if _storage._public != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._public, fieldNumber: 760)
+        try visitor.visitSingularInt32Field(value: _storage._public, fieldNumber: 767)
       }
       if _storage._publicDependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._publicDependency, fieldNumber: 761)
+        try visitor.visitSingularInt32Field(value: _storage._publicDependency, fieldNumber: 768)
       }
       if _storage._putBoolValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putBoolValue, fieldNumber: 762)
+        try visitor.visitSingularInt32Field(value: _storage._putBoolValue, fieldNumber: 769)
       }
       if _storage._putBytesValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putBytesValue, fieldNumber: 763)
+        try visitor.visitSingularInt32Field(value: _storage._putBytesValue, fieldNumber: 770)
       }
       if _storage._putDoubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putDoubleValue, fieldNumber: 764)
+        try visitor.visitSingularInt32Field(value: _storage._putDoubleValue, fieldNumber: 771)
       }
       if _storage._putEnumValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putEnumValue, fieldNumber: 765)
+        try visitor.visitSingularInt32Field(value: _storage._putEnumValue, fieldNumber: 772)
       }
       if _storage._putFixedUint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFixedUint32, fieldNumber: 766)
+        try visitor.visitSingularInt32Field(value: _storage._putFixedUint32, fieldNumber: 773)
       }
       if _storage._putFixedUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFixedUint64, fieldNumber: 767)
+        try visitor.visitSingularInt32Field(value: _storage._putFixedUint64, fieldNumber: 774)
       }
       if _storage._putFloatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFloatValue, fieldNumber: 768)
+        try visitor.visitSingularInt32Field(value: _storage._putFloatValue, fieldNumber: 775)
       }
       if _storage._putInt64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putInt64, fieldNumber: 769)
+        try visitor.visitSingularInt32Field(value: _storage._putInt64, fieldNumber: 776)
       }
       if _storage._putStringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putStringValue, fieldNumber: 770)
+        try visitor.visitSingularInt32Field(value: _storage._putStringValue, fieldNumber: 777)
       }
       if _storage._putUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putUint64, fieldNumber: 771)
+        try visitor.visitSingularInt32Field(value: _storage._putUint64, fieldNumber: 778)
       }
       if _storage._putUint64Hex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putUint64Hex, fieldNumber: 772)
+        try visitor.visitSingularInt32Field(value: _storage._putUint64Hex, fieldNumber: 779)
       }
       if _storage._putVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putVarInt, fieldNumber: 773)
+        try visitor.visitSingularInt32Field(value: _storage._putVarInt, fieldNumber: 780)
       }
       if _storage._putZigZagVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putZigZagVarInt, fieldNumber: 774)
+        try visitor.visitSingularInt32Field(value: _storage._putZigZagVarInt, fieldNumber: 781)
       }
       if _storage._pyGenericServices != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pyGenericServices, fieldNumber: 775)
+        try visitor.visitSingularInt32Field(value: _storage._pyGenericServices, fieldNumber: 782)
       }
       if _storage._r != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._r, fieldNumber: 776)
+        try visitor.visitSingularInt32Field(value: _storage._r, fieldNumber: 783)
       }
       if _storage._rawChars != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawChars, fieldNumber: 777)
+        try visitor.visitSingularInt32Field(value: _storage._rawChars, fieldNumber: 784)
       }
       if _storage._rawRepresentable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawRepresentable, fieldNumber: 778)
+        try visitor.visitSingularInt32Field(value: _storage._rawRepresentable, fieldNumber: 785)
       }
       if _storage._rawValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawValue, fieldNumber: 779)
+        try visitor.visitSingularInt32Field(value: _storage._rawValue, fieldNumber: 786)
       }
       if _storage._read4HexDigits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._read4HexDigits, fieldNumber: 780)
+        try visitor.visitSingularInt32Field(value: _storage._read4HexDigits, fieldNumber: 787)
       }
       if _storage._readBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._readBytes, fieldNumber: 781)
+        try visitor.visitSingularInt32Field(value: _storage._readBytes, fieldNumber: 788)
       }
       if _storage._register != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._register, fieldNumber: 782)
+        try visitor.visitSingularInt32Field(value: _storage._register, fieldNumber: 789)
       }
       if _storage._removingAllFieldsOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._removingAllFieldsOf, fieldNumber: 783)
+        try visitor.visitSingularInt32Field(value: _storage._removingAllFieldsOf, fieldNumber: 790)
       }
       if _storage._repeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeated, fieldNumber: 784)
+        try visitor.visitSingularInt32Field(value: _storage._repeated, fieldNumber: 791)
       }
       if _storage._repeatedEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedEnumExtensionField, fieldNumber: 785)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedEnumExtensionField, fieldNumber: 792)
       }
       if _storage._repeatedExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedExtensionField, fieldNumber: 786)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedExtensionField, fieldNumber: 793)
       }
       if _storage._repeatedFieldEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedFieldEncoding, fieldNumber: 787)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedFieldEncoding, fieldNumber: 794)
       }
       if _storage._repeatedGroupExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedGroupExtensionField, fieldNumber: 788)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedGroupExtensionField, fieldNumber: 795)
       }
       if _storage._repeatedMessageExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedMessageExtensionField, fieldNumber: 789)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedMessageExtensionField, fieldNumber: 796)
       }
       if _storage._repeating != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeating, fieldNumber: 790)
+        try visitor.visitSingularInt32Field(value: _storage._repeating, fieldNumber: 797)
       }
       if _storage._replaceRepeatedFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._replaceRepeatedFields, fieldNumber: 791)
+        try visitor.visitSingularInt32Field(value: _storage._replaceRepeatedFields, fieldNumber: 798)
       }
       if _storage._requestStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requestStreaming, fieldNumber: 792)
+        try visitor.visitSingularInt32Field(value: _storage._requestStreaming, fieldNumber: 799)
       }
       if _storage._requestTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requestTypeURL, fieldNumber: 793)
+        try visitor.visitSingularInt32Field(value: _storage._requestTypeURL, fieldNumber: 800)
       }
       if _storage._requiredSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requiredSize, fieldNumber: 794)
+        try visitor.visitSingularInt32Field(value: _storage._requiredSize, fieldNumber: 801)
       }
       if _storage._responseStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._responseStreaming, fieldNumber: 795)
+        try visitor.visitSingularInt32Field(value: _storage._responseStreaming, fieldNumber: 802)
       }
       if _storage._responseTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._responseTypeURL, fieldNumber: 796)
+        try visitor.visitSingularInt32Field(value: _storage._responseTypeURL, fieldNumber: 803)
       }
       if _storage._result != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._result, fieldNumber: 797)
+        try visitor.visitSingularInt32Field(value: _storage._result, fieldNumber: 804)
       }
       if _storage._retention != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._retention, fieldNumber: 798)
+        try visitor.visitSingularInt32Field(value: _storage._retention, fieldNumber: 805)
       }
       if _storage._rethrows != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rethrows, fieldNumber: 799)
+        try visitor.visitSingularInt32Field(value: _storage._rethrows, fieldNumber: 806)
       }
       if _storage._return != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._return, fieldNumber: 800)
+        try visitor.visitSingularInt32Field(value: _storage._return, fieldNumber: 807)
       }
       if _storage._returnType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._returnType, fieldNumber: 801)
+        try visitor.visitSingularInt32Field(value: _storage._returnType, fieldNumber: 808)
       }
       if _storage._revision != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._revision, fieldNumber: 802)
+        try visitor.visitSingularInt32Field(value: _storage._revision, fieldNumber: 809)
       }
       if _storage._rhs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rhs, fieldNumber: 803)
+        try visitor.visitSingularInt32Field(value: _storage._rhs, fieldNumber: 810)
       }
       if _storage._root != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._root, fieldNumber: 804)
+        try visitor.visitSingularInt32Field(value: _storage._root, fieldNumber: 811)
       }
       if _storage._rubyPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rubyPackage, fieldNumber: 805)
+        try visitor.visitSingularInt32Field(value: _storage._rubyPackage, fieldNumber: 812)
       }
       if _storage._s != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._s, fieldNumber: 806)
+        try visitor.visitSingularInt32Field(value: _storage._s, fieldNumber: 813)
       }
       if _storage._sawBackslash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawBackslash, fieldNumber: 807)
+        try visitor.visitSingularInt32Field(value: _storage._sawBackslash, fieldNumber: 814)
       }
       if _storage._sawSection4Characters != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawSection4Characters, fieldNumber: 808)
+        try visitor.visitSingularInt32Field(value: _storage._sawSection4Characters, fieldNumber: 815)
       }
       if _storage._sawSection5Characters != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawSection5Characters, fieldNumber: 809)
+        try visitor.visitSingularInt32Field(value: _storage._sawSection5Characters, fieldNumber: 816)
       }
       if _storage._scan != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._scan, fieldNumber: 810)
+        try visitor.visitSingularInt32Field(value: _storage._scan, fieldNumber: 817)
       }
       if _storage._scanner != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._scanner, fieldNumber: 811)
+        try visitor.visitSingularInt32Field(value: _storage._scanner, fieldNumber: 818)
       }
       if _storage._seconds != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._seconds, fieldNumber: 812)
+        try visitor.visitSingularInt32Field(value: _storage._seconds, fieldNumber: 819)
       }
       if _storage._self_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._self_p, fieldNumber: 813)
+        try visitor.visitSingularInt32Field(value: _storage._self_p, fieldNumber: 820)
       }
       if _storage._semantic != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._semantic, fieldNumber: 814)
+        try visitor.visitSingularInt32Field(value: _storage._semantic, fieldNumber: 821)
       }
       if _storage._sendable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sendable, fieldNumber: 815)
+        try visitor.visitSingularInt32Field(value: _storage._sendable, fieldNumber: 822)
       }
       if _storage._separator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._separator, fieldNumber: 816)
+        try visitor.visitSingularInt32Field(value: _storage._separator, fieldNumber: 823)
       }
       if _storage._serialize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serialize, fieldNumber: 817)
+        try visitor.visitSingularInt32Field(value: _storage._serialize, fieldNumber: 824)
       }
       if _storage._serializedBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedBytes, fieldNumber: 818)
+        try visitor.visitSingularInt32Field(value: _storage._serializedBytes, fieldNumber: 825)
       }
       if _storage._serializedData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedData, fieldNumber: 819)
+        try visitor.visitSingularInt32Field(value: _storage._serializedData, fieldNumber: 826)
       }
       if _storage._serializedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedSize, fieldNumber: 820)
+        try visitor.visitSingularInt32Field(value: _storage._serializedSize, fieldNumber: 827)
       }
       if _storage._serverStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serverStreaming, fieldNumber: 821)
+        try visitor.visitSingularInt32Field(value: _storage._serverStreaming, fieldNumber: 828)
       }
       if _storage._service != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._service, fieldNumber: 822)
+        try visitor.visitSingularInt32Field(value: _storage._service, fieldNumber: 829)
       }
       if _storage._serviceDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serviceDescriptorProto, fieldNumber: 823)
+        try visitor.visitSingularInt32Field(value: _storage._serviceDescriptorProto, fieldNumber: 830)
       }
       if _storage._serviceOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serviceOptions, fieldNumber: 824)
+        try visitor.visitSingularInt32Field(value: _storage._serviceOptions, fieldNumber: 831)
       }
       if _storage._set != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._set, fieldNumber: 825)
+        try visitor.visitSingularInt32Field(value: _storage._set, fieldNumber: 832)
       }
       if _storage._setExtensionValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._setExtensionValue, fieldNumber: 826)
+        try visitor.visitSingularInt32Field(value: _storage._setExtensionValue, fieldNumber: 833)
       }
       if _storage._shift != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._shift, fieldNumber: 827)
+        try visitor.visitSingularInt32Field(value: _storage._shift, fieldNumber: 834)
       }
       if _storage._simpleExtensionMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._simpleExtensionMap, fieldNumber: 828)
+        try visitor.visitSingularInt32Field(value: _storage._simpleExtensionMap, fieldNumber: 835)
       }
       if _storage._size != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._size, fieldNumber: 829)
+        try visitor.visitSingularInt32Field(value: _storage._size, fieldNumber: 836)
       }
       if _storage._sizer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sizer, fieldNumber: 830)
+        try visitor.visitSingularInt32Field(value: _storage._sizer, fieldNumber: 837)
       }
       if _storage._source != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._source, fieldNumber: 831)
+        try visitor.visitSingularInt32Field(value: _storage._source, fieldNumber: 838)
       }
       if _storage._sourceCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceCodeInfo, fieldNumber: 832)
+        try visitor.visitSingularInt32Field(value: _storage._sourceCodeInfo, fieldNumber: 839)
       }
       if _storage._sourceContext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceContext, fieldNumber: 833)
+        try visitor.visitSingularInt32Field(value: _storage._sourceContext, fieldNumber: 840)
       }
       if _storage._sourceEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceEncoding, fieldNumber: 834)
+        try visitor.visitSingularInt32Field(value: _storage._sourceEncoding, fieldNumber: 841)
       }
       if _storage._sourceFile != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceFile, fieldNumber: 835)
+        try visitor.visitSingularInt32Field(value: _storage._sourceFile, fieldNumber: 842)
       }
       if _storage._sourceLocation != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceLocation, fieldNumber: 836)
+        try visitor.visitSingularInt32Field(value: _storage._sourceLocation, fieldNumber: 843)
       }
       if _storage._span != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._span, fieldNumber: 837)
+        try visitor.visitSingularInt32Field(value: _storage._span, fieldNumber: 844)
       }
       if _storage._split != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._split, fieldNumber: 838)
+        try visitor.visitSingularInt32Field(value: _storage._split, fieldNumber: 845)
       }
       if _storage._start != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._start, fieldNumber: 839)
+        try visitor.visitSingularInt32Field(value: _storage._start, fieldNumber: 846)
       }
       if _storage._startArray != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startArray, fieldNumber: 840)
+        try visitor.visitSingularInt32Field(value: _storage._startArray, fieldNumber: 847)
       }
       if _storage._startArrayObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startArrayObject, fieldNumber: 841)
+        try visitor.visitSingularInt32Field(value: _storage._startArrayObject, fieldNumber: 848)
       }
       if _storage._startField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startField, fieldNumber: 842)
+        try visitor.visitSingularInt32Field(value: _storage._startField, fieldNumber: 849)
       }
       if _storage._startIndex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startIndex, fieldNumber: 843)
+        try visitor.visitSingularInt32Field(value: _storage._startIndex, fieldNumber: 850)
       }
       if _storage._startMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startMessageField, fieldNumber: 844)
+        try visitor.visitSingularInt32Field(value: _storage._startMessageField, fieldNumber: 851)
       }
       if _storage._startObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startObject, fieldNumber: 845)
+        try visitor.visitSingularInt32Field(value: _storage._startObject, fieldNumber: 852)
       }
       if _storage._startRegularField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startRegularField, fieldNumber: 846)
+        try visitor.visitSingularInt32Field(value: _storage._startRegularField, fieldNumber: 853)
       }
       if _storage._state != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._state, fieldNumber: 847)
+        try visitor.visitSingularInt32Field(value: _storage._state, fieldNumber: 854)
       }
       if _storage._static != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._static, fieldNumber: 848)
+        try visitor.visitSingularInt32Field(value: _storage._static, fieldNumber: 855)
       }
       if _storage._staticString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._staticString, fieldNumber: 849)
+        try visitor.visitSingularInt32Field(value: _storage._staticString, fieldNumber: 856)
       }
       if _storage._storage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._storage, fieldNumber: 850)
+        try visitor.visitSingularInt32Field(value: _storage._storage, fieldNumber: 857)
       }
       if _storage._string != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._string, fieldNumber: 851)
+        try visitor.visitSingularInt32Field(value: _storage._string, fieldNumber: 858)
       }
       if _storage._stringLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringLiteral, fieldNumber: 852)
+        try visitor.visitSingularInt32Field(value: _storage._stringLiteral, fieldNumber: 859)
       }
       if _storage._stringLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringLiteralType, fieldNumber: 853)
+        try visitor.visitSingularInt32Field(value: _storage._stringLiteralType, fieldNumber: 860)
       }
       if _storage._stringResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringResult, fieldNumber: 854)
+        try visitor.visitSingularInt32Field(value: _storage._stringResult, fieldNumber: 861)
       }
       if _storage._stringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringValue, fieldNumber: 855)
+        try visitor.visitSingularInt32Field(value: _storage._stringValue, fieldNumber: 862)
       }
       if _storage._struct != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._struct, fieldNumber: 856)
+        try visitor.visitSingularInt32Field(value: _storage._struct, fieldNumber: 863)
       }
       if _storage._structValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._structValue, fieldNumber: 857)
+        try visitor.visitSingularInt32Field(value: _storage._structValue, fieldNumber: 864)
       }
       if _storage._subDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subDecoder, fieldNumber: 858)
+        try visitor.visitSingularInt32Field(value: _storage._subDecoder, fieldNumber: 865)
       }
       if _storage._subscript != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subscript, fieldNumber: 859)
+        try visitor.visitSingularInt32Field(value: _storage._subscript, fieldNumber: 866)
       }
       if _storage._subtract != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subtract, fieldNumber: 860)
+        try visitor.visitSingularInt32Field(value: _storage._subtract, fieldNumber: 867)
       }
       if _storage._subVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subVisitor, fieldNumber: 861)
+        try visitor.visitSingularInt32Field(value: _storage._subVisitor, fieldNumber: 868)
       }
       if _storage._swift != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swift, fieldNumber: 862)
+        try visitor.visitSingularInt32Field(value: _storage._swift, fieldNumber: 869)
       }
       if _storage._swiftPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftPrefix, fieldNumber: 863)
+        try visitor.visitSingularInt32Field(value: _storage._swiftPrefix, fieldNumber: 870)
       }
       if _storage._swiftProtobufContiguousBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufContiguousBytes, fieldNumber: 864)
+        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufContiguousBytes, fieldNumber: 871)
       }
       if _storage._swiftProtobufError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufError, fieldNumber: 865)
+        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufError, fieldNumber: 872)
       }
       if _storage._syntax != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._syntax, fieldNumber: 866)
+        try visitor.visitSingularInt32Field(value: _storage._syntax, fieldNumber: 873)
       }
       if _storage._t != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._t, fieldNumber: 867)
+        try visitor.visitSingularInt32Field(value: _storage._t, fieldNumber: 874)
       }
       if _storage._tag != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tag, fieldNumber: 868)
+        try visitor.visitSingularInt32Field(value: _storage._tag, fieldNumber: 875)
       }
       if _storage._targets != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._targets, fieldNumber: 869)
+        try visitor.visitSingularInt32Field(value: _storage._targets, fieldNumber: 876)
       }
       if _storage._terminator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._terminator, fieldNumber: 870)
+        try visitor.visitSingularInt32Field(value: _storage._terminator, fieldNumber: 877)
       }
       if _storage._testDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._testDecoder, fieldNumber: 871)
+        try visitor.visitSingularInt32Field(value: _storage._testDecoder, fieldNumber: 878)
       }
       if _storage._text != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._text, fieldNumber: 872)
+        try visitor.visitSingularInt32Field(value: _storage._text, fieldNumber: 879)
       }
       if _storage._textDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textDecoder, fieldNumber: 873)
+        try visitor.visitSingularInt32Field(value: _storage._textDecoder, fieldNumber: 880)
       }
       if _storage._textFormatDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecoder, fieldNumber: 874)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecoder, fieldNumber: 881)
       }
       if _storage._textFormatDecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingError, fieldNumber: 875)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingError, fieldNumber: 882)
       }
       if _storage._textFormatDecodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingOptions, fieldNumber: 876)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingOptions, fieldNumber: 883)
       }
       if _storage._textFormatEncodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingOptions, fieldNumber: 877)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingOptions, fieldNumber: 884)
       }
       if _storage._textFormatEncodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingVisitor, fieldNumber: 878)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingVisitor, fieldNumber: 885)
       }
       if _storage._textFormatString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatString, fieldNumber: 879)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatString, fieldNumber: 886)
       }
       if _storage._throwOrIgnore != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._throwOrIgnore, fieldNumber: 880)
+        try visitor.visitSingularInt32Field(value: _storage._throwOrIgnore, fieldNumber: 887)
       }
       if _storage._throws != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._throws, fieldNumber: 881)
+        try visitor.visitSingularInt32Field(value: _storage._throws, fieldNumber: 888)
       }
       if _storage._timeInterval != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeInterval, fieldNumber: 882)
+        try visitor.visitSingularInt32Field(value: _storage._timeInterval, fieldNumber: 889)
       }
       if _storage._timeIntervalSince1970 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSince1970, fieldNumber: 883)
+        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSince1970, fieldNumber: 890)
       }
       if _storage._timeIntervalSinceReferenceDate != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSinceReferenceDate, fieldNumber: 884)
+        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSinceReferenceDate, fieldNumber: 891)
       }
       if _storage._timestamp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timestamp, fieldNumber: 885)
+        try visitor.visitSingularInt32Field(value: _storage._timestamp, fieldNumber: 892)
       }
       if _storage._tmp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tmp, fieldNumber: 886)
+        try visitor.visitSingularInt32Field(value: _storage._tmp, fieldNumber: 893)
       }
       if _storage._tooLarge != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tooLarge, fieldNumber: 887)
+        try visitor.visitSingularInt32Field(value: _storage._tooLarge, fieldNumber: 894)
       }
       if _storage._total != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._total, fieldNumber: 888)
+        try visitor.visitSingularInt32Field(value: _storage._total, fieldNumber: 895)
       }
       if _storage._totalArrayDepth != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._totalArrayDepth, fieldNumber: 889)
+        try visitor.visitSingularInt32Field(value: _storage._totalArrayDepth, fieldNumber: 896)
       }
       if _storage._totalSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._totalSize, fieldNumber: 890)
+        try visitor.visitSingularInt32Field(value: _storage._totalSize, fieldNumber: 897)
       }
       if _storage._trailingComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._trailingComments, fieldNumber: 891)
+        try visitor.visitSingularInt32Field(value: _storage._trailingComments, fieldNumber: 898)
       }
       if _storage._traverse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._traverse, fieldNumber: 892)
+        try visitor.visitSingularInt32Field(value: _storage._traverse, fieldNumber: 899)
       }
       if _storage._trim != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._trim, fieldNumber: 893)
+        try visitor.visitSingularInt32Field(value: _storage._trim, fieldNumber: 900)
       }
       if _storage._true != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._true, fieldNumber: 894)
+        try visitor.visitSingularInt32Field(value: _storage._true, fieldNumber: 901)
       }
       if _storage._try != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._try, fieldNumber: 895)
+        try visitor.visitSingularInt32Field(value: _storage._try, fieldNumber: 902)
       }
       if _storage._type != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._type, fieldNumber: 896)
+        try visitor.visitSingularInt32Field(value: _storage._type, fieldNumber: 903)
       }
       if _storage._typealias != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typealias, fieldNumber: 897)
+        try visitor.visitSingularInt32Field(value: _storage._typealias, fieldNumber: 904)
       }
       if _storage._typeEnum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeEnum, fieldNumber: 898)
+        try visitor.visitSingularInt32Field(value: _storage._typeEnum, fieldNumber: 905)
       }
       if _storage._typeName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeName, fieldNumber: 899)
+        try visitor.visitSingularInt32Field(value: _storage._typeName, fieldNumber: 906)
       }
       if _storage._typePrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typePrefix, fieldNumber: 900)
+        try visitor.visitSingularInt32Field(value: _storage._typePrefix, fieldNumber: 907)
       }
       if _storage._typeStart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeStart, fieldNumber: 901)
+        try visitor.visitSingularInt32Field(value: _storage._typeStart, fieldNumber: 908)
       }
       if _storage._typeUnknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeUnknown, fieldNumber: 902)
+        try visitor.visitSingularInt32Field(value: _storage._typeUnknown, fieldNumber: 909)
       }
       if _storage._typeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeURL, fieldNumber: 903)
+        try visitor.visitSingularInt32Field(value: _storage._typeURL, fieldNumber: 910)
       }
       if _storage._uint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint32, fieldNumber: 904)
+        try visitor.visitSingularInt32Field(value: _storage._uint32, fieldNumber: 911)
       }
       if _storage._uint32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint32Value, fieldNumber: 905)
+        try visitor.visitSingularInt32Field(value: _storage._uint32Value, fieldNumber: 912)
       }
       if _storage._uint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint64, fieldNumber: 906)
+        try visitor.visitSingularInt32Field(value: _storage._uint64, fieldNumber: 913)
       }
       if _storage._uint64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint64Value, fieldNumber: 907)
+        try visitor.visitSingularInt32Field(value: _storage._uint64Value, fieldNumber: 914)
       }
       if _storage._uint8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint8, fieldNumber: 908)
+        try visitor.visitSingularInt32Field(value: _storage._uint8, fieldNumber: 915)
       }
       if _storage._unchecked != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unchecked, fieldNumber: 909)
+        try visitor.visitSingularInt32Field(value: _storage._unchecked, fieldNumber: 916)
       }
       if _storage._unicodeScalarLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteral, fieldNumber: 910)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteral, fieldNumber: 917)
       }
       if _storage._unicodeScalarLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteralType, fieldNumber: 911)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteralType, fieldNumber: 918)
       }
       if _storage._unicodeScalars != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalars, fieldNumber: 912)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalars, fieldNumber: 919)
       }
       if _storage._unicodeScalarView != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarView, fieldNumber: 913)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarView, fieldNumber: 920)
       }
       if _storage._uninterpretedOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uninterpretedOption, fieldNumber: 914)
+        try visitor.visitSingularInt32Field(value: _storage._uninterpretedOption, fieldNumber: 921)
       }
       if _storage._union != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._union, fieldNumber: 915)
+        try visitor.visitSingularInt32Field(value: _storage._union, fieldNumber: 922)
       }
       if _storage._uniqueStorage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uniqueStorage, fieldNumber: 916)
+        try visitor.visitSingularInt32Field(value: _storage._uniqueStorage, fieldNumber: 923)
       }
       if _storage._unknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknown, fieldNumber: 917)
+        try visitor.visitSingularInt32Field(value: _storage._unknown, fieldNumber: 924)
       }
       if _storage._unknownFields_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknownFields_p, fieldNumber: 918)
+        try visitor.visitSingularInt32Field(value: _storage._unknownFields_p, fieldNumber: 925)
       }
       if _storage._unknownStorage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknownStorage, fieldNumber: 919)
+        try visitor.visitSingularInt32Field(value: _storage._unknownStorage, fieldNumber: 926)
       }
       if _storage._unpackTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unpackTo, fieldNumber: 920)
+        try visitor.visitSingularInt32Field(value: _storage._unpackTo, fieldNumber: 927)
       }
       if _storage._unsafeBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeBufferPointer, fieldNumber: 921)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeBufferPointer, fieldNumber: 928)
       }
       if _storage._unsafeMutablePointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeMutablePointer, fieldNumber: 922)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeMutablePointer, fieldNumber: 929)
       }
       if _storage._unsafeMutableRawBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeMutableRawBufferPointer, fieldNumber: 923)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeMutableRawBufferPointer, fieldNumber: 930)
       }
       if _storage._unsafeRawBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeRawBufferPointer, fieldNumber: 924)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeRawBufferPointer, fieldNumber: 931)
       }
       if _storage._unsafeRawPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeRawPointer, fieldNumber: 925)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeRawPointer, fieldNumber: 932)
       }
       if _storage._unverifiedLazy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unverifiedLazy, fieldNumber: 926)
+        try visitor.visitSingularInt32Field(value: _storage._unverifiedLazy, fieldNumber: 933)
       }
       if _storage._updatedOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._updatedOptions, fieldNumber: 927)
+        try visitor.visitSingularInt32Field(value: _storage._updatedOptions, fieldNumber: 934)
       }
       if _storage._url != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._url, fieldNumber: 928)
+        try visitor.visitSingularInt32Field(value: _storage._url, fieldNumber: 935)
       }
       if _storage._useDeterministicOrdering != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._useDeterministicOrdering, fieldNumber: 929)
+        try visitor.visitSingularInt32Field(value: _storage._useDeterministicOrdering, fieldNumber: 936)
       }
       if _storage._utf8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8, fieldNumber: 930)
+        try visitor.visitSingularInt32Field(value: _storage._utf8, fieldNumber: 937)
       }
       if _storage._utf8Ptr != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8Ptr, fieldNumber: 931)
+        try visitor.visitSingularInt32Field(value: _storage._utf8Ptr, fieldNumber: 938)
       }
       if _storage._utf8ToDouble != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8ToDouble, fieldNumber: 932)
+        try visitor.visitSingularInt32Field(value: _storage._utf8ToDouble, fieldNumber: 939)
       }
       if _storage._utf8Validation != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8Validation, fieldNumber: 933)
+        try visitor.visitSingularInt32Field(value: _storage._utf8Validation, fieldNumber: 940)
       }
       if _storage._utf8View != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8View, fieldNumber: 934)
+        try visitor.visitSingularInt32Field(value: _storage._utf8View, fieldNumber: 941)
       }
       if _storage._v != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._v, fieldNumber: 935)
+        try visitor.visitSingularInt32Field(value: _storage._v, fieldNumber: 942)
       }
       if _storage._value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._value, fieldNumber: 936)
+        try visitor.visitSingularInt32Field(value: _storage._value, fieldNumber: 943)
       }
       if _storage._valueField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._valueField, fieldNumber: 937)
+        try visitor.visitSingularInt32Field(value: _storage._valueField, fieldNumber: 944)
       }
       if _storage._values != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._values, fieldNumber: 938)
+        try visitor.visitSingularInt32Field(value: _storage._values, fieldNumber: 945)
       }
       if _storage._valueType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._valueType, fieldNumber: 939)
+        try visitor.visitSingularInt32Field(value: _storage._valueType, fieldNumber: 946)
       }
       if _storage._var != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._var, fieldNumber: 940)
+        try visitor.visitSingularInt32Field(value: _storage._var, fieldNumber: 947)
       }
       if _storage._verification != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._verification, fieldNumber: 941)
+        try visitor.visitSingularInt32Field(value: _storage._verification, fieldNumber: 948)
       }
       if _storage._verificationState != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._verificationState, fieldNumber: 942)
+        try visitor.visitSingularInt32Field(value: _storage._verificationState, fieldNumber: 949)
       }
       if _storage._version != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._version, fieldNumber: 943)
+        try visitor.visitSingularInt32Field(value: _storage._version, fieldNumber: 950)
       }
       if _storage._versionString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._versionString, fieldNumber: 944)
+        try visitor.visitSingularInt32Field(value: _storage._versionString, fieldNumber: 951)
       }
       if _storage._visitExtensionFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFields, fieldNumber: 945)
+        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFields, fieldNumber: 952)
       }
       if _storage._visitExtensionFieldsAsMessageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFieldsAsMessageSet, fieldNumber: 946)
+        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFieldsAsMessageSet, fieldNumber: 953)
       }
       if _storage._visitMapField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitMapField, fieldNumber: 947)
+        try visitor.visitSingularInt32Field(value: _storage._visitMapField, fieldNumber: 954)
       }
       if _storage._visitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitor, fieldNumber: 948)
+        try visitor.visitSingularInt32Field(value: _storage._visitor, fieldNumber: 955)
       }
       if _storage._visitPacked != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPacked, fieldNumber: 949)
+        try visitor.visitSingularInt32Field(value: _storage._visitPacked, fieldNumber: 956)
       }
       if _storage._visitPackedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedBoolField, fieldNumber: 950)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedBoolField, fieldNumber: 957)
       }
       if _storage._visitPackedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedDoubleField, fieldNumber: 951)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedDoubleField, fieldNumber: 958)
       }
       if _storage._visitPackedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedEnumField, fieldNumber: 952)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedEnumField, fieldNumber: 959)
       }
       if _storage._visitPackedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed32Field, fieldNumber: 953)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed32Field, fieldNumber: 960)
       }
       if _storage._visitPackedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed64Field, fieldNumber: 954)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed64Field, fieldNumber: 961)
       }
       if _storage._visitPackedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFloatField, fieldNumber: 955)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFloatField, fieldNumber: 962)
       }
       if _storage._visitPackedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt32Field, fieldNumber: 956)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt32Field, fieldNumber: 963)
       }
       if _storage._visitPackedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt64Field, fieldNumber: 957)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt64Field, fieldNumber: 964)
       }
       if _storage._visitPackedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed32Field, fieldNumber: 958)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed32Field, fieldNumber: 965)
       }
       if _storage._visitPackedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed64Field, fieldNumber: 959)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed64Field, fieldNumber: 966)
       }
       if _storage._visitPackedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint32Field, fieldNumber: 960)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint32Field, fieldNumber: 967)
       }
       if _storage._visitPackedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint64Field, fieldNumber: 961)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint64Field, fieldNumber: 968)
       }
       if _storage._visitPackedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint32Field, fieldNumber: 962)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint32Field, fieldNumber: 969)
       }
       if _storage._visitPackedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint64Field, fieldNumber: 963)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint64Field, fieldNumber: 970)
       }
       if _storage._visitRepeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeated, fieldNumber: 964)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeated, fieldNumber: 971)
       }
       if _storage._visitRepeatedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBoolField, fieldNumber: 965)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBoolField, fieldNumber: 972)
       }
       if _storage._visitRepeatedBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBytesField, fieldNumber: 966)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBytesField, fieldNumber: 973)
       }
       if _storage._visitRepeatedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedDoubleField, fieldNumber: 967)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedDoubleField, fieldNumber: 974)
       }
       if _storage._visitRepeatedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedEnumField, fieldNumber: 968)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedEnumField, fieldNumber: 975)
       }
       if _storage._visitRepeatedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed32Field, fieldNumber: 969)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed32Field, fieldNumber: 976)
       }
       if _storage._visitRepeatedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed64Field, fieldNumber: 970)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed64Field, fieldNumber: 977)
       }
       if _storage._visitRepeatedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFloatField, fieldNumber: 971)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFloatField, fieldNumber: 978)
       }
       if _storage._visitRepeatedGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedGroupField, fieldNumber: 972)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedGroupField, fieldNumber: 979)
       }
       if _storage._visitRepeatedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt32Field, fieldNumber: 973)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt32Field, fieldNumber: 980)
       }
       if _storage._visitRepeatedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt64Field, fieldNumber: 974)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt64Field, fieldNumber: 981)
       }
       if _storage._visitRepeatedMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedMessageField, fieldNumber: 975)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedMessageField, fieldNumber: 982)
       }
       if _storage._visitRepeatedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed32Field, fieldNumber: 976)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed32Field, fieldNumber: 983)
       }
       if _storage._visitRepeatedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed64Field, fieldNumber: 977)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed64Field, fieldNumber: 984)
       }
       if _storage._visitRepeatedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint32Field, fieldNumber: 978)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint32Field, fieldNumber: 985)
       }
       if _storage._visitRepeatedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint64Field, fieldNumber: 979)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint64Field, fieldNumber: 986)
       }
       if _storage._visitRepeatedStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedStringField, fieldNumber: 980)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedStringField, fieldNumber: 987)
       }
       if _storage._visitRepeatedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint32Field, fieldNumber: 981)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint32Field, fieldNumber: 988)
       }
       if _storage._visitRepeatedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint64Field, fieldNumber: 982)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint64Field, fieldNumber: 989)
       }
       if _storage._visitSingular != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingular, fieldNumber: 983)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingular, fieldNumber: 990)
       }
       if _storage._visitSingularBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularBoolField, fieldNumber: 984)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularBoolField, fieldNumber: 991)
       }
       if _storage._visitSingularBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularBytesField, fieldNumber: 985)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularBytesField, fieldNumber: 992)
       }
       if _storage._visitSingularDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularDoubleField, fieldNumber: 986)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularDoubleField, fieldNumber: 993)
       }
       if _storage._visitSingularEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularEnumField, fieldNumber: 987)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularEnumField, fieldNumber: 994)
       }
       if _storage._visitSingularFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed32Field, fieldNumber: 988)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed32Field, fieldNumber: 995)
       }
       if _storage._visitSingularFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed64Field, fieldNumber: 989)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed64Field, fieldNumber: 996)
       }
       if _storage._visitSingularFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFloatField, fieldNumber: 990)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFloatField, fieldNumber: 997)
       }
       if _storage._visitSingularGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularGroupField, fieldNumber: 991)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularGroupField, fieldNumber: 998)
       }
       if _storage._visitSingularInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt32Field, fieldNumber: 992)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt32Field, fieldNumber: 999)
       }
       if _storage._visitSingularInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt64Field, fieldNumber: 993)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt64Field, fieldNumber: 1000)
       }
       if _storage._visitSingularMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularMessageField, fieldNumber: 994)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularMessageField, fieldNumber: 1001)
       }
       if _storage._visitSingularSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed32Field, fieldNumber: 995)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed32Field, fieldNumber: 1002)
       }
       if _storage._visitSingularSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed64Field, fieldNumber: 996)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed64Field, fieldNumber: 1003)
       }
       if _storage._visitSingularSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint32Field, fieldNumber: 997)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint32Field, fieldNumber: 1004)
       }
       if _storage._visitSingularSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint64Field, fieldNumber: 998)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint64Field, fieldNumber: 1005)
       }
       if _storage._visitSingularStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularStringField, fieldNumber: 999)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularStringField, fieldNumber: 1006)
       }
       if _storage._visitSingularUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint32Field, fieldNumber: 1000)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint32Field, fieldNumber: 1007)
       }
       if _storage._visitSingularUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint64Field, fieldNumber: 1001)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint64Field, fieldNumber: 1008)
       }
       if _storage._visitUnknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitUnknown, fieldNumber: 1002)
+        try visitor.visitSingularInt32Field(value: _storage._visitUnknown, fieldNumber: 1009)
       }
       if _storage._wasDecoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wasDecoded, fieldNumber: 1003)
+        try visitor.visitSingularInt32Field(value: _storage._wasDecoded, fieldNumber: 1010)
       }
       if _storage._weak != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._weak, fieldNumber: 1004)
+        try visitor.visitSingularInt32Field(value: _storage._weak, fieldNumber: 1011)
       }
       if _storage._weakDependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._weakDependency, fieldNumber: 1005)
+        try visitor.visitSingularInt32Field(value: _storage._weakDependency, fieldNumber: 1012)
       }
       if _storage._where != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._where, fieldNumber: 1006)
+        try visitor.visitSingularInt32Field(value: _storage._where, fieldNumber: 1013)
       }
       if _storage._wireFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wireFormat, fieldNumber: 1007)
+        try visitor.visitSingularInt32Field(value: _storage._wireFormat, fieldNumber: 1014)
       }
       if _storage._with != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._with, fieldNumber: 1008)
+        try visitor.visitSingularInt32Field(value: _storage._with, fieldNumber: 1015)
       }
       if _storage._withUnsafeBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._withUnsafeBytes, fieldNumber: 1009)
+        try visitor.visitSingularInt32Field(value: _storage._withUnsafeBytes, fieldNumber: 1016)
       }
       if _storage._withUnsafeMutableBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._withUnsafeMutableBytes, fieldNumber: 1010)
+        try visitor.visitSingularInt32Field(value: _storage._withUnsafeMutableBytes, fieldNumber: 1017)
       }
       if _storage._work != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._work, fieldNumber: 1011)
+        try visitor.visitSingularInt32Field(value: _storage._work, fieldNumber: 1018)
       }
       if _storage._wrapped != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrapped, fieldNumber: 1012)
+        try visitor.visitSingularInt32Field(value: _storage._wrapped, fieldNumber: 1019)
       }
       if _storage._wrappedType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrappedType, fieldNumber: 1013)
+        try visitor.visitSingularInt32Field(value: _storage._wrappedType, fieldNumber: 1020)
       }
       if _storage._wrappedValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrappedValue, fieldNumber: 1014)
+        try visitor.visitSingularInt32Field(value: _storage._wrappedValue, fieldNumber: 1021)
       }
       if _storage._written != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._written, fieldNumber: 1015)
+        try visitor.visitSingularInt32Field(value: _storage._written, fieldNumber: 1022)
       }
       if _storage._yday != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._yday, fieldNumber: 1016)
+        try visitor.visitSingularInt32Field(value: _storage._yday, fieldNumber: 1023)
       }
     }
     try unknownFields.traverse(visitor: &visitor)
@@ -12383,6 +12467,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._clearEditionIntroduced_p != rhs_storage._clearEditionIntroduced_p {return false}
         if _storage._clearEditionRemoved_p != rhs_storage._clearEditionRemoved_p {return false}
         if _storage._clearEnd_p != rhs_storage._clearEnd_p {return false}
+        if _storage._clearEnforceNamingStyle_p != rhs_storage._clearEnforceNamingStyle_p {return false}
         if _storage._clearEnumType_p != rhs_storage._clearEnumType_p {return false}
         if _storage._clearExtendee_p != rhs_storage._clearExtendee_p {return false}
         if _storage._clearExtensionValue_p != rhs_storage._clearExtensionValue_p {return false}
@@ -12565,6 +12650,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._emitFieldName != rhs_storage._emitFieldName {return false}
         if _storage._emitFieldNumber != rhs_storage._emitFieldNumber {return false}
         if _storage._empty != rhs_storage._empty {return false}
+        if _storage._emptyAnyTypeURL != rhs_storage._emptyAnyTypeURL {return false}
         if _storage._emptyData != rhs_storage._emptyData {return false}
         if _storage._encodeAsBytes != rhs_storage._encodeAsBytes {return false}
         if _storage._encoded != rhs_storage._encoded {return false}
@@ -12577,6 +12663,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._endMessageField != rhs_storage._endMessageField {return false}
         if _storage._endObject != rhs_storage._endObject {return false}
         if _storage._endRegularField != rhs_storage._endRegularField {return false}
+        if _storage._enforceNamingStyle != rhs_storage._enforceNamingStyle {return false}
         if _storage._enum != rhs_storage._enum {return false}
         if _storage._enumDescriptorProto != rhs_storage._enumDescriptorProto {return false}
         if _storage._enumOptions != rhs_storage._enumOptions {return false}
@@ -12740,6 +12827,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._hasEditionIntroduced_p != rhs_storage._hasEditionIntroduced_p {return false}
         if _storage._hasEditionRemoved_p != rhs_storage._hasEditionRemoved_p {return false}
         if _storage._hasEnd_p != rhs_storage._hasEnd_p {return false}
+        if _storage._hasEnforceNamingStyle_p != rhs_storage._hasEnforceNamingStyle_p {return false}
         if _storage._hasEnumType_p != rhs_storage._hasEnumType_p {return false}
         if _storage._hasExtendee_p != rhs_storage._hasExtendee_p {return false}
         if _storage._hasExtensionValue_p != rhs_storage._hasExtensionValue_p {return false}
@@ -12841,6 +12929,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._intersect != rhs_storage._intersect {return false}
         if _storage._into != rhs_storage._into {return false}
         if _storage._ints != rhs_storage._ints {return false}
+        if _storage._invalidAnyTypeURL != rhs_storage._invalidAnyTypeURL {return false}
         if _storage._isA != rhs_storage._isA {return false}
         if _storage._isEqual != rhs_storage._isEqual {return false}
         if _storage._isEqualTo != rhs_storage._isEqualTo {return false}
@@ -12858,9 +12947,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._javaPackage != rhs_storage._javaPackage {return false}
         if _storage._javaStringCheckUtf8 != rhs_storage._javaStringCheckUtf8 {return false}
         if _storage._jsondecoder != rhs_storage._jsondecoder {return false}
+        if _storage._jsondecoding != rhs_storage._jsondecoding {return false}
         if _storage._jsondecodingError != rhs_storage._jsondecodingError {return false}
         if _storage._jsondecodingOptions != rhs_storage._jsondecodingOptions {return false}
         if _storage._jsonEncoder != rhs_storage._jsonEncoder {return false}
+        if _storage._jsonencoding != rhs_storage._jsonencoding {return false}
         if _storage._jsonencodingError != rhs_storage._jsonencodingError {return false}
         if _storage._jsonencodingOptions != rhs_storage._jsonencodingOptions {return false}
         if _storage._jsonencodingVisitor != rhs_storage._jsonencodingVisitor {return false}
diff --git a/Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift b/Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift
index 32db4ebda..a57f8d8d0 100644
--- a/Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift
+++ b/Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift
@@ -1183,6 +1183,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct clearEnforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var clearEnforceNamingStyle_p: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct clearEnumType: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -3187,7 +3199,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
-  struct Duration: Sendable {
+  struct duration: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
@@ -3367,6 +3379,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct emptyAnyTypeURL: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var emptyAnyTypeURL: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct emptyData: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -3511,6 +3535,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct enforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var enforceNamingStyle: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct enumMessage: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -5467,6 +5503,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct hasEnforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var hasEnforceNamingStyle_p: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct hasEnumType: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6679,6 +6727,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct invalidAnyTypeURL: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var invalidAnyTypeURL: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct isA: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6883,6 +6943,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct JSONDecoding: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var jsondecoding: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct JSONDecodingError: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6919,6 +6991,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct JSONEncoding: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var jsonencoding: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct JSONEncodingError: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -15321,6 +15405,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnd: S
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".clearEnforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "clearEnforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.clearEnforceNamingStyle_p) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.clearEnforceNamingStyle_p != 0 {
+      try visitor.visitSingularInt32Field(value: self.clearEnforceNamingStyle_p, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle) -> Bool {
+    if lhs.clearEnforceNamingStyle_p != rhs.clearEnforceNamingStyle_p {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnumType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".clearEnumType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -20665,10 +20781,10 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.doubleValue
   }
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".Duration"
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".duration"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "Duration"),
+    1: .same(proto: "duration"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -20690,7 +20806,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration: S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration) -> Bool {
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration) -> Bool {
     if lhs.duration != rhs.duration {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
@@ -21145,6 +21261,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Empty: Swif
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".emptyAnyTypeURL"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "emptyAnyTypeURL"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.emptyAnyTypeURL) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.emptyAnyTypeURL != 0 {
+      try visitor.visitSingularInt32Field(value: self.emptyAnyTypeURL, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL) -> Bool {
+    if lhs.emptyAnyTypeURL != rhs.emptyAnyTypeURL {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".emptyData"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -21529,6 +21677,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.endRegularF
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".enforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "enforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.enforceNamingStyle) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.enforceNamingStyle != 0 {
+      try visitor.visitSingularInt32Field(value: self.enforceNamingStyle, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle) -> Bool {
+    if lhs.enforceNamingStyle != rhs.enforceNamingStyle {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".enum"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -26745,6 +26925,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnd: Swi
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".hasEnforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "hasEnforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.hasEnforceNamingStyle_p) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.hasEnforceNamingStyle_p != 0 {
+      try visitor.visitSingularInt32Field(value: self.hasEnforceNamingStyle_p, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle) -> Bool {
+    if lhs.hasEnforceNamingStyle_p != rhs.hasEnforceNamingStyle_p {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnumType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".hasEnumType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -29977,6 +30189,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.ints: Swift
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".invalidAnyTypeURL"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "invalidAnyTypeURL"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.invalidAnyTypeURL) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.invalidAnyTypeURL != 0 {
+      try visitor.visitSingularInt32Field(value: self.invalidAnyTypeURL, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL) -> Bool {
+    if lhs.invalidAnyTypeURL != rhs.invalidAnyTypeURL {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.isA: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".isA"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -30521,6 +30765,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoder
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONDecoding"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "JSONDecoding"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.jsondecoding) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.jsondecoding != 0 {
+      try visitor.visitSingularInt32Field(value: self.jsondecoding, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding) -> Bool {
+    if lhs.jsondecoding != rhs.jsondecoding {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecodingError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONDecodingError"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -30617,6 +30893,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.jsonEncoder
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONEncoding"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "JSONEncoding"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.jsonencoding) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.jsonencoding != 0 {
+      try visitor.visitSingularInt32Field(value: self.jsonencoding, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding) -> Bool {
+    if lhs.jsonencoding != rhs.jsonencoding {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncodingError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONEncodingError"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
diff --git a/Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift b/Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift
index 64700e62c..d24962fd6 100644
--- a/Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift
+++ b/Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: SwiftPro
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Editions_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2_editions.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
     clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions:
   ProtobufTestMessages_Editions_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.editions.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Messag
     return true
   }
 }
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Reference/upstream/google/protobuf/any_test.pb.swift b/Reference/upstream/google/protobuf/any_test.pb.swift
index 05050022f..bdec60ca6 100644
--- a/Reference/upstream/google/protobuf/any_test.pb.swift
+++ b/Reference/upstream/google/protobuf/any_test.pb.swift
@@ -27,7 +27,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestAny: Sendable {
+struct Proto2Unittest_TestAny: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -56,9 +56,9 @@ struct ProtobufUnittest_TestAny: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestAny: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAny: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAny"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "int32_value"),
@@ -102,7 +102,7 @@ extension ProtobufUnittest_TestAny: SwiftProtobuf.Message, SwiftProtobuf._Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAny, rhs: ProtobufUnittest_TestAny) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAny, rhs: Proto2Unittest_TestAny) -> Bool {
     if lhs.int32Value != rhs.int32Value {return false}
     if lhs._anyValue != rhs._anyValue {return false}
     if lhs.repeatedAnyValue != rhs.repeatedAnyValue {return false}
diff --git a/Reference/upstream/google/protobuf/descriptor.pb.swift b/Reference/upstream/google/protobuf/descriptor.pb.swift
index f278e3881..dfd5e89a6 100644
--- a/Reference/upstream/google/protobuf/descriptor.pb.swift
+++ b/Reference/upstream/google/protobuf/descriptor.pb.swift
@@ -2244,6 +2244,15 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   /// Clears the value of `jsonFormat`. Subsequent reads from it will return its default value.
   mutating func clearJsonFormat() {self._jsonFormat = nil}
 
+  var enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle {
+    get {return _enforceNamingStyle ?? .unknown}
+    set {_enforceNamingStyle = newValue}
+  }
+  /// Returns true if `enforceNamingStyle` has been explicitly set.
+  var hasEnforceNamingStyle: Bool {return self._enforceNamingStyle != nil}
+  /// Clears the value of `enforceNamingStyle`. Subsequent reads from it will return its default value.
+  mutating func clearEnforceNamingStyle() {self._enforceNamingStyle = nil}
+
   var unknownFields = UnknownStorage()
 
   enum FieldPresence: Int, Enum, Swift.CaseIterable {
@@ -2313,6 +2322,17 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
 
   }
 
+  enum EnforceNamingStyle: Int, Enum, Swift.CaseIterable {
+    case unknown = 0
+    case style2024 = 1
+    case styleLegacy = 2
+
+    init() {
+      self = .unknown
+    }
+
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = ExtensionFieldValueSet()
@@ -2322,6 +2342,7 @@ struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   fileprivate var _utf8Validation: Google_Protobuf_FeatureSet.Utf8Validation? = nil
   fileprivate var _messageEncoding: Google_Protobuf_FeatureSet.MessageEncoding? = nil
   fileprivate var _jsonFormat: Google_Protobuf_FeatureSet.JsonFormat? = nil
+  fileprivate var _enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle? = nil
 }
 
 /// A compiled specification for the defaults of a set of features.  These
@@ -4843,6 +4864,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     4: .standard(proto: "utf8_validation"),
     5: .standard(proto: "message_encoding"),
     6: .standard(proto: "json_format"),
+    7: .standard(proto: "enforce_naming_style"),
   ]
 
   public var isInitialized: Bool {
@@ -4862,6 +4884,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
       case 4: try { try decoder.decodeSingularEnumField(value: &self._utf8Validation) }()
       case 5: try { try decoder.decodeSingularEnumField(value: &self._messageEncoding) }()
       case 6: try { try decoder.decodeSingularEnumField(value: &self._jsonFormat) }()
+      case 7: try { try decoder.decodeSingularEnumField(value: &self._enforceNamingStyle) }()
       case 1000..<10001:
         try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Google_Protobuf_FeatureSet.self, fieldNumber: fieldNumber) }()
       default: break
@@ -4892,6 +4915,9 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     try { if let v = self._jsonFormat {
       try visitor.visitSingularEnumField(value: v, fieldNumber: 6)
     } }()
+    try { if let v = self._enforceNamingStyle {
+      try visitor.visitSingularEnumField(value: v, fieldNumber: 7)
+    } }()
     try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 1000, end: 10001)
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -4903,6 +4929,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     if lhs._utf8Validation != rhs._utf8Validation {return false}
     if lhs._messageEncoding != rhs._messageEncoding {return false}
     if lhs._jsonFormat != rhs._jsonFormat {return false}
+    if lhs._enforceNamingStyle != rhs._enforceNamingStyle {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
@@ -4958,6 +4985,14 @@ extension Google_Protobuf_FeatureSet.JsonFormat: _ProtoNameProviding {
   ]
 }
 
+extension Google_Protobuf_FeatureSet.EnforceNamingStyle: _ProtoNameProviding {
+  static let _protobuf_nameMap: _NameMap = [
+    0: .same(proto: "ENFORCE_NAMING_STYLE_UNKNOWN"),
+    1: .same(proto: "STYLE2024"),
+    2: .same(proto: "STYLE_LEGACY"),
+  ]
+}
+
 extension Google_Protobuf_FeatureSetDefaults: Message, _MessageImplementationBase, _ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FeatureSetDefaults"
   static let _protobuf_nameMap: _NameMap = [
diff --git a/Reference/upstream/google/protobuf/edition_unittest.pb.swift b/Reference/upstream/google/protobuf/edition_unittest.pb.swift
index 6d3171398..dec46e056 100644
--- a/Reference/upstream/google/protobuf/edition_unittest.pb.swift
+++ b/Reference/upstream/google/protobuf/edition_unittest.pb.swift
@@ -371,8 +371,8 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -398,7 +398,7 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignEnum() {_uniqueStorage()._optionalForeignEnum = nil}
 
-  var optionalImportEnum: ProtobufUnittestImport_ImportEnum {
+  var optionalImportEnum: Proto2UnittestImport_ImportEnum {
     get {return _storage._optionalImportEnum ?? .importFoo}
     set {_uniqueStorage()._optionalImportEnum = newValue}
   }
@@ -435,8 +435,8 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
   mutating func clearOptionalBytesCord() {_uniqueStorage()._optionalBytesCord = nil}
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -553,7 +553,7 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
@@ -568,7 +568,7 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignEnum = newValue}
   }
 
-  var repeatedImportEnum: [ProtobufUnittestImport_ImportEnum] {
+  var repeatedImportEnum: [Proto2UnittestImport_ImportEnum] {
     get {return _storage._repeatedImportEnum}
     set {_uniqueStorage()._repeatedImportEnum = newValue}
   }
@@ -742,7 +742,7 @@ struct EditionUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `defaultForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearDefaultForeignEnum() {_uniqueStorage()._defaultForeignEnum = nil}
 
-  var defaultImportEnum: ProtobufUnittestImport_ImportEnum {
+  var defaultImportEnum: Proto2UnittestImport_ImportEnum {
     get {return _storage._defaultImportEnum ?? .importBar}
     set {_uniqueStorage()._defaultImportEnum = newValue}
   }
@@ -2590,7 +2590,7 @@ struct EditionUnittest_TestIsInitialized: Sendable {
 /// Test that groups have disjoint field numbers from their siblings and
 /// parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
 /// to compile with proto1, this will emit an error; so we only include it
-/// in protobuf_unittest_proto.
+/// in proto2_unittest_proto.
 struct EditionUnittest_TestDupFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -7817,8 +7817,8 @@ extension EditionUnittest_TestAllExtensions {
     clearExtensionValue(ext: EditionUnittest_Extensions_optional_foreign_message_extension)
   }
 
-  var EditionUnittest_optionalImportMessageExtension: ProtobufUnittestImport_ImportMessage {
-    get {return getExtensionValue(ext: EditionUnittest_Extensions_optional_import_message_extension) ?? ProtobufUnittestImport_ImportMessage()}
+  var EditionUnittest_optionalImportMessageExtension: Proto2UnittestImport_ImportMessage {
+    get {return getExtensionValue(ext: EditionUnittest_Extensions_optional_import_message_extension) ?? Proto2UnittestImport_ImportMessage()}
     set {setExtensionValue(ext: EditionUnittest_Extensions_optional_import_message_extension, value: newValue)}
   }
   /// Returns true if extension `EditionUnittest_Extensions_optional_import_message_extension`
@@ -7862,7 +7862,7 @@ extension EditionUnittest_TestAllExtensions {
     clearExtensionValue(ext: EditionUnittest_Extensions_optional_foreign_enum_extension)
   }
 
-  var EditionUnittest_optionalImportEnumExtension: ProtobufUnittestImport_ImportEnum {
+  var EditionUnittest_optionalImportEnumExtension: Proto2UnittestImport_ImportEnum {
     get {return getExtensionValue(ext: EditionUnittest_Extensions_optional_import_enum_extension) ?? .importFoo}
     set {setExtensionValue(ext: EditionUnittest_Extensions_optional_import_enum_extension, value: newValue)}
   }
@@ -7924,8 +7924,8 @@ extension EditionUnittest_TestAllExtensions {
     clearExtensionValue(ext: EditionUnittest_Extensions_optional_bytes_cord_extension)
   }
 
-  var EditionUnittest_optionalPublicImportMessageExtension: ProtobufUnittestImport_PublicImportMessage {
-    get {return getExtensionValue(ext: EditionUnittest_Extensions_optional_public_import_message_extension) ?? ProtobufUnittestImport_PublicImportMessage()}
+  var EditionUnittest_optionalPublicImportMessageExtension: Proto2UnittestImport_PublicImportMessage {
+    get {return getExtensionValue(ext: EditionUnittest_Extensions_optional_public_import_message_extension) ?? Proto2UnittestImport_PublicImportMessage()}
     set {setExtensionValue(ext: EditionUnittest_Extensions_optional_public_import_message_extension, value: newValue)}
   }
   /// Returns true if extension `EditionUnittest_Extensions_optional_public_import_message_extension`
@@ -8060,7 +8060,7 @@ extension EditionUnittest_TestAllExtensions {
     set {setExtensionValue(ext: EditionUnittest_Extensions_repeated_foreign_message_extension, value: newValue)}
   }
 
-  var EditionUnittest_repeatedImportMessageExtension: [ProtobufUnittestImport_ImportMessage] {
+  var EditionUnittest_repeatedImportMessageExtension: [Proto2UnittestImport_ImportMessage] {
     get {return getExtensionValue(ext: EditionUnittest_Extensions_repeated_import_message_extension) ?? []}
     set {setExtensionValue(ext: EditionUnittest_Extensions_repeated_import_message_extension, value: newValue)}
   }
@@ -8075,7 +8075,7 @@ extension EditionUnittest_TestAllExtensions {
     set {setExtensionValue(ext: EditionUnittest_Extensions_repeated_foreign_enum_extension, value: newValue)}
   }
 
-  var EditionUnittest_repeatedImportEnumExtension: [ProtobufUnittestImport_ImportEnum] {
+  var EditionUnittest_repeatedImportEnumExtension: [Proto2UnittestImport_ImportEnum] {
     get {return getExtensionValue(ext: EditionUnittest_Extensions_repeated_import_enum_extension) ?? []}
     set {setExtensionValue(ext: EditionUnittest_Extensions_repeated_import_enum_extension, value: newValue)}
   }
@@ -8353,7 +8353,7 @@ extension EditionUnittest_TestAllExtensions {
     clearExtensionValue(ext: EditionUnittest_Extensions_default_foreign_enum_extension)
   }
 
-  var EditionUnittest_defaultImportEnumExtension: ProtobufUnittestImport_ImportEnum {
+  var EditionUnittest_defaultImportEnumExtension: Proto2UnittestImport_ImportEnum {
     get {return getExtensionValue(ext: EditionUnittest_Extensions_default_import_enum_extension) ?? .importBar}
     set {setExtensionValue(ext: EditionUnittest_Extensions_default_import_enum_extension, value: newValue)}
   }
@@ -9198,7 +9198,7 @@ let EditionUnittest_Extensions_optional_foreign_message_extension = SwiftProtobu
   fieldName: "edition_unittest.optional_foreign_message_extension"
 )
 
-let EditionUnittest_Extensions_optional_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_ImportMessage>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_optional_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_ImportMessage>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 20,
   fieldName: "edition_unittest.optional_import_message_extension"
 )
@@ -9213,7 +9213,7 @@ let EditionUnittest_Extensions_optional_foreign_enum_extension = SwiftProtobuf.M
   fieldName: "edition_unittest.optional_foreign_enum_extension"
 )
 
-let EditionUnittest_Extensions_optional_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_optional_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 23,
   fieldName: "edition_unittest.optional_import_enum_extension"
 )
@@ -9235,7 +9235,7 @@ let EditionUnittest_Extensions_optional_bytes_cord_extension = SwiftProtobuf.Mes
   fieldName: "edition_unittest.optional_bytes_cord_extension"
 )
 
-let EditionUnittest_Extensions_optional_public_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_PublicImportMessage>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_optional_public_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_PublicImportMessage>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 26,
   fieldName: "edition_unittest.optional_public_import_message_extension"
 )
@@ -9341,7 +9341,7 @@ let EditionUnittest_Extensions_repeated_foreign_message_extension = SwiftProtobu
   fieldName: "edition_unittest.repeated_foreign_message_extension"
 )
 
-let EditionUnittest_Extensions_repeated_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittestImport_ImportMessage>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_repeated_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2UnittestImport_ImportMessage>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 50,
   fieldName: "edition_unittest.repeated_import_message_extension"
 )
@@ -9356,7 +9356,7 @@ let EditionUnittest_Extensions_repeated_foreign_enum_extension = SwiftProtobuf.M
   fieldName: "edition_unittest.repeated_foreign_enum_extension"
 )
 
-let EditionUnittest_Extensions_repeated_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<ProtobufUnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_repeated_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<Proto2UnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 53,
   fieldName: "edition_unittest.repeated_import_enum_extension"
 )
@@ -9464,7 +9464,7 @@ let EditionUnittest_Extensions_default_foreign_enum_extension = SwiftProtobuf.Me
   fieldName: "edition_unittest.default_foreign_enum_extension"
 )
 
-let EditionUnittest_Extensions_default_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
+let EditionUnittest_Extensions_default_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnum>, EditionUnittest_TestAllExtensions>(
   _protobuf_fieldNumber: 83,
   fieldName: "edition_unittest.default_import_enum_extension"
 )
@@ -10135,14 +10135,14 @@ extension EditionUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _optionalGroup: EditionUnittest_TestAllTypes.OptionalGroup? = nil
     var _optionalNestedMessage: EditionUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: EditionUnittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _optionalNestedEnum: EditionUnittest_TestAllTypes.NestedEnum? = nil
     var _optionalForeignEnum: EditionUnittest_ForeignEnum? = nil
-    var _optionalImportEnum: ProtobufUnittestImport_ImportEnum? = nil
+    var _optionalImportEnum: Proto2UnittestImport_ImportEnum? = nil
     var _optionalStringPiece: String? = nil
     var _optionalCord: String? = nil
     var _optionalBytesCord: Data? = nil
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
     var _optionalLazyMessage: EditionUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalUnverifiedLazyMessage: EditionUnittest_TestAllTypes.NestedMessage? = nil
     var _repeatedInt32: [Int32] = []
@@ -10163,10 +10163,10 @@ extension EditionUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _repeatedGroup: [EditionUnittest_TestAllTypes.RepeatedGroup] = []
     var _repeatedNestedMessage: [EditionUnittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [EditionUnittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
     var _repeatedNestedEnum: [EditionUnittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [EditionUnittest_ForeignEnum] = []
-    var _repeatedImportEnum: [ProtobufUnittestImport_ImportEnum] = []
+    var _repeatedImportEnum: [Proto2UnittestImport_ImportEnum] = []
     var _repeatedStringPiece: [String] = []
     var _repeatedCord: [String] = []
     var _repeatedLazyMessage: [EditionUnittest_TestAllTypes.NestedMessage] = []
@@ -10187,7 +10187,7 @@ extension EditionUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _defaultBytes: Data? = nil
     var _defaultNestedEnum: EditionUnittest_TestAllTypes.NestedEnum? = nil
     var _defaultForeignEnum: EditionUnittest_ForeignEnum? = nil
-    var _defaultImportEnum: ProtobufUnittestImport_ImportEnum? = nil
+    var _defaultImportEnum: Proto2UnittestImport_ImportEnum? = nil
     var _defaultStringPiece: String? = nil
     var _defaultCord: String? = nil
     var _oneofField: EditionUnittest_TestAllTypes.OneOf_OneofField?
diff --git a/Reference/upstream/google/protobuf/late_loaded_option.pb.swift b/Reference/upstream/google/protobuf/late_loaded_option.pb.swift
index cbc409a0c..ab6721bb4 100644
--- a/Reference/upstream/google/protobuf/late_loaded_option.pb.swift
+++ b/Reference/upstream/google/protobuf/late_loaded_option.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_LateLoadedOption: Sendable {
+struct Proto2Unittest_LateLoadedOption: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -52,51 +52,51 @@ struct ProtobufUnittest_LateLoadedOption: Sendable {
 
 extension SwiftProtobuf.Google_Protobuf_MessageOptions {
 
-  var ProtobufUnittest_LateLoadedOption_ext: ProtobufUnittest_LateLoadedOption {
-    get {return getExtensionValue(ext: ProtobufUnittest_LateLoadedOption.Extensions.ext) ?? ProtobufUnittest_LateLoadedOption()}
-    set {setExtensionValue(ext: ProtobufUnittest_LateLoadedOption.Extensions.ext, value: newValue)}
+  var Proto2Unittest_LateLoadedOption_ext: Proto2Unittest_LateLoadedOption {
+    get {return getExtensionValue(ext: Proto2Unittest_LateLoadedOption.Extensions.ext) ?? Proto2Unittest_LateLoadedOption()}
+    set {setExtensionValue(ext: Proto2Unittest_LateLoadedOption.Extensions.ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_LateLoadedOption.Extensions.ext`
+  /// Returns true if extension `Proto2Unittest_LateLoadedOption.Extensions.ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_LateLoadedOption_ext: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_LateLoadedOption.Extensions.ext)
+  var hasProto2Unittest_LateLoadedOption_ext: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_LateLoadedOption.Extensions.ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_LateLoadedOption.Extensions.ext`.
+  /// Clears the value of extension `Proto2Unittest_LateLoadedOption.Extensions.ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_LateLoadedOption_ext() {
-    clearExtensionValue(ext: ProtobufUnittest_LateLoadedOption.Extensions.ext)
+  mutating func clearProto2Unittest_LateLoadedOption_ext() {
+    clearExtensionValue(ext: Proto2Unittest_LateLoadedOption.Extensions.ext)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_LateLoadedOption_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_LateLoadedOption_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_LateLoadedOption_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_LateLoadedOption.Extensions.ext
+let Proto2Unittest_LateLoadedOption_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_LateLoadedOption.Extensions.ext
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-extension ProtobufUnittest_LateLoadedOption {
+extension Proto2Unittest_LateLoadedOption {
   enum Extensions {
-    static let ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_LateLoadedOption>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+    static let ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_LateLoadedOption>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
       _protobuf_fieldNumber: 95126892,
-      fieldName: "protobuf_unittest.LateLoadedOption.ext"
+      fieldName: "proto2_unittest.LateLoadedOption.ext"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_LateLoadedOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LateLoadedOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".LateLoadedOption"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "value"),
@@ -125,7 +125,7 @@ extension ProtobufUnittest_LateLoadedOption: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LateLoadedOption, rhs: ProtobufUnittest_LateLoadedOption) -> Bool {
+  static func ==(lhs: Proto2Unittest_LateLoadedOption, rhs: Proto2Unittest_LateLoadedOption) -> Bool {
     if lhs._value != rhs._value {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/late_loaded_option_user.pb.swift b/Reference/upstream/google/protobuf/late_loaded_option_user.pb.swift
index 5f55d28d2..66ffcba27 100644
--- a/Reference/upstream/google/protobuf/late_loaded_option_user.pb.swift
+++ b/Reference/upstream/google/protobuf/late_loaded_option_user.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_LateLoadedOptionUser: Sendable {
+struct Proto2Unittest_LateLoadedOptionUser: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -32,9 +32,9 @@ struct ProtobufUnittest_LateLoadedOptionUser: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_LateLoadedOptionUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LateLoadedOptionUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".LateLoadedOptionUser"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -47,7 +47,7 @@ extension ProtobufUnittest_LateLoadedOptionUser: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LateLoadedOptionUser, rhs: ProtobufUnittest_LateLoadedOptionUser) -> Bool {
+  static func ==(lhs: Proto2Unittest_LateLoadedOptionUser, rhs: Proto2Unittest_LateLoadedOptionUser) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
diff --git a/Reference/upstream/google/protobuf/map_lite_unittest.pb.swift b/Reference/upstream/google/protobuf/map_lite_unittest.pb.swift
index e99719c93..f3e445afa 100644
--- a/Reference/upstream/google/protobuf/map_lite_unittest.pb.swift
+++ b/Reference/upstream/google/protobuf/map_lite_unittest.pb.swift
@@ -28,7 +28,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_Proto2MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_Proto2MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case proto2MapEnumFooLite = 0
   case proto2MapEnumBarLite = 1
   case proto2MapEnumBazLite = 2
@@ -39,7 +39,7 @@ enum ProtobufUnittest_Proto2MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIter
 
 }
 
-enum ProtobufUnittest_Proto2MapEnumPlusExtraLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_Proto2MapEnumPlusExtraLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case eProto2MapEnumFooLite = 0
   case eProto2MapEnumBarLite = 1
   case eProto2MapEnumBazLite = 2
@@ -51,7 +51,7 @@ enum ProtobufUnittest_Proto2MapEnumPlusExtraLite: Int, SwiftProtobuf.Enum, Swift
 
 }
 
-enum ProtobufUnittest_MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case mapEnumFooLite = 0
   case mapEnumBarLite = 1
   case mapEnumBazLite = 2
@@ -62,7 +62,7 @@ enum ProtobufUnittest_MapEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
 
 }
 
-struct ProtobufUnittest_TestMapLite: @unchecked Sendable {
+struct Proto2Unittest_TestMapLite: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -142,12 +142,12 @@ struct ProtobufUnittest_TestMapLite: @unchecked Sendable {
     set {_uniqueStorage()._mapInt32Bytes = newValue}
   }
 
-  var mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnumLite> {
+  var mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnumLite> {
     get {return _storage._mapInt32Enum}
     set {_uniqueStorage()._mapInt32Enum = newValue}
   }
 
-  var mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessageLite> {
+  var mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageLite> {
     get {return _storage._mapInt32ForeignMessage}
     set {_uniqueStorage()._mapInt32ForeignMessage = newValue}
   }
@@ -164,7 +164,7 @@ struct ProtobufUnittest_TestMapLite: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestArenaMapLite: @unchecked Sendable {
+struct Proto2Unittest_TestArenaMapLite: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -244,12 +244,12 @@ struct ProtobufUnittest_TestArenaMapLite: @unchecked Sendable {
     set {_uniqueStorage()._mapInt32Bytes = newValue}
   }
 
-  var mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnumLite> {
+  var mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnumLite> {
     get {return _storage._mapInt32Enum}
     set {_uniqueStorage()._mapInt32Enum = newValue}
   }
 
-  var mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessageArenaLite> {
+  var mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageArenaLite> {
     get {return _storage._mapInt32ForeignMessage}
     set {_uniqueStorage()._mapInt32ForeignMessage = newValue}
   }
@@ -262,59 +262,59 @@ struct ProtobufUnittest_TestArenaMapLite: @unchecked Sendable {
 }
 
 /// Test embedded message with required fields
-struct ProtobufUnittest_TestRequiredMessageMapLite: Sendable {
+struct Proto2Unittest_TestRequiredMessageMapLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mapField: Dictionary<Int32,ProtobufUnittest_TestRequiredLite> = [:]
+  var mapField: Dictionary<Int32,Proto2Unittest_TestRequiredLite> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestEnumMapLite: Sendable {
+struct Proto2Unittest_TestEnumMapLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var knownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumLite> = [:]
+  var knownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumLite> = [:]
 
-  var unknownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumLite> = [:]
+  var unknownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumLite> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestEnumMapPlusExtraLite: Sendable {
+struct Proto2Unittest_TestEnumMapPlusExtraLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var knownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtraLite> = [:]
+  var knownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtraLite> = [:]
 
-  var unknownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtraLite> = [:]
+  var unknownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtraLite> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestMessageMapLite: Sendable {
+struct Proto2Unittest_TestMessageMapLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mapInt32Message: Dictionary<Int32,ProtobufUnittest_TestAllTypesLite> = [:]
+  var mapInt32Message: Dictionary<Int32,Proto2Unittest_TestAllTypesLite> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestRequiredLite: Sendable {
+struct Proto2Unittest_TestRequiredLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -355,7 +355,7 @@ struct ProtobufUnittest_TestRequiredLite: Sendable {
   fileprivate var _c: Int32? = nil
 }
 
-struct ProtobufUnittest_ForeignMessageArenaLite: Sendable {
+struct Proto2Unittest_ForeignMessageArenaLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -385,53 +385,53 @@ struct ProtobufUnittest_ForeignMessageArenaLite: Sendable {
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_TestAllExtensionsLite {
+extension Proto2Unittest_TestAllExtensionsLite {
 
-  var ProtobufUnittest_TestRequiredLite_single: ProtobufUnittest_TestRequiredLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestRequiredLite.Extensions.single) ?? ProtobufUnittest_TestRequiredLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestRequiredLite.Extensions.single, value: newValue)}
+  var Proto2Unittest_TestRequiredLite_single: Proto2Unittest_TestRequiredLite {
+    get {return getExtensionValue(ext: Proto2Unittest_TestRequiredLite.Extensions.single) ?? Proto2Unittest_TestRequiredLite()}
+    set {setExtensionValue(ext: Proto2Unittest_TestRequiredLite.Extensions.single, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestRequiredLite.Extensions.single`
+  /// Returns true if extension `Proto2Unittest_TestRequiredLite.Extensions.single`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestRequiredLite_single: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestRequiredLite.Extensions.single)
+  var hasProto2Unittest_TestRequiredLite_single: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestRequiredLite.Extensions.single)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestRequiredLite.Extensions.single`.
+  /// Clears the value of extension `Proto2Unittest_TestRequiredLite.Extensions.single`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestRequiredLite_single() {
-    clearExtensionValue(ext: ProtobufUnittest_TestRequiredLite.Extensions.single)
+  mutating func clearProto2Unittest_TestRequiredLite_single() {
+    clearExtensionValue(ext: Proto2Unittest_TestRequiredLite.Extensions.single)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_MapLiteUnittest_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_MapLiteUnittest_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_MapLiteUnittest_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_TestRequiredLite.Extensions.single
+let Proto2Unittest_MapLiteUnittest_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_TestRequiredLite.Extensions.single
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-extension ProtobufUnittest_TestRequiredLite {
+extension Proto2Unittest_TestRequiredLite {
   enum Extensions {
-    static let single = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestRequiredLite>, ProtobufUnittest_TestAllExtensionsLite>(
+    static let single = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestRequiredLite>, Proto2Unittest_TestAllExtensionsLite>(
       _protobuf_fieldNumber: 1000,
-      fieldName: "protobuf_unittest.TestRequiredLite.single"
+      fieldName: "proto2_unittest.TestRequiredLite.single"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_Proto2MapEnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Proto2MapEnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "PROTO2_MAP_ENUM_FOO_LITE"),
     1: .same(proto: "PROTO2_MAP_ENUM_BAR_LITE"),
@@ -439,7 +439,7 @@ extension ProtobufUnittest_Proto2MapEnumLite: SwiftProtobuf._ProtoNameProviding
   ]
 }
 
-extension ProtobufUnittest_Proto2MapEnumPlusExtraLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Proto2MapEnumPlusExtraLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "E_PROTO2_MAP_ENUM_FOO_LITE"),
     1: .same(proto: "E_PROTO2_MAP_ENUM_BAR_LITE"),
@@ -448,7 +448,7 @@ extension ProtobufUnittest_Proto2MapEnumPlusExtraLite: SwiftProtobuf._ProtoNameP
   ]
 }
 
-extension ProtobufUnittest_MapEnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MapEnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "MAP_ENUM_FOO_LITE"),
     1: .same(proto: "MAP_ENUM_BAR_LITE"),
@@ -456,7 +456,7 @@ extension ProtobufUnittest_MapEnumLite: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMapLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_int32"),
@@ -495,8 +495,8 @@ extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _mapBoolBool: Dictionary<Bool,Bool> = [:]
     var _mapStringString: Dictionary<String,String> = [:]
     var _mapInt32Bytes: Dictionary<Int32,Data> = [:]
-    var _mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnumLite> = [:]
-    var _mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessageLite> = [:]
+    var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnumLite> = [:]
+    var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageLite> = [:]
     var _teboring: Dictionary<Int32,Int32> = [:]
 
     #if swift(>=5.10)
@@ -563,8 +563,8 @@ extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Me
         case 13: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
         case 14: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
         case 15: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapInt32Bytes) }()
-        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnumLite>.self, value: &_storage._mapInt32Enum) }()
-        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessageLite>.self, value: &_storage._mapInt32ForeignMessage) }()
+        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnumLite>.self, value: &_storage._mapInt32Enum) }()
+        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessageLite>.self, value: &_storage._mapInt32ForeignMessage) }()
         case 18: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: &_storage._teboring) }()
         default: break
         }
@@ -620,10 +620,10 @@ extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Me
         try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapInt32Bytes, fieldNumber: 15)
       }
       if !_storage._mapInt32Enum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnumLite>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnumLite>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
       }
       if !_storage._mapInt32ForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessageLite>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessageLite>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
       }
       if !_storage._teboring.isEmpty {
         try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: _storage._teboring, fieldNumber: 18)
@@ -632,7 +632,7 @@ extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMapLite, rhs: ProtobufUnittest_TestMapLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMapLite, rhs: Proto2Unittest_TestMapLite) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -664,7 +664,7 @@ extension ProtobufUnittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Me
   }
 }
 
-extension ProtobufUnittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestArenaMapLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_int32"),
@@ -702,8 +702,8 @@ extension ProtobufUnittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobu
     var _mapBoolBool: Dictionary<Bool,Bool> = [:]
     var _mapStringString: Dictionary<String,String> = [:]
     var _mapInt32Bytes: Dictionary<Int32,Data> = [:]
-    var _mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnumLite> = [:]
-    var _mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessageArenaLite> = [:]
+    var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnumLite> = [:]
+    var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageArenaLite> = [:]
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -768,8 +768,8 @@ extension ProtobufUnittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobu
         case 13: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
         case 14: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
         case 15: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapInt32Bytes) }()
-        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnumLite>.self, value: &_storage._mapInt32Enum) }()
-        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessageArenaLite>.self, value: &_storage._mapInt32ForeignMessage) }()
+        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnumLite>.self, value: &_storage._mapInt32Enum) }()
+        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessageArenaLite>.self, value: &_storage._mapInt32ForeignMessage) }()
         default: break
         }
       }
@@ -824,16 +824,16 @@ extension ProtobufUnittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobu
         try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapInt32Bytes, fieldNumber: 15)
       }
       if !_storage._mapInt32Enum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnumLite>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnumLite>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
       }
       if !_storage._mapInt32ForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessageArenaLite>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessageArenaLite>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
       }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestArenaMapLite, rhs: ProtobufUnittest_TestArenaMapLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestArenaMapLite, rhs: Proto2Unittest_TestArenaMapLite) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -864,7 +864,7 @@ extension ProtobufUnittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_TestRequiredMessageMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredMessageMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredMessageMapLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_field"),
@@ -881,7 +881,7 @@ extension ProtobufUnittest_TestRequiredMessageMapLite: SwiftProtobuf.Message, Sw
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestRequiredLite>.self, value: &self.mapField) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestRequiredLite>.self, value: &self.mapField) }()
       default: break
       }
     }
@@ -889,19 +889,19 @@ extension ProtobufUnittest_TestRequiredMessageMapLite: SwiftProtobuf.Message, Sw
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestRequiredLite>.self, value: self.mapField, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestRequiredLite>.self, value: self.mapField, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredMessageMapLite, rhs: ProtobufUnittest_TestRequiredMessageMapLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredMessageMapLite, rhs: Proto2Unittest_TestRequiredMessageMapLite) -> Bool {
     if lhs.mapField != rhs.mapField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEnumMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnumMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEnumMapLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     101: .standard(proto: "known_map_field"),
@@ -914,8 +914,8 @@ extension ProtobufUnittest_TestEnumMapLite: SwiftProtobuf.Message, SwiftProtobuf
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumLite>.self, value: &self.knownMapField) }()
-      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumLite>.self, value: &self.unknownMapField) }()
+      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumLite>.self, value: &self.knownMapField) }()
+      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumLite>.self, value: &self.unknownMapField) }()
       default: break
       }
     }
@@ -923,15 +923,15 @@ extension ProtobufUnittest_TestEnumMapLite: SwiftProtobuf.Message, SwiftProtobuf
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.knownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumLite>.self, value: self.knownMapField, fieldNumber: 101)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumLite>.self, value: self.knownMapField, fieldNumber: 101)
     }
     if !self.unknownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumLite>.self, value: self.unknownMapField, fieldNumber: 102)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumLite>.self, value: self.unknownMapField, fieldNumber: 102)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEnumMapLite, rhs: ProtobufUnittest_TestEnumMapLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEnumMapLite, rhs: Proto2Unittest_TestEnumMapLite) -> Bool {
     if lhs.knownMapField != rhs.knownMapField {return false}
     if lhs.unknownMapField != rhs.unknownMapField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -939,7 +939,7 @@ extension ProtobufUnittest_TestEnumMapLite: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TestEnumMapPlusExtraLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnumMapPlusExtraLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEnumMapPlusExtraLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     101: .standard(proto: "known_map_field"),
@@ -952,8 +952,8 @@ extension ProtobufUnittest_TestEnumMapPlusExtraLite: SwiftProtobuf.Message, Swif
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtraLite>.self, value: &self.knownMapField) }()
-      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtraLite>.self, value: &self.unknownMapField) }()
+      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtraLite>.self, value: &self.knownMapField) }()
+      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtraLite>.self, value: &self.unknownMapField) }()
       default: break
       }
     }
@@ -961,15 +961,15 @@ extension ProtobufUnittest_TestEnumMapPlusExtraLite: SwiftProtobuf.Message, Swif
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.knownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtraLite>.self, value: self.knownMapField, fieldNumber: 101)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtraLite>.self, value: self.knownMapField, fieldNumber: 101)
     }
     if !self.unknownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtraLite>.self, value: self.unknownMapField, fieldNumber: 102)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtraLite>.self, value: self.unknownMapField, fieldNumber: 102)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEnumMapPlusExtraLite, rhs: ProtobufUnittest_TestEnumMapPlusExtraLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEnumMapPlusExtraLite, rhs: Proto2Unittest_TestEnumMapPlusExtraLite) -> Bool {
     if lhs.knownMapField != rhs.knownMapField {return false}
     if lhs.unknownMapField != rhs.unknownMapField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -977,7 +977,7 @@ extension ProtobufUnittest_TestEnumMapPlusExtraLite: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestMessageMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageMapLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageMapLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_message"),
@@ -989,7 +989,7 @@ extension ProtobufUnittest_TestMessageMapLite: SwiftProtobuf.Message, SwiftProto
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypesLite>.self, value: &self.mapInt32Message) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypesLite>.self, value: &self.mapInt32Message) }()
       default: break
       }
     }
@@ -997,19 +997,19 @@ extension ProtobufUnittest_TestMessageMapLite: SwiftProtobuf.Message, SwiftProto
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mapInt32Message.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypesLite>.self, value: self.mapInt32Message, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypesLite>.self, value: self.mapInt32Message, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageMapLite, rhs: ProtobufUnittest_TestMessageMapLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageMapLite, rhs: Proto2Unittest_TestMessageMapLite) -> Bool {
     if lhs.mapInt32Message != rhs.mapInt32Message {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestRequiredLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -1055,7 +1055,7 @@ extension ProtobufUnittest_TestRequiredLite: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredLite, rhs: ProtobufUnittest_TestRequiredLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredLite, rhs: Proto2Unittest_TestRequiredLite) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs._c != rhs._c {return false}
@@ -1064,7 +1064,7 @@ extension ProtobufUnittest_TestRequiredLite: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_ForeignMessageArenaLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignMessageArenaLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageArenaLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "c"),
@@ -1093,7 +1093,7 @@ extension ProtobufUnittest_ForeignMessageArenaLite: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ForeignMessageArenaLite, rhs: ProtobufUnittest_ForeignMessageArenaLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_ForeignMessageArenaLite, rhs: Proto2Unittest_ForeignMessageArenaLite) -> Bool {
     if lhs._c != rhs._c {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/map_proto2_unittest.pb.swift b/Reference/upstream/google/protobuf/map_proto2_unittest.pb.swift
index 6689304db..672cc1d4a 100644
--- a/Reference/upstream/google/protobuf/map_proto2_unittest.pb.swift
+++ b/Reference/upstream/google/protobuf/map_proto2_unittest.pb.swift
@@ -28,7 +28,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_Proto2MapEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_Proto2MapEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case foo = 0
   case bar = 1
   case baz = 2
@@ -39,7 +39,7 @@ enum ProtobufUnittest_Proto2MapEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable
 
 }
 
-enum ProtobufUnittest_Proto2MapEnumPlusExtra: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_Proto2MapEnumPlusExtra: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case eProto2MapEnumFoo = 0
   case eProto2MapEnumBar = 1
   case eProto2MapEnumBaz = 2
@@ -51,97 +51,97 @@ enum ProtobufUnittest_Proto2MapEnumPlusExtra: Int, SwiftProtobuf.Enum, Swift.Cas
 
 }
 
-struct ProtobufUnittest_TestEnumMap: Sendable {
+struct Proto2Unittest_TestEnumMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var knownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var knownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnum> = [:]
 
   /// Other maps with all key types to test the unknown entry serialization
-  var unknownMapFieldInt64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldInt64: Dictionary<Int64,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldUint64: Dictionary<UInt64,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldUint64: Dictionary<UInt64,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldInt32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldInt32: Dictionary<Int32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldUint32: Dictionary<UInt32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldUint32: Dictionary<UInt32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldFixed32: Dictionary<UInt32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldFixed32: Dictionary<UInt32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldFixed64: Dictionary<UInt64,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldFixed64: Dictionary<UInt64,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldBool: Dictionary<Bool,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldBool: Dictionary<Bool,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldString: Dictionary<String,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldString: Dictionary<String,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldSint32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldSint32: Dictionary<Int32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldSint64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldSint64: Dictionary<Int64,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldSfixed32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldSfixed32: Dictionary<Int32,Proto2Unittest_Proto2MapEnum> = [:]
 
-  var unknownMapFieldSfixed64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnum> = [:]
+  var unknownMapFieldSfixed64: Dictionary<Int64,Proto2Unittest_Proto2MapEnum> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestEnumMapPlusExtra: Sendable {
+struct Proto2Unittest_TestEnumMapPlusExtra: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var knownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var knownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapField: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapField: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
   /// Other maps with all key types to test the unknown entry serialization
-  var unknownMapFieldInt64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldInt64: Dictionary<Int64,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldUint64: Dictionary<UInt64,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldUint64: Dictionary<UInt64,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldInt32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldInt32: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldUint32: Dictionary<UInt32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldUint32: Dictionary<UInt32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldFixed32: Dictionary<UInt32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldFixed32: Dictionary<UInt32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldFixed64: Dictionary<UInt64,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldFixed64: Dictionary<UInt64,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldBool: Dictionary<Bool,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldBool: Dictionary<Bool,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldString: Dictionary<String,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldString: Dictionary<String,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldSint32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldSint32: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldSint64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldSint64: Dictionary<Int64,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldSfixed32: Dictionary<Int32,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldSfixed32: Dictionary<Int32,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
-  var unknownMapFieldSfixed64: Dictionary<Int64,ProtobufUnittest_Proto2MapEnumPlusExtra> = [:]
+  var unknownMapFieldSfixed64: Dictionary<Int64,Proto2Unittest_Proto2MapEnumPlusExtra> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestImportEnumMap: Sendable {
+struct Proto2Unittest_TestImportEnumMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var importEnumAmp: Dictionary<Int32,ProtobufUnittestImport_ImportEnumForMap> = [:]
+  var importEnumAmp: Dictionary<Int32,Proto2UnittestImport_ImportEnumForMap> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestIntIntMap: Sendable {
+struct Proto2Unittest_TestIntIntMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -154,34 +154,34 @@ struct ProtobufUnittest_TestIntIntMap: Sendable {
 }
 
 /// Test all key types: string, plus the non-floating-point scalars.
-struct ProtobufUnittest_TestMaps: Sendable {
+struct Proto2Unittest_TestMaps: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mInt32: Dictionary<Int32,ProtobufUnittest_TestIntIntMap> = [:]
+  var mInt32: Dictionary<Int32,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mInt64: Dictionary<Int64,ProtobufUnittest_TestIntIntMap> = [:]
+  var mInt64: Dictionary<Int64,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mUint32: Dictionary<UInt32,ProtobufUnittest_TestIntIntMap> = [:]
+  var mUint32: Dictionary<UInt32,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mUint64: Dictionary<UInt64,ProtobufUnittest_TestIntIntMap> = [:]
+  var mUint64: Dictionary<UInt64,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mSint32: Dictionary<Int32,ProtobufUnittest_TestIntIntMap> = [:]
+  var mSint32: Dictionary<Int32,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mSint64: Dictionary<Int64,ProtobufUnittest_TestIntIntMap> = [:]
+  var mSint64: Dictionary<Int64,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mFixed32: Dictionary<UInt32,ProtobufUnittest_TestIntIntMap> = [:]
+  var mFixed32: Dictionary<UInt32,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mFixed64: Dictionary<UInt64,ProtobufUnittest_TestIntIntMap> = [:]
+  var mFixed64: Dictionary<UInt64,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mSfixed32: Dictionary<Int32,ProtobufUnittest_TestIntIntMap> = [:]
+  var mSfixed32: Dictionary<Int32,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mSfixed64: Dictionary<Int64,ProtobufUnittest_TestIntIntMap> = [:]
+  var mSfixed64: Dictionary<Int64,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mBool: Dictionary<Bool,ProtobufUnittest_TestIntIntMap> = [:]
+  var mBool: Dictionary<Bool,Proto2Unittest_TestIntIntMap> = [:]
 
-  var mString: Dictionary<String,ProtobufUnittest_TestIntIntMap> = [:]
+  var mString: Dictionary<String,Proto2Unittest_TestIntIntMap> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -189,13 +189,13 @@ struct ProtobufUnittest_TestMaps: Sendable {
 }
 
 /// Test maps in submessages.
-struct ProtobufUnittest_TestSubmessageMaps: Sendable {
+struct Proto2Unittest_TestSubmessageMaps: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var m: ProtobufUnittest_TestMaps {
-    get {return _m ?? ProtobufUnittest_TestMaps()}
+  var m: Proto2Unittest_TestMaps {
+    get {return _m ?? Proto2Unittest_TestMaps()}
     set {_m = newValue}
   }
   /// Returns true if `m` has been explicitly set.
@@ -207,10 +207,10 @@ struct ProtobufUnittest_TestSubmessageMaps: Sendable {
 
   init() {}
 
-  fileprivate var _m: ProtobufUnittest_TestMaps? = nil
+  fileprivate var _m: Proto2Unittest_TestMaps? = nil
 }
 
-struct ProtobufUnittest_TestProto2BytesMap: Sendable {
+struct Proto2Unittest_TestProto2BytesMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -226,9 +226,9 @@ struct ProtobufUnittest_TestProto2BytesMap: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_Proto2MapEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Proto2MapEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "PROTO2_MAP_ENUM_FOO"),
     1: .same(proto: "PROTO2_MAP_ENUM_BAR"),
@@ -236,7 +236,7 @@ extension ProtobufUnittest_Proto2MapEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_Proto2MapEnumPlusExtra: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Proto2MapEnumPlusExtra: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "E_PROTO2_MAP_ENUM_FOO"),
     1: .same(proto: "E_PROTO2_MAP_ENUM_BAR"),
@@ -245,7 +245,7 @@ extension ProtobufUnittest_Proto2MapEnumPlusExtra: SwiftProtobuf._ProtoNameProvi
   ]
 }
 
-extension ProtobufUnittest_TestEnumMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnumMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEnumMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     101: .standard(proto: "known_map_field"),
@@ -270,20 +270,20 @@ extension ProtobufUnittest_TestEnumMap: SwiftProtobuf.Message, SwiftProtobuf._Me
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.knownMapField) }()
-      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapField) }()
-      case 200: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldInt64) }()
-      case 201: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldUint64) }()
-      case 202: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldInt32) }()
-      case 203: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldUint32) }()
-      case 204: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldFixed32) }()
-      case 205: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldFixed64) }()
-      case 206: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldBool) }()
-      case 207: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldString) }()
-      case 208: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSint32) }()
-      case 209: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSint64) }()
-      case 210: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSfixed32) }()
-      case 211: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSfixed64) }()
+      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: &self.knownMapField) }()
+      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapField) }()
+      case 200: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldInt64) }()
+      case 201: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldUint64) }()
+      case 202: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldInt32) }()
+      case 203: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldUint32) }()
+      case 204: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldFixed32) }()
+      case 205: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldFixed64) }()
+      case 206: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldBool) }()
+      case 207: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldString) }()
+      case 208: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSint32) }()
+      case 209: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSint64) }()
+      case 210: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSfixed32) }()
+      case 211: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_Proto2MapEnum>.self, value: &self.unknownMapFieldSfixed64) }()
       default: break
       }
     }
@@ -291,51 +291,51 @@ extension ProtobufUnittest_TestEnumMap: SwiftProtobuf.Message, SwiftProtobuf._Me
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.knownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: self.knownMapField, fieldNumber: 101)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: self.knownMapField, fieldNumber: 101)
     }
     if !self.unknownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapField, fieldNumber: 102)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapField, fieldNumber: 102)
     }
     if !self.unknownMapFieldInt64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldInt64, fieldNumber: 200)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldInt64, fieldNumber: 200)
     }
     if !self.unknownMapFieldUint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldUint64, fieldNumber: 201)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldUint64, fieldNumber: 201)
     }
     if !self.unknownMapFieldInt32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldInt32, fieldNumber: 202)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldInt32, fieldNumber: 202)
     }
     if !self.unknownMapFieldUint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldUint32, fieldNumber: 203)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldUint32, fieldNumber: 203)
     }
     if !self.unknownMapFieldFixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldFixed32, fieldNumber: 204)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldFixed32, fieldNumber: 204)
     }
     if !self.unknownMapFieldFixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldFixed64, fieldNumber: 205)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldFixed64, fieldNumber: 205)
     }
     if !self.unknownMapFieldBool.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldBool, fieldNumber: 206)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldBool, fieldNumber: 206)
     }
     if !self.unknownMapFieldString.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldString, fieldNumber: 207)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldString, fieldNumber: 207)
     }
     if !self.unknownMapFieldSint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldSint32, fieldNumber: 208)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldSint32, fieldNumber: 208)
     }
     if !self.unknownMapFieldSint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldSint64, fieldNumber: 209)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldSint64, fieldNumber: 209)
     }
     if !self.unknownMapFieldSfixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldSfixed32, fieldNumber: 210)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldSfixed32, fieldNumber: 210)
     }
     if !self.unknownMapFieldSfixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_Proto2MapEnum>.self, value: self.unknownMapFieldSfixed64, fieldNumber: 211)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_Proto2MapEnum>.self, value: self.unknownMapFieldSfixed64, fieldNumber: 211)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEnumMap, rhs: ProtobufUnittest_TestEnumMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEnumMap, rhs: Proto2Unittest_TestEnumMap) -> Bool {
     if lhs.knownMapField != rhs.knownMapField {return false}
     if lhs.unknownMapField != rhs.unknownMapField {return false}
     if lhs.unknownMapFieldInt64 != rhs.unknownMapFieldInt64 {return false}
@@ -355,7 +355,7 @@ extension ProtobufUnittest_TestEnumMap: SwiftProtobuf.Message, SwiftProtobuf._Me
   }
 }
 
-extension ProtobufUnittest_TestEnumMapPlusExtra: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnumMapPlusExtra: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEnumMapPlusExtra"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     101: .standard(proto: "known_map_field"),
@@ -380,20 +380,20 @@ extension ProtobufUnittest_TestEnumMapPlusExtra: SwiftProtobuf.Message, SwiftPro
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.knownMapField) }()
-      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapField) }()
-      case 200: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldInt64) }()
-      case 201: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldUint64) }()
-      case 202: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldInt32) }()
-      case 203: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldUint32) }()
-      case 204: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldFixed32) }()
-      case 205: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldFixed64) }()
-      case 206: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldBool) }()
-      case 207: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldString) }()
-      case 208: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSint32) }()
-      case 209: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSint64) }()
-      case 210: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSfixed32) }()
-      case 211: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSfixed64) }()
+      case 101: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.knownMapField) }()
+      case 102: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapField) }()
+      case 200: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldInt64) }()
+      case 201: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldUint64) }()
+      case 202: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldInt32) }()
+      case 203: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldUint32) }()
+      case 204: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldFixed32) }()
+      case 205: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldFixed64) }()
+      case 206: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldBool) }()
+      case 207: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldString) }()
+      case 208: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSint32) }()
+      case 209: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSint64) }()
+      case 210: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSfixed32) }()
+      case 211: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: &self.unknownMapFieldSfixed64) }()
       default: break
       }
     }
@@ -401,51 +401,51 @@ extension ProtobufUnittest_TestEnumMapPlusExtra: SwiftProtobuf.Message, SwiftPro
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.knownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.knownMapField, fieldNumber: 101)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.knownMapField, fieldNumber: 101)
     }
     if !self.unknownMapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapField, fieldNumber: 102)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapField, fieldNumber: 102)
     }
     if !self.unknownMapFieldInt64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldInt64, fieldNumber: 200)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldInt64, fieldNumber: 200)
     }
     if !self.unknownMapFieldUint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldUint64, fieldNumber: 201)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldUint64, fieldNumber: 201)
     }
     if !self.unknownMapFieldInt32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldInt32, fieldNumber: 202)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldInt32, fieldNumber: 202)
     }
     if !self.unknownMapFieldUint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldUint32, fieldNumber: 203)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldUint32, fieldNumber: 203)
     }
     if !self.unknownMapFieldFixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldFixed32, fieldNumber: 204)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldFixed32, fieldNumber: 204)
     }
     if !self.unknownMapFieldFixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldFixed64, fieldNumber: 205)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldFixed64, fieldNumber: 205)
     }
     if !self.unknownMapFieldBool.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldBool, fieldNumber: 206)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldBool, fieldNumber: 206)
     }
     if !self.unknownMapFieldString.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldString, fieldNumber: 207)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldString, fieldNumber: 207)
     }
     if !self.unknownMapFieldSint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSint32, fieldNumber: 208)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSint32, fieldNumber: 208)
     }
     if !self.unknownMapFieldSint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSint64, fieldNumber: 209)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSint64, fieldNumber: 209)
     }
     if !self.unknownMapFieldSfixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSfixed32, fieldNumber: 210)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSfixed32, fieldNumber: 210)
     }
     if !self.unknownMapFieldSfixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSfixed64, fieldNumber: 211)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_Proto2MapEnumPlusExtra>.self, value: self.unknownMapFieldSfixed64, fieldNumber: 211)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEnumMapPlusExtra, rhs: ProtobufUnittest_TestEnumMapPlusExtra) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEnumMapPlusExtra, rhs: Proto2Unittest_TestEnumMapPlusExtra) -> Bool {
     if lhs.knownMapField != rhs.knownMapField {return false}
     if lhs.unknownMapField != rhs.unknownMapField {return false}
     if lhs.unknownMapFieldInt64 != rhs.unknownMapFieldInt64 {return false}
@@ -465,7 +465,7 @@ extension ProtobufUnittest_TestEnumMapPlusExtra: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestImportEnumMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestImportEnumMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestImportEnumMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "import_enum_amp"),
@@ -477,7 +477,7 @@ extension ProtobufUnittest_TestImportEnumMap: SwiftProtobuf.Message, SwiftProtob
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittestImport_ImportEnumForMap>.self, value: &self.importEnumAmp) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2UnittestImport_ImportEnumForMap>.self, value: &self.importEnumAmp) }()
       default: break
       }
     }
@@ -485,19 +485,19 @@ extension ProtobufUnittest_TestImportEnumMap: SwiftProtobuf.Message, SwiftProtob
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.importEnumAmp.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittestImport_ImportEnumForMap>.self, value: self.importEnumAmp, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2UnittestImport_ImportEnumForMap>.self, value: self.importEnumAmp, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestImportEnumMap, rhs: ProtobufUnittest_TestImportEnumMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestImportEnumMap, rhs: Proto2Unittest_TestImportEnumMap) -> Bool {
     if lhs.importEnumAmp != rhs.importEnumAmp {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestIntIntMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestIntIntMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestIntIntMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "m"),
@@ -522,14 +522,14 @@ extension ProtobufUnittest_TestIntIntMap: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestIntIntMap, rhs: ProtobufUnittest_TestIntIntMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestIntIntMap, rhs: Proto2Unittest_TestIntIntMap) -> Bool {
     if lhs.m != rhs.m {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMaps: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMaps: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMaps"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "m_int32"),
@@ -552,18 +552,18 @@ extension ProtobufUnittest_TestMaps: SwiftProtobuf.Message, SwiftProtobuf._Messa
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestIntIntMap>.self, value: &self.mInt32) }()
-      case 2: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_TestIntIntMap>.self, value: &self.mInt64) }()
-      case 3: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_TestIntIntMap>.self, value: &self.mUint32) }()
-      case 4: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_TestIntIntMap>.self, value: &self.mUint64) }()
-      case 5: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_TestIntIntMap>.self, value: &self.mSint32) }()
-      case 6: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_TestIntIntMap>.self, value: &self.mSint64) }()
-      case 7: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_TestIntIntMap>.self, value: &self.mFixed32) }()
-      case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_TestIntIntMap>.self, value: &self.mFixed64) }()
-      case 9: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_TestIntIntMap>.self, value: &self.mSfixed32) }()
-      case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_TestIntIntMap>.self, value: &self.mSfixed64) }()
-      case 11: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_TestIntIntMap>.self, value: &self.mBool) }()
-      case 12: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestIntIntMap>.self, value: &self.mString) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestIntIntMap>.self, value: &self.mInt32) }()
+      case 2: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_TestIntIntMap>.self, value: &self.mInt64) }()
+      case 3: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_TestIntIntMap>.self, value: &self.mUint32) }()
+      case 4: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_TestIntIntMap>.self, value: &self.mUint64) }()
+      case 5: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_TestIntIntMap>.self, value: &self.mSint32) }()
+      case 6: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_TestIntIntMap>.self, value: &self.mSint64) }()
+      case 7: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_TestIntIntMap>.self, value: &self.mFixed32) }()
+      case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_TestIntIntMap>.self, value: &self.mFixed64) }()
+      case 9: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_TestIntIntMap>.self, value: &self.mSfixed32) }()
+      case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_TestIntIntMap>.self, value: &self.mSfixed64) }()
+      case 11: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_TestIntIntMap>.self, value: &self.mBool) }()
+      case 12: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestIntIntMap>.self, value: &self.mString) }()
       default: break
       }
     }
@@ -571,45 +571,45 @@ extension ProtobufUnittest_TestMaps: SwiftProtobuf.Message, SwiftProtobuf._Messa
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mInt32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestIntIntMap>.self, value: self.mInt32, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestIntIntMap>.self, value: self.mInt32, fieldNumber: 1)
     }
     if !self.mInt64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_TestIntIntMap>.self, value: self.mInt64, fieldNumber: 2)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_TestIntIntMap>.self, value: self.mInt64, fieldNumber: 2)
     }
     if !self.mUint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_TestIntIntMap>.self, value: self.mUint32, fieldNumber: 3)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_TestIntIntMap>.self, value: self.mUint32, fieldNumber: 3)
     }
     if !self.mUint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_TestIntIntMap>.self, value: self.mUint64, fieldNumber: 4)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_TestIntIntMap>.self, value: self.mUint64, fieldNumber: 4)
     }
     if !self.mSint32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_TestIntIntMap>.self, value: self.mSint32, fieldNumber: 5)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_TestIntIntMap>.self, value: self.mSint32, fieldNumber: 5)
     }
     if !self.mSint64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_TestIntIntMap>.self, value: self.mSint64, fieldNumber: 6)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_TestIntIntMap>.self, value: self.mSint64, fieldNumber: 6)
     }
     if !self.mFixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_TestIntIntMap>.self, value: self.mFixed32, fieldNumber: 7)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_TestIntIntMap>.self, value: self.mFixed32, fieldNumber: 7)
     }
     if !self.mFixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_TestIntIntMap>.self, value: self.mFixed64, fieldNumber: 8)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_TestIntIntMap>.self, value: self.mFixed64, fieldNumber: 8)
     }
     if !self.mSfixed32.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_TestIntIntMap>.self, value: self.mSfixed32, fieldNumber: 9)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_TestIntIntMap>.self, value: self.mSfixed32, fieldNumber: 9)
     }
     if !self.mSfixed64.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_TestIntIntMap>.self, value: self.mSfixed64, fieldNumber: 10)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_TestIntIntMap>.self, value: self.mSfixed64, fieldNumber: 10)
     }
     if !self.mBool.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_TestIntIntMap>.self, value: self.mBool, fieldNumber: 11)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_TestIntIntMap>.self, value: self.mBool, fieldNumber: 11)
     }
     if !self.mString.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestIntIntMap>.self, value: self.mString, fieldNumber: 12)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestIntIntMap>.self, value: self.mString, fieldNumber: 12)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMaps, rhs: ProtobufUnittest_TestMaps) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMaps, rhs: Proto2Unittest_TestMaps) -> Bool {
     if lhs.mInt32 != rhs.mInt32 {return false}
     if lhs.mInt64 != rhs.mInt64 {return false}
     if lhs.mUint32 != rhs.mUint32 {return false}
@@ -627,7 +627,7 @@ extension ProtobufUnittest_TestMaps: SwiftProtobuf.Message, SwiftProtobuf._Messa
   }
 }
 
-extension ProtobufUnittest_TestSubmessageMaps: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestSubmessageMaps: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestSubmessageMaps"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "m"),
@@ -656,14 +656,14 @@ extension ProtobufUnittest_TestSubmessageMaps: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestSubmessageMaps, rhs: ProtobufUnittest_TestSubmessageMaps) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestSubmessageMaps, rhs: Proto2Unittest_TestSubmessageMaps) -> Bool {
     if lhs._m != rhs._m {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestProto2BytesMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestProto2BytesMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestProto2BytesMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_bytes"),
@@ -693,7 +693,7 @@ extension ProtobufUnittest_TestProto2BytesMap: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestProto2BytesMap, rhs: ProtobufUnittest_TestProto2BytesMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestProto2BytesMap, rhs: Proto2Unittest_TestProto2BytesMap) -> Bool {
     if lhs.mapBytes != rhs.mapBytes {return false}
     if lhs.mapString != rhs.mapString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
diff --git a/Reference/upstream/google/protobuf/map_unittest.pb.swift b/Reference/upstream/google/protobuf/map_unittest.pb.swift
index a4fa6b3ba..da6688a2b 100644
--- a/Reference/upstream/google/protobuf/map_unittest.pb.swift
+++ b/Reference/upstream/google/protobuf/map_unittest.pb.swift
@@ -28,7 +28,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_MapEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_MapEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   typealias RawValue = Int
   case foo // = 0
   case bar // = 1
@@ -58,7 +58,7 @@ enum ProtobufUnittest_MapEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   }
 
   // The compiler won't synthesize support with the UNRECOGNIZED case.
-  static let allCases: [ProtobufUnittest_MapEnum] = [
+  static let allCases: [Proto2Unittest_MapEnum] = [
     .foo,
     .bar,
     .baz,
@@ -67,7 +67,7 @@ enum ProtobufUnittest_MapEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
 }
 
 /// Tests maps.
-struct ProtobufUnittest_TestMap: @unchecked Sendable {
+struct Proto2Unittest_TestMap: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -147,22 +147,22 @@ struct ProtobufUnittest_TestMap: @unchecked Sendable {
     set {_uniqueStorage()._mapInt32Bytes = newValue}
   }
 
-  var mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnum> {
+  var mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnum> {
     get {return _storage._mapInt32Enum}
     set {_uniqueStorage()._mapInt32Enum = newValue}
   }
 
-  var mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessage> {
+  var mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessage> {
     get {return _storage._mapInt32ForeignMessage}
     set {_uniqueStorage()._mapInt32ForeignMessage = newValue}
   }
 
-  var mapStringForeignMessage: Dictionary<String,ProtobufUnittest_ForeignMessage> {
+  var mapStringForeignMessage: Dictionary<String,Proto2Unittest_ForeignMessage> {
     get {return _storage._mapStringForeignMessage}
     set {_uniqueStorage()._mapStringForeignMessage = newValue}
   }
 
-  var mapInt32AllTypes: Dictionary<Int32,ProtobufUnittest_TestAllTypes> {
+  var mapInt32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> {
     get {return _storage._mapInt32AllTypes}
     set {_uniqueStorage()._mapInt32AllTypes = newValue}
   }
@@ -174,47 +174,47 @@ struct ProtobufUnittest_TestMap: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestMapWithMessages: Sendable {
+struct Proto2Unittest_TestMapWithMessages: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mapInt32AllTypes: Dictionary<Int32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapInt32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapInt64AllTypes: Dictionary<Int64,ProtobufUnittest_TestAllTypes> = [:]
+  var mapInt64AllTypes: Dictionary<Int64,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapUint32AllTypes: Dictionary<UInt32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapUint32AllTypes: Dictionary<UInt32,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapUint64AllTypes: Dictionary<UInt64,ProtobufUnittest_TestAllTypes> = [:]
+  var mapUint64AllTypes: Dictionary<UInt64,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapSint32AllTypes: Dictionary<Int32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapSint32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapSint64AllTypes: Dictionary<Int64,ProtobufUnittest_TestAllTypes> = [:]
+  var mapSint64AllTypes: Dictionary<Int64,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapFixed32AllTypes: Dictionary<UInt32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapFixed32AllTypes: Dictionary<UInt32,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapFixed64AllTypes: Dictionary<UInt64,ProtobufUnittest_TestAllTypes> = [:]
+  var mapFixed64AllTypes: Dictionary<UInt64,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapSfixed32AllTypes: Dictionary<Int32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapSfixed32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapSfixed64AllTypes: Dictionary<Int64,ProtobufUnittest_TestAllTypes> = [:]
+  var mapSfixed64AllTypes: Dictionary<Int64,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapBoolAllTypes: Dictionary<Bool,ProtobufUnittest_TestAllTypes> = [:]
+  var mapBoolAllTypes: Dictionary<Bool,Proto2Unittest_TestAllTypes> = [:]
 
-  var mapStringAllTypes: Dictionary<String,ProtobufUnittest_TestAllTypes> = [:]
+  var mapStringAllTypes: Dictionary<String,Proto2Unittest_TestAllTypes> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestMapSubmessage: Sendable {
+struct Proto2Unittest_TestMapSubmessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var testMap: ProtobufUnittest_TestMap {
-    get {return _testMap ?? ProtobufUnittest_TestMap()}
+  var testMap: Proto2Unittest_TestMap {
+    get {return _testMap ?? Proto2Unittest_TestMap()}
     set {_testMap = newValue}
   }
   /// Returns true if `testMap` has been explicitly set.
@@ -226,15 +226,15 @@ struct ProtobufUnittest_TestMapSubmessage: Sendable {
 
   init() {}
 
-  fileprivate var _testMap: ProtobufUnittest_TestMap? = nil
+  fileprivate var _testMap: Proto2Unittest_TestMap? = nil
 }
 
-struct ProtobufUnittest_TestMessageMap: Sendable {
+struct Proto2Unittest_TestMessageMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mapInt32Message: Dictionary<Int32,ProtobufUnittest_TestAllTypes> = [:]
+  var mapInt32Message: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -242,7 +242,7 @@ struct ProtobufUnittest_TestMessageMap: Sendable {
 }
 
 /// Two map fields share the same entry default instance.
-struct ProtobufUnittest_TestSameTypeMap: Sendable {
+struct Proto2Unittest_TestSameTypeMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -257,19 +257,19 @@ struct ProtobufUnittest_TestSameTypeMap: Sendable {
 }
 
 /// Test embedded message with required fields
-struct ProtobufUnittest_TestRequiredMessageMap: Sendable {
+struct Proto2Unittest_TestRequiredMessageMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var mapField: Dictionary<Int32,ProtobufUnittest_TestRequired> = [:]
+  var mapField: Dictionary<Int32,Proto2Unittest_TestRequired> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestArenaMap: @unchecked Sendable {
+struct Proto2Unittest_TestArenaMap: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -349,12 +349,12 @@ struct ProtobufUnittest_TestArenaMap: @unchecked Sendable {
     set {_uniqueStorage()._mapInt32Bytes = newValue}
   }
 
-  var mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnum> {
+  var mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnum> {
     get {return _storage._mapInt32Enum}
     set {_uniqueStorage()._mapInt32Enum = newValue}
   }
 
-  var mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessage> {
+  var mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessage> {
     get {return _storage._mapInt32ForeignMessage}
     set {_uniqueStorage()._mapInt32ForeignMessage = newValue}
   }
@@ -368,12 +368,12 @@ struct ProtobufUnittest_TestArenaMap: @unchecked Sendable {
 
 /// Previously, message containing enum called Type cannot be used as value of
 /// map field.
-struct ProtobufUnittest_MessageContainingEnumCalledType: Sendable {
+struct Proto2Unittest_MessageContainingEnumCalledType: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var type: Dictionary<String,ProtobufUnittest_MessageContainingEnumCalledType> = [:]
+  var type: Dictionary<String,Proto2Unittest_MessageContainingEnumCalledType> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -401,7 +401,7 @@ struct ProtobufUnittest_MessageContainingEnumCalledType: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [ProtobufUnittest_MessageContainingEnumCalledType.TypeEnum] = [
+    static let allCases: [Proto2Unittest_MessageContainingEnumCalledType.TypeEnum] = [
       .foo,
     ]
 
@@ -411,7 +411,7 @@ struct ProtobufUnittest_MessageContainingEnumCalledType: Sendable {
 }
 
 /// Previously, message cannot contain map field called "entry".
-struct ProtobufUnittest_MessageContainingMapCalledEntry: Sendable {
+struct Proto2Unittest_MessageContainingMapCalledEntry: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -423,19 +423,19 @@ struct ProtobufUnittest_MessageContainingMapCalledEntry: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestRecursiveMapMessage: Sendable {
+struct Proto2Unittest_TestRecursiveMapMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var a: Dictionary<String,ProtobufUnittest_TestRecursiveMapMessage> = [:]
+  var a: Dictionary<String,Proto2Unittest_TestRecursiveMapMessage> = [:]
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestI32StrMap: Sendable {
+struct Proto2Unittest_TestI32StrMap: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -449,9 +449,9 @@ struct ProtobufUnittest_TestI32StrMap: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_MapEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MapEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "MAP_ENUM_FOO"),
     1: .same(proto: "MAP_ENUM_BAR"),
@@ -459,7 +459,7 @@ extension ProtobufUnittest_MapEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_int32"),
@@ -499,10 +499,10 @@ extension ProtobufUnittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messag
     var _mapBoolBool: Dictionary<Bool,Bool> = [:]
     var _mapStringString: Dictionary<String,String> = [:]
     var _mapInt32Bytes: Dictionary<Int32,Data> = [:]
-    var _mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnum> = [:]
-    var _mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessage> = [:]
-    var _mapStringForeignMessage: Dictionary<String,ProtobufUnittest_ForeignMessage> = [:]
-    var _mapInt32AllTypes: Dictionary<Int32,ProtobufUnittest_TestAllTypes> = [:]
+    var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnum> = [:]
+    var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessage> = [:]
+    var _mapStringForeignMessage: Dictionary<String,Proto2Unittest_ForeignMessage> = [:]
+    var _mapInt32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -569,10 +569,10 @@ extension ProtobufUnittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messag
         case 13: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
         case 14: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
         case 15: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapInt32Bytes) }()
-        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnum>.self, value: &_storage._mapInt32Enum) }()
-        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessage>.self, value: &_storage._mapInt32ForeignMessage) }()
-        case 18: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_ForeignMessage>.self, value: &_storage._mapStringForeignMessage) }()
-        case 19: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: &_storage._mapInt32AllTypes) }()
+        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnum>.self, value: &_storage._mapInt32Enum) }()
+        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessage>.self, value: &_storage._mapInt32ForeignMessage) }()
+        case 18: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_ForeignMessage>.self, value: &_storage._mapStringForeignMessage) }()
+        case 19: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: &_storage._mapInt32AllTypes) }()
         default: break
         }
       }
@@ -627,22 +627,22 @@ extension ProtobufUnittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messag
         try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapInt32Bytes, fieldNumber: 15)
       }
       if !_storage._mapInt32Enum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnum>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnum>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
       }
       if !_storage._mapInt32ForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessage>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessage>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
       }
       if !_storage._mapStringForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_ForeignMessage>.self, value: _storage._mapStringForeignMessage, fieldNumber: 18)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_ForeignMessage>.self, value: _storage._mapStringForeignMessage, fieldNumber: 18)
       }
       if !_storage._mapInt32AllTypes.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: _storage._mapInt32AllTypes, fieldNumber: 19)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: _storage._mapInt32AllTypes, fieldNumber: 19)
       }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMap, rhs: ProtobufUnittest_TestMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMap, rhs: Proto2Unittest_TestMap) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -675,7 +675,7 @@ extension ProtobufUnittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messag
   }
 }
 
-extension ProtobufUnittest_TestMapWithMessages: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMapWithMessages: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMapWithMessages"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_all_types"),
@@ -698,18 +698,18 @@ extension ProtobufUnittest_TestMapWithMessages: SwiftProtobuf.Message, SwiftProt
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapInt32AllTypes) }()
-      case 2: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_TestAllTypes>.self, value: &self.mapInt64AllTypes) }()
-      case 3: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapUint32AllTypes) }()
-      case 4: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_TestAllTypes>.self, value: &self.mapUint64AllTypes) }()
-      case 5: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapSint32AllTypes) }()
-      case 6: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_TestAllTypes>.self, value: &self.mapSint64AllTypes) }()
-      case 7: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapFixed32AllTypes) }()
-      case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_TestAllTypes>.self, value: &self.mapFixed64AllTypes) }()
-      case 9: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapSfixed32AllTypes) }()
-      case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_TestAllTypes>.self, value: &self.mapSfixed64AllTypes) }()
-      case 11: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_TestAllTypes>.self, value: &self.mapBoolAllTypes) }()
-      case 12: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestAllTypes>.self, value: &self.mapStringAllTypes) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: &self.mapInt32AllTypes) }()
+      case 2: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_TestAllTypes>.self, value: &self.mapInt64AllTypes) }()
+      case 3: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_TestAllTypes>.self, value: &self.mapUint32AllTypes) }()
+      case 4: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_TestAllTypes>.self, value: &self.mapUint64AllTypes) }()
+      case 5: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_TestAllTypes>.self, value: &self.mapSint32AllTypes) }()
+      case 6: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_TestAllTypes>.self, value: &self.mapSint64AllTypes) }()
+      case 7: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_TestAllTypes>.self, value: &self.mapFixed32AllTypes) }()
+      case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_TestAllTypes>.self, value: &self.mapFixed64AllTypes) }()
+      case 9: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_TestAllTypes>.self, value: &self.mapSfixed32AllTypes) }()
+      case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_TestAllTypes>.self, value: &self.mapSfixed64AllTypes) }()
+      case 11: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_TestAllTypes>.self, value: &self.mapBoolAllTypes) }()
+      case 12: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestAllTypes>.self, value: &self.mapStringAllTypes) }()
       default: break
       }
     }
@@ -717,45 +717,45 @@ extension ProtobufUnittest_TestMapWithMessages: SwiftProtobuf.Message, SwiftProt
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mapInt32AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: self.mapInt32AllTypes, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: self.mapInt32AllTypes, fieldNumber: 1)
     }
     if !self.mapInt64AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,ProtobufUnittest_TestAllTypes>.self, value: self.mapInt64AllTypes, fieldNumber: 2)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt64,Proto2Unittest_TestAllTypes>.self, value: self.mapInt64AllTypes, fieldNumber: 2)
     }
     if !self.mapUint32AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,ProtobufUnittest_TestAllTypes>.self, value: self.mapUint32AllTypes, fieldNumber: 3)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt32,Proto2Unittest_TestAllTypes>.self, value: self.mapUint32AllTypes, fieldNumber: 3)
     }
     if !self.mapUint64AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,ProtobufUnittest_TestAllTypes>.self, value: self.mapUint64AllTypes, fieldNumber: 4)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufUInt64,Proto2Unittest_TestAllTypes>.self, value: self.mapUint64AllTypes, fieldNumber: 4)
     }
     if !self.mapSint32AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,ProtobufUnittest_TestAllTypes>.self, value: self.mapSint32AllTypes, fieldNumber: 5)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt32,Proto2Unittest_TestAllTypes>.self, value: self.mapSint32AllTypes, fieldNumber: 5)
     }
     if !self.mapSint64AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,ProtobufUnittest_TestAllTypes>.self, value: self.mapSint64AllTypes, fieldNumber: 6)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSInt64,Proto2Unittest_TestAllTypes>.self, value: self.mapSint64AllTypes, fieldNumber: 6)
     }
     if !self.mapFixed32AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,ProtobufUnittest_TestAllTypes>.self, value: self.mapFixed32AllTypes, fieldNumber: 7)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed32,Proto2Unittest_TestAllTypes>.self, value: self.mapFixed32AllTypes, fieldNumber: 7)
     }
     if !self.mapFixed64AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,ProtobufUnittest_TestAllTypes>.self, value: self.mapFixed64AllTypes, fieldNumber: 8)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufFixed64,Proto2Unittest_TestAllTypes>.self, value: self.mapFixed64AllTypes, fieldNumber: 8)
     }
     if !self.mapSfixed32AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,ProtobufUnittest_TestAllTypes>.self, value: self.mapSfixed32AllTypes, fieldNumber: 9)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed32,Proto2Unittest_TestAllTypes>.self, value: self.mapSfixed32AllTypes, fieldNumber: 9)
     }
     if !self.mapSfixed64AllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,ProtobufUnittest_TestAllTypes>.self, value: self.mapSfixed64AllTypes, fieldNumber: 10)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufSFixed64,Proto2Unittest_TestAllTypes>.self, value: self.mapSfixed64AllTypes, fieldNumber: 10)
     }
     if !self.mapBoolAllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,ProtobufUnittest_TestAllTypes>.self, value: self.mapBoolAllTypes, fieldNumber: 11)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufBool,Proto2Unittest_TestAllTypes>.self, value: self.mapBoolAllTypes, fieldNumber: 11)
     }
     if !self.mapStringAllTypes.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestAllTypes>.self, value: self.mapStringAllTypes, fieldNumber: 12)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestAllTypes>.self, value: self.mapStringAllTypes, fieldNumber: 12)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMapWithMessages, rhs: ProtobufUnittest_TestMapWithMessages) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMapWithMessages, rhs: Proto2Unittest_TestMapWithMessages) -> Bool {
     if lhs.mapInt32AllTypes != rhs.mapInt32AllTypes {return false}
     if lhs.mapInt64AllTypes != rhs.mapInt64AllTypes {return false}
     if lhs.mapUint32AllTypes != rhs.mapUint32AllTypes {return false}
@@ -773,7 +773,7 @@ extension ProtobufUnittest_TestMapWithMessages: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestMapSubmessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMapSubmessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMapSubmessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "test_map"),
@@ -802,14 +802,14 @@ extension ProtobufUnittest_TestMapSubmessage: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMapSubmessage, rhs: ProtobufUnittest_TestMapSubmessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMapSubmessage, rhs: Proto2Unittest_TestMapSubmessage) -> Bool {
     if lhs._testMap != rhs._testMap {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMessageMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_message"),
@@ -821,7 +821,7 @@ extension ProtobufUnittest_TestMessageMap: SwiftProtobuf.Message, SwiftProtobuf.
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: &self.mapInt32Message) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: &self.mapInt32Message) }()
       default: break
       }
     }
@@ -829,19 +829,19 @@ extension ProtobufUnittest_TestMessageMap: SwiftProtobuf.Message, SwiftProtobuf.
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mapInt32Message.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestAllTypes>.self, value: self.mapInt32Message, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestAllTypes>.self, value: self.mapInt32Message, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageMap, rhs: ProtobufUnittest_TestMessageMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageMap, rhs: Proto2Unittest_TestMessageMap) -> Bool {
     if lhs.mapInt32Message != rhs.mapInt32Message {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestSameTypeMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestSameTypeMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestSameTypeMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "map1"),
@@ -871,7 +871,7 @@ extension ProtobufUnittest_TestSameTypeMap: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestSameTypeMap, rhs: ProtobufUnittest_TestSameTypeMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestSameTypeMap, rhs: Proto2Unittest_TestSameTypeMap) -> Bool {
     if lhs.map1 != rhs.map1 {return false}
     if lhs.map2 != rhs.map2 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -879,7 +879,7 @@ extension ProtobufUnittest_TestSameTypeMap: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TestRequiredMessageMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredMessageMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredMessageMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_field"),
@@ -896,7 +896,7 @@ extension ProtobufUnittest_TestRequiredMessageMap: SwiftProtobuf.Message, SwiftP
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestRequired>.self, value: &self.mapField) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestRequired>.self, value: &self.mapField) }()
       default: break
       }
     }
@@ -904,19 +904,19 @@ extension ProtobufUnittest_TestRequiredMessageMap: SwiftProtobuf.Message, SwiftP
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.mapField.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_TestRequired>.self, value: self.mapField, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_TestRequired>.self, value: self.mapField, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredMessageMap, rhs: ProtobufUnittest_TestRequiredMessageMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredMessageMap, rhs: Proto2Unittest_TestRequiredMessageMap) -> Bool {
     if lhs.mapField != rhs.mapField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestArenaMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "map_int32_int32"),
@@ -954,8 +954,8 @@ extension ProtobufUnittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._M
     var _mapBoolBool: Dictionary<Bool,Bool> = [:]
     var _mapStringString: Dictionary<String,String> = [:]
     var _mapInt32Bytes: Dictionary<Int32,Data> = [:]
-    var _mapInt32Enum: Dictionary<Int32,ProtobufUnittest_MapEnum> = [:]
-    var _mapInt32ForeignMessage: Dictionary<Int32,ProtobufUnittest_ForeignMessage> = [:]
+    var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnum> = [:]
+    var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessage> = [:]
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -1020,8 +1020,8 @@ extension ProtobufUnittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._M
         case 13: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
         case 14: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
         case 15: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapInt32Bytes) }()
-        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnum>.self, value: &_storage._mapInt32Enum) }()
-        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessage>.self, value: &_storage._mapInt32ForeignMessage) }()
+        case 16: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnum>.self, value: &_storage._mapInt32Enum) }()
+        case 17: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessage>.self, value: &_storage._mapInt32ForeignMessage) }()
         default: break
         }
       }
@@ -1076,16 +1076,16 @@ extension ProtobufUnittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._M
         try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapInt32Bytes, fieldNumber: 15)
       }
       if !_storage._mapInt32Enum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_MapEnum>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_MapEnum>.self, value: _storage._mapInt32Enum, fieldNumber: 16)
       }
       if !_storage._mapInt32ForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,ProtobufUnittest_ForeignMessage>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
+        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufInt32,Proto2Unittest_ForeignMessage>.self, value: _storage._mapInt32ForeignMessage, fieldNumber: 17)
       }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestArenaMap, rhs: ProtobufUnittest_TestArenaMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestArenaMap, rhs: Proto2Unittest_TestArenaMap) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -1116,7 +1116,7 @@ extension ProtobufUnittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._M
   }
 }
 
-extension ProtobufUnittest_MessageContainingEnumCalledType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageContainingEnumCalledType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageContainingEnumCalledType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "type"),
@@ -1128,7 +1128,7 @@ extension ProtobufUnittest_MessageContainingEnumCalledType: SwiftProtobuf.Messag
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_MessageContainingEnumCalledType>.self, value: &self.type) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_MessageContainingEnumCalledType>.self, value: &self.type) }()
       default: break
       }
     }
@@ -1136,25 +1136,25 @@ extension ProtobufUnittest_MessageContainingEnumCalledType: SwiftProtobuf.Messag
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.type.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_MessageContainingEnumCalledType>.self, value: self.type, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_MessageContainingEnumCalledType>.self, value: self.type, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MessageContainingEnumCalledType, rhs: ProtobufUnittest_MessageContainingEnumCalledType) -> Bool {
+  static func ==(lhs: Proto2Unittest_MessageContainingEnumCalledType, rhs: Proto2Unittest_MessageContainingEnumCalledType) -> Bool {
     if lhs.type != rhs.type {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_MessageContainingEnumCalledType.TypeEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageContainingEnumCalledType.TypeEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "TYPE_FOO"),
   ]
 }
 
-extension ProtobufUnittest_MessageContainingMapCalledEntry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageContainingMapCalledEntry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageContainingMapCalledEntry"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "entry"),
@@ -1179,14 +1179,14 @@ extension ProtobufUnittest_MessageContainingMapCalledEntry: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MessageContainingMapCalledEntry, rhs: ProtobufUnittest_MessageContainingMapCalledEntry) -> Bool {
+  static func ==(lhs: Proto2Unittest_MessageContainingMapCalledEntry, rhs: Proto2Unittest_MessageContainingMapCalledEntry) -> Bool {
     if lhs.entry != rhs.entry {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestRecursiveMapMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRecursiveMapMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRecursiveMapMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -1198,7 +1198,7 @@ extension ProtobufUnittest_TestRecursiveMapMessage: SwiftProtobuf.Message, Swift
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestRecursiveMapMessage>.self, value: &self.a) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestRecursiveMapMessage>.self, value: &self.a) }()
       default: break
       }
     }
@@ -1206,19 +1206,19 @@ extension ProtobufUnittest_TestRecursiveMapMessage: SwiftProtobuf.Message, Swift
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     if !self.a.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufUnittest_TestRecursiveMapMessage>.self, value: self.a, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Proto2Unittest_TestRecursiveMapMessage>.self, value: self.a, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRecursiveMapMessage, rhs: ProtobufUnittest_TestRecursiveMapMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRecursiveMapMessage, rhs: Proto2Unittest_TestRecursiveMapMessage) -> Bool {
     if lhs.a != rhs.a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestI32StrMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestI32StrMap: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestI32StrMap"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "m_32_str"),
@@ -1243,7 +1243,7 @@ extension ProtobufUnittest_TestI32StrMap: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestI32StrMap, rhs: ProtobufUnittest_TestI32StrMap) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestI32StrMap, rhs: Proto2Unittest_TestI32StrMap) -> Bool {
     if lhs.m32Str != rhs.m32Str {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/only_one_enum_test.pb.swift b/Reference/upstream/google/protobuf/only_one_enum_test.pb.swift
index 46c6c239a..58bad733d 100644
--- a/Reference/upstream/google/protobuf/only_one_enum_test.pb.swift
+++ b/Reference/upstream/google/protobuf/only_one_enum_test.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_OnlyOneEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_OnlyOneEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   typealias RawValue = Int
   case `default` // = 0
   case valid // = 10
@@ -47,7 +47,7 @@ enum ProtobufUnittest_OnlyOneEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   }
 
   // The compiler won't synthesize support with the UNRECOGNIZED case.
-  static let allCases: [ProtobufUnittest_OnlyOneEnum] = [
+  static let allCases: [Proto2Unittest_OnlyOneEnum] = [
     .default,
     .valid,
   ]
@@ -56,7 +56,7 @@ enum ProtobufUnittest_OnlyOneEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-extension ProtobufUnittest_OnlyOneEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OnlyOneEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "ONLY_ONE_ENUM_DEFAULT"),
     10: .same(proto: "ONLY_ONE_ENUM_VALID"),
diff --git a/Reference/upstream/google/protobuf/test_messages_proto2.pb.swift b/Reference/upstream/google/protobuf/test_messages_proto2.pb.swift
index b8c2c3801..604e98632 100644
--- a/Reference/upstream/google/protobuf/test_messages_proto2.pb.swift
+++ b/Reference/upstream/google/protobuf/test_messages_proto2.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.Ext
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
     clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobuf.Sim
   ProtobufTestMessages_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorre
     return true
   }
 }
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Reference/upstream/google/protobuf/unittest.pb.swift b/Reference/upstream/google/protobuf/unittest.pb.swift
index d4da84897..3273e226d 100644
--- a/Reference/upstream/google/protobuf/unittest.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest.pb.swift
@@ -36,7 +36,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_ForeignEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_ForeignEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case foreignFoo = 4
   case foreignBar = 5
   case foreignBaz = 6
@@ -53,7 +53,7 @@ enum ProtobufUnittest_ForeignEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
 
 }
 
-enum ProtobufUnittest_TestReservedEnumFields: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_TestReservedEnumFields: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case unknown = 0
 
   init() {
@@ -63,7 +63,7 @@ enum ProtobufUnittest_TestReservedEnumFields: Int, SwiftProtobuf.Enum, Swift.Cas
 }
 
 /// Required and open enum accepts invalid enum values.
-enum ProtobufUnittest_ForeignOpenEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_ForeignOpenEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   typealias RawValue = Int
   case foreignOpenUnknown // = 0
   case foreignOpenFoo // = 4
@@ -101,7 +101,7 @@ enum ProtobufUnittest_ForeignOpenEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
   }
 
   // The compiler won't synthesize support with the UNRECOGNIZED case.
-  static let allCases: [ProtobufUnittest_ForeignOpenEnum] = [
+  static let allCases: [Proto2Unittest_ForeignOpenEnum] = [
     .foreignOpenUnknown,
     .foreignOpenFoo,
     .foreignOpenBar,
@@ -112,7 +112,7 @@ enum ProtobufUnittest_ForeignOpenEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
 }
 
 /// Test an enum that has multiple values with the same number.
-enum ProtobufUnittest_TestEnumWithDupValue: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_TestEnumWithDupValue: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case foo1 = 1
   case bar1 = 2
   case baz = 3
@@ -126,7 +126,7 @@ enum ProtobufUnittest_TestEnumWithDupValue: Int, SwiftProtobuf.Enum, Swift.CaseI
 }
 
 /// Test an enum with large, unordered values.
-enum ProtobufUnittest_TestSparseEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_TestSparseEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case sparseA = 123
   case sparseB = 62374
   case sparseC = 12589234
@@ -141,7 +141,7 @@ enum ProtobufUnittest_TestSparseEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterabl
 
 }
 
-enum ProtobufUnittest_VeryLargeEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_VeryLargeEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case enumLabelDefault = 0
   case enumLabel1 = 1
   case enumLabel2 = 2
@@ -252,7 +252,7 @@ enum ProtobufUnittest_VeryLargeEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable
 
 /// This proto includes every type of field in both singular and repeated
 /// forms.
-struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
+struct Proto2Unittest_TestAllTypes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -393,8 +393,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalBytes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBytes() {_uniqueStorage()._optionalBytes = nil}
 
-  var optionalGroup: ProtobufUnittest_TestAllTypes.OptionalGroup {
-    get {return _storage._optionalGroup ?? ProtobufUnittest_TestAllTypes.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestAllTypes.OptionalGroup {
+    get {return _storage._optionalGroup ?? Proto2Unittest_TestAllTypes.OptionalGroup()}
     set {_uniqueStorage()._optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -402,8 +402,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalGroup`. Subsequent reads from it will return its default value.
   mutating func clearOptionalGroup() {_uniqueStorage()._optionalGroup = nil}
 
-  var optionalNestedMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return _storage._optionalNestedMessage ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return _storage._optionalNestedMessage ?? Proto2Unittest_TestAllTypes.NestedMessage()}
     set {_uniqueStorage()._optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -411,8 +411,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalNestedMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalNestedMessage() {_uniqueStorage()._optionalNestedMessage = nil}
 
-  var optionalForeignMessage: ProtobufUnittest_ForeignMessage {
-    get {return _storage._optionalForeignMessage ?? ProtobufUnittest_ForeignMessage()}
+  var optionalForeignMessage: Proto2Unittest_ForeignMessage {
+    get {return _storage._optionalForeignMessage ?? Proto2Unittest_ForeignMessage()}
     set {_uniqueStorage()._optionalForeignMessage = newValue}
   }
   /// Returns true if `optionalForeignMessage` has been explicitly set.
@@ -420,8 +420,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -429,7 +429,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalImportMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalImportMessage() {_uniqueStorage()._optionalImportMessage = nil}
 
-  var optionalNestedEnum: ProtobufUnittest_TestAllTypes.NestedEnum {
+  var optionalNestedEnum: Proto2Unittest_TestAllTypes.NestedEnum {
     get {return _storage._optionalNestedEnum ?? .foo}
     set {_uniqueStorage()._optionalNestedEnum = newValue}
   }
@@ -438,7 +438,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalNestedEnum`. Subsequent reads from it will return its default value.
   mutating func clearOptionalNestedEnum() {_uniqueStorage()._optionalNestedEnum = nil}
 
-  var optionalForeignEnum: ProtobufUnittest_ForeignEnum {
+  var optionalForeignEnum: Proto2Unittest_ForeignEnum {
     get {return _storage._optionalForeignEnum ?? .foreignFoo}
     set {_uniqueStorage()._optionalForeignEnum = newValue}
   }
@@ -447,7 +447,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignEnum() {_uniqueStorage()._optionalForeignEnum = nil}
 
-  var optionalImportEnum: ProtobufUnittestImport_ImportEnum {
+  var optionalImportEnum: Proto2UnittestImport_ImportEnum {
     get {return _storage._optionalImportEnum ?? .importFoo}
     set {_uniqueStorage()._optionalImportEnum = newValue}
   }
@@ -484,8 +484,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   mutating func clearOptionalBytesCord() {_uniqueStorage()._optionalBytesCord = nil}
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -493,8 +493,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalPublicImportMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalPublicImportMessage() {_uniqueStorage()._optionalPublicImportMessage = nil}
 
-  var optionalLazyMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return _storage._optionalLazyMessage ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
+  var optionalLazyMessage: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return _storage._optionalLazyMessage ?? Proto2Unittest_TestAllTypes.NestedMessage()}
     set {_uniqueStorage()._optionalLazyMessage = newValue}
   }
   /// Returns true if `optionalLazyMessage` has been explicitly set.
@@ -502,8 +502,8 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalLazyMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalLazyMessage() {_uniqueStorage()._optionalLazyMessage = nil}
 
-  var optionalUnverifiedLazyMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return _storage._optionalUnverifiedLazyMessage ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
+  var optionalUnverifiedLazyMessage: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return _storage._optionalUnverifiedLazyMessage ?? Proto2Unittest_TestAllTypes.NestedMessage()}
     set {_uniqueStorage()._optionalUnverifiedLazyMessage = newValue}
   }
   /// Returns true if `optionalUnverifiedLazyMessage` has been explicitly set.
@@ -587,37 +587,37 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedBytes = newValue}
   }
 
-  var repeatedGroup: [ProtobufUnittest_TestAllTypes.RepeatedGroup] {
+  var repeatedGroup: [Proto2Unittest_TestAllTypes.RepeatedGroup] {
     get {return _storage._repeatedGroup}
     set {_uniqueStorage()._repeatedGroup = newValue}
   }
 
-  var repeatedNestedMessage: [ProtobufUnittest_TestAllTypes.NestedMessage] {
+  var repeatedNestedMessage: [Proto2Unittest_TestAllTypes.NestedMessage] {
     get {return _storage._repeatedNestedMessage}
     set {_uniqueStorage()._repeatedNestedMessage = newValue}
   }
 
-  var repeatedForeignMessage: [ProtobufUnittest_ForeignMessage] {
+  var repeatedForeignMessage: [Proto2Unittest_ForeignMessage] {
     get {return _storage._repeatedForeignMessage}
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
 
-  var repeatedNestedEnum: [ProtobufUnittest_TestAllTypes.NestedEnum] {
+  var repeatedNestedEnum: [Proto2Unittest_TestAllTypes.NestedEnum] {
     get {return _storage._repeatedNestedEnum}
     set {_uniqueStorage()._repeatedNestedEnum = newValue}
   }
 
-  var repeatedForeignEnum: [ProtobufUnittest_ForeignEnum] {
+  var repeatedForeignEnum: [Proto2Unittest_ForeignEnum] {
     get {return _storage._repeatedForeignEnum}
     set {_uniqueStorage()._repeatedForeignEnum = newValue}
   }
 
-  var repeatedImportEnum: [ProtobufUnittestImport_ImportEnum] {
+  var repeatedImportEnum: [Proto2UnittestImport_ImportEnum] {
     get {return _storage._repeatedImportEnum}
     set {_uniqueStorage()._repeatedImportEnum = newValue}
   }
@@ -632,7 +632,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedCord = newValue}
   }
 
-  var repeatedLazyMessage: [ProtobufUnittest_TestAllTypes.NestedMessage] {
+  var repeatedLazyMessage: [Proto2Unittest_TestAllTypes.NestedMessage] {
     get {return _storage._repeatedLazyMessage}
     set {_uniqueStorage()._repeatedLazyMessage = newValue}
   }
@@ -773,7 +773,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `defaultBytes`. Subsequent reads from it will return its default value.
   mutating func clearDefaultBytes() {_uniqueStorage()._defaultBytes = nil}
 
-  var defaultNestedEnum: ProtobufUnittest_TestAllTypes.NestedEnum {
+  var defaultNestedEnum: Proto2Unittest_TestAllTypes.NestedEnum {
     get {return _storage._defaultNestedEnum ?? .bar}
     set {_uniqueStorage()._defaultNestedEnum = newValue}
   }
@@ -782,7 +782,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `defaultNestedEnum`. Subsequent reads from it will return its default value.
   mutating func clearDefaultNestedEnum() {_uniqueStorage()._defaultNestedEnum = nil}
 
-  var defaultForeignEnum: ProtobufUnittest_ForeignEnum {
+  var defaultForeignEnum: Proto2Unittest_ForeignEnum {
     get {return _storage._defaultForeignEnum ?? .foreignBar}
     set {_uniqueStorage()._defaultForeignEnum = newValue}
   }
@@ -791,7 +791,7 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `defaultForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearDefaultForeignEnum() {_uniqueStorage()._defaultForeignEnum = nil}
 
-  var defaultImportEnum: ProtobufUnittestImport_ImportEnum {
+  var defaultImportEnum: Proto2UnittestImport_ImportEnum {
     get {return _storage._defaultImportEnum ?? .importBar}
     set {_uniqueStorage()._defaultImportEnum = newValue}
   }
@@ -832,10 +832,10 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._oneofField = .oneofUint32(newValue)}
   }
 
-  var oneofNestedMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
+  var oneofNestedMessage: Proto2Unittest_TestAllTypes.NestedMessage {
     get {
       if case .oneofNestedMessage(let v)? = _storage._oneofField {return v}
-      return ProtobufUnittest_TestAllTypes.NestedMessage()
+      return Proto2Unittest_TestAllTypes.NestedMessage()
     }
     set {_uniqueStorage()._oneofField = .oneofNestedMessage(newValue)}
   }
@@ -872,10 +872,10 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._oneofField = .oneofStringPiece(newValue)}
   }
 
-  var oneofLazyNestedMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
+  var oneofLazyNestedMessage: Proto2Unittest_TestAllTypes.NestedMessage {
     get {
       if case .oneofLazyNestedMessage(let v)? = _storage._oneofField {return v}
-      return ProtobufUnittest_TestAllTypes.NestedMessage()
+      return Proto2Unittest_TestAllTypes.NestedMessage()
     }
     set {_uniqueStorage()._oneofField = .oneofLazyNestedMessage(newValue)}
   }
@@ -885,12 +885,12 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
   /// For oneof test
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
     case oneofUint32(UInt32)
-    case oneofNestedMessage(ProtobufUnittest_TestAllTypes.NestedMessage)
+    case oneofNestedMessage(Proto2Unittest_TestAllTypes.NestedMessage)
     case oneofString(String)
     case oneofBytes(Data)
     case oneofCord(String)
     case oneofStringPiece(String)
-    case oneofLazyNestedMessage(ProtobufUnittest_TestAllTypes.NestedMessage)
+    case oneofLazyNestedMessage(Proto2Unittest_TestAllTypes.NestedMessage)
 
   }
 
@@ -980,13 +980,13 @@ struct ProtobufUnittest_TestAllTypes: @unchecked Sendable {
 }
 
 /// This proto includes a recursively nested message.
-struct ProtobufUnittest_NestedTestAllTypes: @unchecked Sendable {
+struct Proto2Unittest_NestedTestAllTypes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var child: ProtobufUnittest_NestedTestAllTypes {
-    get {return _storage._child ?? ProtobufUnittest_NestedTestAllTypes()}
+  var child: Proto2Unittest_NestedTestAllTypes {
+    get {return _storage._child ?? Proto2Unittest_NestedTestAllTypes()}
     set {_uniqueStorage()._child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -994,8 +994,8 @@ struct ProtobufUnittest_NestedTestAllTypes: @unchecked Sendable {
   /// Clears the value of `child`. Subsequent reads from it will return its default value.
   mutating func clearChild() {_uniqueStorage()._child = nil}
 
-  var payload: ProtobufUnittest_TestAllTypes {
-    get {return _storage._payload ?? ProtobufUnittest_TestAllTypes()}
+  var payload: Proto2Unittest_TestAllTypes {
+    get {return _storage._payload ?? Proto2Unittest_TestAllTypes()}
     set {_uniqueStorage()._payload = newValue}
   }
   /// Returns true if `payload` has been explicitly set.
@@ -1003,13 +1003,13 @@ struct ProtobufUnittest_NestedTestAllTypes: @unchecked Sendable {
   /// Clears the value of `payload`. Subsequent reads from it will return its default value.
   mutating func clearPayload() {_uniqueStorage()._payload = nil}
 
-  var repeatedChild: [ProtobufUnittest_NestedTestAllTypes] {
+  var repeatedChild: [Proto2Unittest_NestedTestAllTypes] {
     get {return _storage._repeatedChild}
     set {_uniqueStorage()._repeatedChild = newValue}
   }
 
-  var lazyChild: ProtobufUnittest_NestedTestAllTypes {
-    get {return _storage._lazyChild ?? ProtobufUnittest_NestedTestAllTypes()}
+  var lazyChild: Proto2Unittest_NestedTestAllTypes {
+    get {return _storage._lazyChild ?? Proto2Unittest_NestedTestAllTypes()}
     set {_uniqueStorage()._lazyChild = newValue}
   }
   /// Returns true if `lazyChild` has been explicitly set.
@@ -1017,8 +1017,8 @@ struct ProtobufUnittest_NestedTestAllTypes: @unchecked Sendable {
   /// Clears the value of `lazyChild`. Subsequent reads from it will return its default value.
   mutating func clearLazyChild() {_uniqueStorage()._lazyChild = nil}
 
-  var eagerChild: ProtobufUnittest_TestAllTypes {
-    get {return _storage._eagerChild ?? ProtobufUnittest_TestAllTypes()}
+  var eagerChild: Proto2Unittest_TestAllTypes {
+    get {return _storage._eagerChild ?? Proto2Unittest_TestAllTypes()}
     set {_uniqueStorage()._eagerChild = newValue}
   }
   /// Returns true if `eagerChild` has been explicitly set.
@@ -1033,7 +1033,7 @@ struct ProtobufUnittest_NestedTestAllTypes: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestDeprecatedFields: @unchecked Sendable {
+struct Proto2Unittest_TestDeprecatedFields: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1055,8 +1055,8 @@ struct ProtobufUnittest_TestDeprecatedFields: @unchecked Sendable {
   }
 
   /// NOTE: This field was marked as deprecated in the .proto file.
-  var deprecatedMessage: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return _storage._deprecatedMessage ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
+  var deprecatedMessage: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return _storage._deprecatedMessage ?? Proto2Unittest_TestAllTypes.NestedMessage()}
     set {_uniqueStorage()._deprecatedMessage = newValue}
   }
   /// Returns true if `deprecatedMessage` has been explicitly set.
@@ -1078,8 +1078,8 @@ struct ProtobufUnittest_TestDeprecatedFields: @unchecked Sendable {
     set {_uniqueStorage()._oneofFields = .deprecatedInt32InOneof(newValue)}
   }
 
-  var nested: ProtobufUnittest_TestDeprecatedFields {
-    get {return _storage._nested ?? ProtobufUnittest_TestDeprecatedFields()}
+  var nested: Proto2Unittest_TestDeprecatedFields {
+    get {return _storage._nested ?? Proto2Unittest_TestDeprecatedFields()}
     set {_uniqueStorage()._nested = newValue}
   }
   /// Returns true if `nested` has been explicitly set.
@@ -1101,7 +1101,7 @@ struct ProtobufUnittest_TestDeprecatedFields: @unchecked Sendable {
 }
 
 /// NOTE: This message was marked as deprecated in the .proto file.
-struct ProtobufUnittest_TestDeprecatedMessage: Sendable {
+struct Proto2Unittest_TestDeprecatedMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1113,7 +1113,7 @@ struct ProtobufUnittest_TestDeprecatedMessage: Sendable {
 
 /// Define these after TestAllTypes to make sure the compiler can handle
 /// that.
-struct ProtobufUnittest_ForeignMessage: Sendable {
+struct Proto2Unittest_ForeignMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1144,7 +1144,7 @@ struct ProtobufUnittest_ForeignMessage: Sendable {
   fileprivate var _d: Int32? = nil
 }
 
-struct ProtobufUnittest_TestReservedFields: Sendable {
+struct Proto2Unittest_TestReservedFields: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1154,7 +1154,7 @@ struct ProtobufUnittest_TestReservedFields: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestAllExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestAllExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1166,7 +1166,7 @@ struct ProtobufUnittest_TestAllExtensions: SwiftProtobuf.ExtensibleMessage, Send
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_OptionalGroup_extension: Sendable {
+struct Proto2Unittest_OptionalGroup_extension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1187,7 +1187,7 @@ struct ProtobufUnittest_OptionalGroup_extension: Sendable {
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_RepeatedGroup_extension: Sendable {
+struct Proto2Unittest_RepeatedGroup_extension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1208,7 +1208,7 @@ struct ProtobufUnittest_RepeatedGroup_extension: Sendable {
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestMixedFieldsAndExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1232,13 +1232,13 @@ struct ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.ExtensibleMe
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_TestGroup: Sendable {
+struct Proto2Unittest_TestGroup: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalGroup: ProtobufUnittest_TestGroup.OptionalGroup {
-    get {return _optionalGroup ?? ProtobufUnittest_TestGroup.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestGroup.OptionalGroup {
+    get {return _optionalGroup ?? Proto2Unittest_TestGroup.OptionalGroup()}
     set {_optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -1246,7 +1246,7 @@ struct ProtobufUnittest_TestGroup: Sendable {
   /// Clears the value of `optionalGroup`. Subsequent reads from it will return its default value.
   mutating func clearOptionalGroup() {self._optionalGroup = nil}
 
-  var optionalForeignEnum: ProtobufUnittest_ForeignEnum {
+  var optionalForeignEnum: Proto2Unittest_ForeignEnum {
     get {return _optionalForeignEnum ?? .foreignFoo}
     set {_optionalForeignEnum = newValue}
   }
@@ -1291,11 +1291,11 @@ struct ProtobufUnittest_TestGroup: Sendable {
 
   init() {}
 
-  fileprivate var _optionalGroup: ProtobufUnittest_TestGroup.OptionalGroup? = nil
-  fileprivate var _optionalForeignEnum: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _optionalGroup: Proto2Unittest_TestGroup.OptionalGroup? = nil
+  fileprivate var _optionalForeignEnum: Proto2Unittest_ForeignEnum? = nil
 }
 
-struct ProtobufUnittest_TestGroupExtension: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestGroupExtension: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1307,7 +1307,7 @@ struct ProtobufUnittest_TestGroupExtension: SwiftProtobuf.ExtensibleMessage, Sen
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_TestNestedExtension: Sendable {
+struct Proto2Unittest_TestNestedExtension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1338,7 +1338,7 @@ struct ProtobufUnittest_TestNestedExtension: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestChildExtension: Sendable {
+struct Proto2Unittest_TestChildExtension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1361,8 +1361,8 @@ struct ProtobufUnittest_TestChildExtension: Sendable {
   /// Clears the value of `b`. Subsequent reads from it will return its default value.
   mutating func clearB() {self._b = nil}
 
-  var optionalExtension: ProtobufUnittest_TestAllExtensions {
-    get {return _optionalExtension ?? ProtobufUnittest_TestAllExtensions()}
+  var optionalExtension: Proto2Unittest_TestAllExtensions {
+    get {return _optionalExtension ?? Proto2Unittest_TestAllExtensions()}
     set {_optionalExtension = newValue}
   }
   /// Returns true if `optionalExtension` has been explicitly set.
@@ -1376,12 +1376,12 @@ struct ProtobufUnittest_TestChildExtension: Sendable {
 
   fileprivate var _a: String? = nil
   fileprivate var _b: String? = nil
-  fileprivate var _optionalExtension: ProtobufUnittest_TestAllExtensions? = nil
+  fileprivate var _optionalExtension: Proto2Unittest_TestAllExtensions? = nil
 }
 
 /// Emulates wireformat data of TestChildExtension with dynamic extension
 /// (DynamicExtension).
-struct ProtobufUnittest_TestChildExtensionData: Sendable {
+struct Proto2Unittest_TestChildExtensionData: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1404,8 +1404,8 @@ struct ProtobufUnittest_TestChildExtensionData: Sendable {
   /// Clears the value of `b`. Subsequent reads from it will return its default value.
   mutating func clearB() {self._b = nil}
 
-  var optionalExtension: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData {
-    get {return _optionalExtension ?? ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData()}
+  var optionalExtension: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData {
+    get {return _optionalExtension ?? Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData()}
     set {_optionalExtension = newValue}
   }
   /// Returns true if `optionalExtension` has been explicitly set.
@@ -1420,8 +1420,8 @@ struct ProtobufUnittest_TestChildExtensionData: Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var dynamic: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions {
-      get {return _dynamic ?? ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions()}
+    var dynamic: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions {
+      get {return _dynamic ?? Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions()}
       set {_dynamic = newValue}
     }
     /// Returns true if `dynamic` has been explicitly set.
@@ -1464,17 +1464,17 @@ struct ProtobufUnittest_TestChildExtensionData: Sendable {
 
     init() {}
 
-    fileprivate var _dynamic: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions? = nil
+    fileprivate var _dynamic: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions? = nil
   }
 
   init() {}
 
   fileprivate var _a: String? = nil
   fileprivate var _b: String? = nil
-  fileprivate var _optionalExtension: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData? = nil
+  fileprivate var _optionalExtension: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData? = nil
 }
 
-struct ProtobufUnittest_TestNestedChildExtension: Sendable {
+struct Proto2Unittest_TestNestedChildExtension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1488,8 +1488,8 @@ struct ProtobufUnittest_TestNestedChildExtension: Sendable {
   /// Clears the value of `a`. Subsequent reads from it will return its default value.
   mutating func clearA() {self._a = nil}
 
-  var child: ProtobufUnittest_TestChildExtension {
-    get {return _child ?? ProtobufUnittest_TestChildExtension()}
+  var child: Proto2Unittest_TestChildExtension {
+    get {return _child ?? Proto2Unittest_TestChildExtension()}
     set {_child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -1502,12 +1502,12 @@ struct ProtobufUnittest_TestNestedChildExtension: Sendable {
   init() {}
 
   fileprivate var _a: Int32? = nil
-  fileprivate var _child: ProtobufUnittest_TestChildExtension? = nil
+  fileprivate var _child: Proto2Unittest_TestChildExtension? = nil
 }
 
 /// Emulates wireformat data of TestNestedChildExtension with dynamic extension
 /// (DynamicExtension).
-struct ProtobufUnittest_TestNestedChildExtensionData: Sendable {
+struct Proto2Unittest_TestNestedChildExtensionData: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1521,8 +1521,8 @@ struct ProtobufUnittest_TestNestedChildExtensionData: Sendable {
   /// Clears the value of `a`. Subsequent reads from it will return its default value.
   mutating func clearA() {self._a = nil}
 
-  var child: ProtobufUnittest_TestChildExtensionData {
-    get {return _child ?? ProtobufUnittest_TestChildExtensionData()}
+  var child: Proto2Unittest_TestChildExtensionData {
+    get {return _child ?? Proto2Unittest_TestChildExtensionData()}
     set {_child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -1535,17 +1535,17 @@ struct ProtobufUnittest_TestNestedChildExtensionData: Sendable {
   init() {}
 
   fileprivate var _a: Int32? = nil
-  fileprivate var _child: ProtobufUnittest_TestChildExtensionData? = nil
+  fileprivate var _child: Proto2Unittest_TestChildExtensionData? = nil
 }
 
 /// Required and closed enum fields are considered unknown fields if the value is
 /// not valid. We need to make sure it functions as expected.
-struct ProtobufUnittest_TestRequiredEnum: Sendable {
+struct Proto2Unittest_TestRequiredEnum: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var requiredEnum: ProtobufUnittest_ForeignEnum {
+  var requiredEnum: Proto2Unittest_ForeignEnum {
     get {return _requiredEnum ?? .foreignFoo}
     set {_requiredEnum = newValue}
   }
@@ -1568,16 +1568,16 @@ struct ProtobufUnittest_TestRequiredEnum: Sendable {
 
   init() {}
 
-  fileprivate var _requiredEnum: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _requiredEnum: Proto2Unittest_ForeignEnum? = nil
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_TestRequiredOpenEnum: Sendable {
+struct Proto2Unittest_TestRequiredOpenEnum: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var requiredEnum: ProtobufUnittest_ForeignOpenEnum {
+  var requiredEnum: Proto2Unittest_ForeignOpenEnum {
     get {return _requiredEnum ?? .foreignOpenUnknown}
     set {_requiredEnum = newValue}
   }
@@ -1600,17 +1600,17 @@ struct ProtobufUnittest_TestRequiredOpenEnum: Sendable {
 
   init() {}
 
-  fileprivate var _requiredEnum: ProtobufUnittest_ForeignOpenEnum? = nil
+  fileprivate var _requiredEnum: Proto2Unittest_ForeignOpenEnum? = nil
   fileprivate var _a: Int32? = nil
 }
 
 /// TestRequiredEnum + using enum values that won't fit to 64 bitmask.
-struct ProtobufUnittest_TestRequiredEnumNoMask: Sendable {
+struct Proto2Unittest_TestRequiredEnumNoMask: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var requiredEnum: ProtobufUnittest_TestRequiredEnumNoMask.NestedEnum {
+  var requiredEnum: Proto2Unittest_TestRequiredEnumNoMask.NestedEnum {
     get {return _requiredEnum ?? .unspecified}
     set {_requiredEnum = newValue}
   }
@@ -1647,18 +1647,18 @@ struct ProtobufUnittest_TestRequiredEnumNoMask: Sendable {
 
   init() {}
 
-  fileprivate var _requiredEnum: ProtobufUnittest_TestRequiredEnumNoMask.NestedEnum? = nil
+  fileprivate var _requiredEnum: Proto2Unittest_TestRequiredEnumNoMask.NestedEnum? = nil
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_TestRequiredEnumMulti: Sendable {
+struct Proto2Unittest_TestRequiredEnumMulti: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// Intentionally placed in descending field number to force sorting in closed
   /// enum verification.
-  var requiredEnum4: ProtobufUnittest_TestRequiredEnumMulti.NestedEnum {
+  var requiredEnum4: Proto2Unittest_TestRequiredEnumMulti.NestedEnum {
     get {return _requiredEnum4 ?? .unspecified}
     set {_requiredEnum4 = newValue}
   }
@@ -1676,7 +1676,7 @@ struct ProtobufUnittest_TestRequiredEnumMulti: Sendable {
   /// Clears the value of `a3`. Subsequent reads from it will return its default value.
   mutating func clearA3() {self._a3 = nil}
 
-  var requiredEnum2: ProtobufUnittest_TestRequiredEnumMulti.NestedEnum {
+  var requiredEnum2: Proto2Unittest_TestRequiredEnumMulti.NestedEnum {
     get {return _requiredEnum2 ?? .unspecified}
     set {_requiredEnum2 = newValue}
   }
@@ -1685,7 +1685,7 @@ struct ProtobufUnittest_TestRequiredEnumMulti: Sendable {
   /// Clears the value of `requiredEnum2`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnum2() {self._requiredEnum2 = nil}
 
-  var requiredEnum1: ProtobufUnittest_ForeignEnum {
+  var requiredEnum1: Proto2Unittest_ForeignEnum {
     get {return _requiredEnum1 ?? .foreignFoo}
     set {_requiredEnum1 = newValue}
   }
@@ -1710,13 +1710,13 @@ struct ProtobufUnittest_TestRequiredEnumMulti: Sendable {
 
   init() {}
 
-  fileprivate var _requiredEnum4: ProtobufUnittest_TestRequiredEnumMulti.NestedEnum? = nil
+  fileprivate var _requiredEnum4: Proto2Unittest_TestRequiredEnumMulti.NestedEnum? = nil
   fileprivate var _a3: Int32? = nil
-  fileprivate var _requiredEnum2: ProtobufUnittest_TestRequiredEnumMulti.NestedEnum? = nil
-  fileprivate var _requiredEnum1: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _requiredEnum2: Proto2Unittest_TestRequiredEnumMulti.NestedEnum? = nil
+  fileprivate var _requiredEnum1: Proto2Unittest_ForeignEnum? = nil
 }
 
-struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
+struct Proto2Unittest_TestRequiredNoMaskMulti: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1742,7 +1742,7 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
   /// Clears the value of `requiredFixed3270`. Subsequent reads from it will return its default value.
   mutating func clearRequiredFixed3270() {self._requiredFixed3270 = nil}
 
-  var requiredEnum64: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum {
+  var requiredEnum64: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum {
     get {return _requiredEnum64 ?? .unspecified}
     set {_requiredEnum64 = newValue}
   }
@@ -1751,7 +1751,7 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
   /// Clears the value of `requiredEnum64`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnum64() {self._requiredEnum64 = nil}
 
-  var requiredEnum4: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum {
+  var requiredEnum4: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum {
     get {return _requiredEnum4 ?? .unspecified}
     set {_requiredEnum4 = newValue}
   }
@@ -1769,7 +1769,7 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
   /// Clears the value of `a3`. Subsequent reads from it will return its default value.
   mutating func clearA3() {self._a3 = nil}
 
-  var requiredEnum2: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum {
+  var requiredEnum2: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum {
     get {return _requiredEnum2 ?? .unspecified}
     set {_requiredEnum2 = newValue}
   }
@@ -1778,7 +1778,7 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
   /// Clears the value of `requiredEnum2`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnum2() {self._requiredEnum2 = nil}
 
-  var requiredEnum1: ProtobufUnittest_ForeignEnum {
+  var requiredEnum1: Proto2Unittest_ForeignEnum {
     get {return _requiredEnum1 ?? .foreignFoo}
     set {_requiredEnum1 = newValue}
   }
@@ -1805,11 +1805,11 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
 
   fileprivate var _requiredFixed3280: UInt32? = nil
   fileprivate var _requiredFixed3270: UInt32? = nil
-  fileprivate var _requiredEnum64: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum? = nil
-  fileprivate var _requiredEnum4: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum? = nil
+  fileprivate var _requiredEnum64: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum? = nil
+  fileprivate var _requiredEnum4: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum? = nil
   fileprivate var _a3: Int32? = nil
-  fileprivate var _requiredEnum2: ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum? = nil
-  fileprivate var _requiredEnum1: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _requiredEnum2: Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum? = nil
+  fileprivate var _requiredEnum1: Proto2Unittest_ForeignEnum? = nil
 }
 
 /// We have separate messages for testing required fields because it's
@@ -1817,7 +1817,7 @@ struct ProtobufUnittest_TestRequiredNoMaskMulti: Sendable {
 /// do anything with it.  Note that we don't need to test every type of
 /// required filed because the code output is basically identical to
 /// optional fields for all types.
-struct ProtobufUnittest_TestRequired: @unchecked Sendable {
+struct Proto2Unittest_TestRequired: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2122,8 +2122,8 @@ struct ProtobufUnittest_TestRequired: @unchecked Sendable {
   mutating func clearC() {_uniqueStorage()._c = nil}
 
   /// Add an optional child message to make this non-trivial for go/pdlazy.
-  var optionalForeign: ProtobufUnittest_ForeignMessage {
-    get {return _storage._optionalForeign ?? ProtobufUnittest_ForeignMessage()}
+  var optionalForeign: Proto2Unittest_ForeignMessage {
+    get {return _storage._optionalForeign ?? Proto2Unittest_ForeignMessage()}
     set {_uniqueStorage()._optionalForeign = newValue}
   }
   /// Returns true if `optionalForeign` has been explicitly set.
@@ -2138,13 +2138,13 @@ struct ProtobufUnittest_TestRequired: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestRequiredForeign: Sendable {
+struct Proto2Unittest_TestRequiredForeign: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalMessage: ProtobufUnittest_TestRequired {
-    get {return _optionalMessage ?? ProtobufUnittest_TestRequired()}
+  var optionalMessage: Proto2Unittest_TestRequired {
+    get {return _optionalMessage ?? Proto2Unittest_TestRequired()}
     set {_optionalMessage = newValue}
   }
   /// Returns true if `optionalMessage` has been explicitly set.
@@ -2152,7 +2152,7 @@ struct ProtobufUnittest_TestRequiredForeign: Sendable {
   /// Clears the value of `optionalMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalMessage() {self._optionalMessage = nil}
 
-  var repeatedMessage: [ProtobufUnittest_TestRequired] = []
+  var repeatedMessage: [Proto2Unittest_TestRequired] = []
 
   var dummy: Int32 {
     get {return _dummy ?? 0}
@@ -2164,8 +2164,8 @@ struct ProtobufUnittest_TestRequiredForeign: Sendable {
   mutating func clearDummy() {self._dummy = nil}
 
   /// Missing required fields must not affect verification of child messages.
-  var optionalLazyMessage: ProtobufUnittest_NestedTestAllTypes {
-    get {return _optionalLazyMessage ?? ProtobufUnittest_NestedTestAllTypes()}
+  var optionalLazyMessage: Proto2Unittest_NestedTestAllTypes {
+    get {return _optionalLazyMessage ?? Proto2Unittest_NestedTestAllTypes()}
     set {_optionalLazyMessage = newValue}
   }
   /// Returns true if `optionalLazyMessage` has been explicitly set.
@@ -2177,18 +2177,18 @@ struct ProtobufUnittest_TestRequiredForeign: Sendable {
 
   init() {}
 
-  fileprivate var _optionalMessage: ProtobufUnittest_TestRequired? = nil
+  fileprivate var _optionalMessage: Proto2Unittest_TestRequired? = nil
   fileprivate var _dummy: Int32? = nil
-  fileprivate var _optionalLazyMessage: ProtobufUnittest_NestedTestAllTypes? = nil
+  fileprivate var _optionalLazyMessage: Proto2Unittest_NestedTestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestRequiredMessage: Sendable {
+struct Proto2Unittest_TestRequiredMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalMessage: ProtobufUnittest_TestRequired {
-    get {return _optionalMessage ?? ProtobufUnittest_TestRequired()}
+  var optionalMessage: Proto2Unittest_TestRequired {
+    get {return _optionalMessage ?? Proto2Unittest_TestRequired()}
     set {_optionalMessage = newValue}
   }
   /// Returns true if `optionalMessage` has been explicitly set.
@@ -2196,10 +2196,10 @@ struct ProtobufUnittest_TestRequiredMessage: Sendable {
   /// Clears the value of `optionalMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalMessage() {self._optionalMessage = nil}
 
-  var repeatedMessage: [ProtobufUnittest_TestRequired] = []
+  var repeatedMessage: [Proto2Unittest_TestRequired] = []
 
-  var requiredMessage: ProtobufUnittest_TestRequired {
-    get {return _requiredMessage ?? ProtobufUnittest_TestRequired()}
+  var requiredMessage: Proto2Unittest_TestRequired {
+    get {return _requiredMessage ?? Proto2Unittest_TestRequired()}
     set {_requiredMessage = newValue}
   }
   /// Returns true if `requiredMessage` has been explicitly set.
@@ -2211,17 +2211,17 @@ struct ProtobufUnittest_TestRequiredMessage: Sendable {
 
   init() {}
 
-  fileprivate var _optionalMessage: ProtobufUnittest_TestRequired? = nil
-  fileprivate var _requiredMessage: ProtobufUnittest_TestRequired? = nil
+  fileprivate var _optionalMessage: Proto2Unittest_TestRequired? = nil
+  fileprivate var _requiredMessage: Proto2Unittest_TestRequired? = nil
 }
 
-struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
+struct Proto2Unittest_TestNestedRequiredForeign: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var child: ProtobufUnittest_TestNestedRequiredForeign {
-    get {return _storage._child ?? ProtobufUnittest_TestNestedRequiredForeign()}
+  var child: Proto2Unittest_TestNestedRequiredForeign {
+    get {return _storage._child ?? Proto2Unittest_TestNestedRequiredForeign()}
     set {_uniqueStorage()._child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -2229,8 +2229,8 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
   /// Clears the value of `child`. Subsequent reads from it will return its default value.
   mutating func clearChild() {_uniqueStorage()._child = nil}
 
-  var payload: ProtobufUnittest_TestRequiredForeign {
-    get {return _storage._payload ?? ProtobufUnittest_TestRequiredForeign()}
+  var payload: Proto2Unittest_TestRequiredForeign {
+    get {return _storage._payload ?? Proto2Unittest_TestRequiredForeign()}
     set {_uniqueStorage()._payload = newValue}
   }
   /// Returns true if `payload` has been explicitly set.
@@ -2248,8 +2248,8 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
   mutating func clearDummy() {_uniqueStorage()._dummy = nil}
 
   /// optional message to test required closed enum.
-  var requiredEnum: ProtobufUnittest_TestRequiredEnum {
-    get {return _storage._requiredEnum ?? ProtobufUnittest_TestRequiredEnum()}
+  var requiredEnum: Proto2Unittest_TestRequiredEnum {
+    get {return _storage._requiredEnum ?? Proto2Unittest_TestRequiredEnum()}
     set {_uniqueStorage()._requiredEnum = newValue}
   }
   /// Returns true if `requiredEnum` has been explicitly set.
@@ -2257,8 +2257,8 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
   /// Clears the value of `requiredEnum`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnum() {_uniqueStorage()._requiredEnum = nil}
 
-  var requiredEnumNoMask: ProtobufUnittest_TestRequiredEnumNoMask {
-    get {return _storage._requiredEnumNoMask ?? ProtobufUnittest_TestRequiredEnumNoMask()}
+  var requiredEnumNoMask: Proto2Unittest_TestRequiredEnumNoMask {
+    get {return _storage._requiredEnumNoMask ?? Proto2Unittest_TestRequiredEnumNoMask()}
     set {_uniqueStorage()._requiredEnumNoMask = newValue}
   }
   /// Returns true if `requiredEnumNoMask` has been explicitly set.
@@ -2266,8 +2266,8 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
   /// Clears the value of `requiredEnumNoMask`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnumNoMask() {_uniqueStorage()._requiredEnumNoMask = nil}
 
-  var requiredEnumMulti: ProtobufUnittest_TestRequiredEnumMulti {
-    get {return _storage._requiredEnumMulti ?? ProtobufUnittest_TestRequiredEnumMulti()}
+  var requiredEnumMulti: Proto2Unittest_TestRequiredEnumMulti {
+    get {return _storage._requiredEnumMulti ?? Proto2Unittest_TestRequiredEnumMulti()}
     set {_uniqueStorage()._requiredEnumMulti = newValue}
   }
   /// Returns true if `requiredEnumMulti` has been explicitly set.
@@ -2275,8 +2275,8 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
   /// Clears the value of `requiredEnumMulti`. Subsequent reads from it will return its default value.
   mutating func clearRequiredEnumMulti() {_uniqueStorage()._requiredEnumMulti = nil}
 
-  var requiredNoMask: ProtobufUnittest_TestRequiredNoMaskMulti {
-    get {return _storage._requiredNoMask ?? ProtobufUnittest_TestRequiredNoMaskMulti()}
+  var requiredNoMask: Proto2Unittest_TestRequiredNoMaskMulti {
+    get {return _storage._requiredNoMask ?? Proto2Unittest_TestRequiredNoMaskMulti()}
     set {_uniqueStorage()._requiredNoMask = newValue}
   }
   /// Returns true if `requiredNoMask` has been explicitly set.
@@ -2292,13 +2292,13 @@ struct ProtobufUnittest_TestNestedRequiredForeign: @unchecked Sendable {
 }
 
 /// Test that we can use NestedMessage from outside TestAllTypes.
-struct ProtobufUnittest_TestForeignNested: Sendable {
+struct Proto2Unittest_TestForeignNested: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var foreignNested: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return _foreignNested ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
+  var foreignNested: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return _foreignNested ?? Proto2Unittest_TestAllTypes.NestedMessage()}
     set {_foreignNested = newValue}
   }
   /// Returns true if `foreignNested` has been explicitly set.
@@ -2310,11 +2310,11 @@ struct ProtobufUnittest_TestForeignNested: Sendable {
 
   init() {}
 
-  fileprivate var _foreignNested: ProtobufUnittest_TestAllTypes.NestedMessage? = nil
+  fileprivate var _foreignNested: Proto2Unittest_TestAllTypes.NestedMessage? = nil
 }
 
 /// TestEmptyMessage is used to test unknown field support.
-struct ProtobufUnittest_TestEmptyMessage: Sendable {
+struct Proto2Unittest_TestEmptyMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2326,7 +2326,7 @@ struct ProtobufUnittest_TestEmptyMessage: Sendable {
 
 /// Like above, but declare all field numbers as potential extensions.  No
 /// actual extensions should ever be defined for this type.
-struct ProtobufUnittest_TestEmptyMessageWithExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestEmptyMessageWithExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2339,7 +2339,7 @@ struct ProtobufUnittest_TestEmptyMessageWithExtensions: SwiftProtobuf.Extensible
 }
 
 /// Needed for a Python test.
-struct ProtobufUnittest_TestPickleNestedMessage: Sendable {
+struct Proto2Unittest_TestPickleNestedMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2391,7 +2391,7 @@ struct ProtobufUnittest_TestPickleNestedMessage: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestMultipleExtensionRanges: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestMultipleExtensionRanges: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2404,7 +2404,7 @@ struct ProtobufUnittest_TestMultipleExtensionRanges: SwiftProtobuf.ExtensibleMes
 }
 
 /// Test that really large tag numbers don't break anything.
-struct ProtobufUnittest_TestReallyLargeTagNumber: Sendable {
+struct Proto2Unittest_TestReallyLargeTagNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2437,13 +2437,13 @@ struct ProtobufUnittest_TestReallyLargeTagNumber: Sendable {
   fileprivate var _bb: Int32? = nil
 }
 
-struct ProtobufUnittest_TestRecursiveMessage: @unchecked Sendable {
+struct Proto2Unittest_TestRecursiveMessage: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var a: ProtobufUnittest_TestRecursiveMessage {
-    get {return _storage._a ?? ProtobufUnittest_TestRecursiveMessage()}
+  var a: Proto2Unittest_TestRecursiveMessage {
+    get {return _storage._a ?? Proto2Unittest_TestRecursiveMessage()}
     set {_uniqueStorage()._a = newValue}
   }
   /// Returns true if `a` has been explicitly set.
@@ -2468,13 +2468,13 @@ struct ProtobufUnittest_TestRecursiveMessage: @unchecked Sendable {
 }
 
 /// Test that mutual recursion works.
-struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
+struct Proto2Unittest_TestMutualRecursionA: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var bb: ProtobufUnittest_TestMutualRecursionB {
-    get {return _storage._bb ?? ProtobufUnittest_TestMutualRecursionB()}
+  var bb: Proto2Unittest_TestMutualRecursionB {
+    get {return _storage._bb ?? Proto2Unittest_TestMutualRecursionB()}
     set {_uniqueStorage()._bb = newValue}
   }
   /// Returns true if `bb` has been explicitly set.
@@ -2482,8 +2482,8 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
   /// Clears the value of `bb`. Subsequent reads from it will return its default value.
   mutating func clearBb() {_uniqueStorage()._bb = nil}
 
-  var subGroup: ProtobufUnittest_TestMutualRecursionA.SubGroup {
-    get {return _storage._subGroup ?? ProtobufUnittest_TestMutualRecursionA.SubGroup()}
+  var subGroup: Proto2Unittest_TestMutualRecursionA.SubGroup {
+    get {return _storage._subGroup ?? Proto2Unittest_TestMutualRecursionA.SubGroup()}
     set {_uniqueStorage()._subGroup = newValue}
   }
   /// Returns true if `subGroup` has been explicitly set.
@@ -2491,7 +2491,7 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
   /// Clears the value of `subGroup`. Subsequent reads from it will return its default value.
   mutating func clearSubGroup() {_uniqueStorage()._subGroup = nil}
 
-  var subGroupR: [ProtobufUnittest_TestMutualRecursionA.SubGroupR] {
+  var subGroupR: [Proto2Unittest_TestMutualRecursionA.SubGroupR] {
     get {return _storage._subGroupR}
     set {_uniqueStorage()._subGroupR = newValue}
   }
@@ -2503,8 +2503,8 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var b: ProtobufUnittest_TestMutualRecursionB {
-      get {return _storage._b ?? ProtobufUnittest_TestMutualRecursionB()}
+    var b: Proto2Unittest_TestMutualRecursionB {
+      get {return _storage._b ?? Proto2Unittest_TestMutualRecursionB()}
       set {_uniqueStorage()._b = newValue}
     }
     /// Returns true if `b` has been explicitly set.
@@ -2525,8 +2525,8 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
     // methods supported on all messages.
 
     /// Needed because of bug in javatest
-    var subMessage: ProtobufUnittest_TestMutualRecursionA.SubMessage {
-      get {return _storage._subMessage ?? ProtobufUnittest_TestMutualRecursionA.SubMessage()}
+    var subMessage: Proto2Unittest_TestMutualRecursionA.SubMessage {
+      get {return _storage._subMessage ?? Proto2Unittest_TestMutualRecursionA.SubMessage()}
       set {_uniqueStorage()._subMessage = newValue}
     }
     /// Returns true if `subMessage` has been explicitly set.
@@ -2534,8 +2534,8 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
     /// Clears the value of `subMessage`. Subsequent reads from it will return its default value.
     mutating func clearSubMessage() {_uniqueStorage()._subMessage = nil}
 
-    var notInThisScc: ProtobufUnittest_TestAllTypes {
-      get {return _storage._notInThisScc ?? ProtobufUnittest_TestAllTypes()}
+    var notInThisScc: Proto2Unittest_TestAllTypes {
+      get {return _storage._notInThisScc ?? Proto2Unittest_TestAllTypes()}
       set {_uniqueStorage()._notInThisScc = newValue}
     }
     /// Returns true if `notInThisScc` has been explicitly set.
@@ -2555,8 +2555,8 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var payload: ProtobufUnittest_TestAllTypes {
-      get {return _payload ?? ProtobufUnittest_TestAllTypes()}
+    var payload: Proto2Unittest_TestAllTypes {
+      get {return _payload ?? Proto2Unittest_TestAllTypes()}
       set {_payload = newValue}
     }
     /// Returns true if `payload` has been explicitly set.
@@ -2568,7 +2568,7 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
 
     init() {}
 
-    fileprivate var _payload: ProtobufUnittest_TestAllTypes? = nil
+    fileprivate var _payload: Proto2Unittest_TestAllTypes? = nil
   }
 
   init() {}
@@ -2576,13 +2576,13 @@ struct ProtobufUnittest_TestMutualRecursionA: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestMutualRecursionB: @unchecked Sendable {
+struct Proto2Unittest_TestMutualRecursionB: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var a: ProtobufUnittest_TestMutualRecursionA {
-    get {return _storage._a ?? ProtobufUnittest_TestMutualRecursionA()}
+  var a: Proto2Unittest_TestMutualRecursionA {
+    get {return _storage._a ?? Proto2Unittest_TestMutualRecursionA()}
     set {_uniqueStorage()._a = newValue}
   }
   /// Returns true if `a` has been explicitly set.
@@ -2606,13 +2606,13 @@ struct ProtobufUnittest_TestMutualRecursionB: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestIsInitialized: Sendable {
+struct Proto2Unittest_TestIsInitialized: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var subMessage: ProtobufUnittest_TestIsInitialized.SubMessage {
-    get {return _subMessage ?? ProtobufUnittest_TestIsInitialized.SubMessage()}
+  var subMessage: Proto2Unittest_TestIsInitialized.SubMessage {
+    get {return _subMessage ?? Proto2Unittest_TestIsInitialized.SubMessage()}
     set {_subMessage = newValue}
   }
   /// Returns true if `subMessage` has been explicitly set.
@@ -2627,8 +2627,8 @@ struct ProtobufUnittest_TestIsInitialized: Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var subGroup: ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup {
-      get {return _subGroup ?? ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup()}
+    var subGroup: Proto2Unittest_TestIsInitialized.SubMessage.SubGroup {
+      get {return _subGroup ?? Proto2Unittest_TestIsInitialized.SubMessage.SubGroup()}
       set {_subGroup = newValue}
     }
     /// Returns true if `subGroup` has been explicitly set.
@@ -2661,19 +2661,19 @@ struct ProtobufUnittest_TestIsInitialized: Sendable {
 
     init() {}
 
-    fileprivate var _subGroup: ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup? = nil
+    fileprivate var _subGroup: Proto2Unittest_TestIsInitialized.SubMessage.SubGroup? = nil
   }
 
   init() {}
 
-  fileprivate var _subMessage: ProtobufUnittest_TestIsInitialized.SubMessage? = nil
+  fileprivate var _subMessage: Proto2Unittest_TestIsInitialized.SubMessage? = nil
 }
 
 /// Test that groups have disjoint field numbers from their siblings and
 /// parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
 /// to compile with proto1, this will emit an error; so we only include it
-/// in protobuf_unittest_proto.
-struct ProtobufUnittest_TestDupFieldNumber: Sendable {
+/// in proto2_unittest_proto.
+struct Proto2Unittest_TestDupFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2689,8 +2689,8 @@ struct ProtobufUnittest_TestDupFieldNumber: Sendable {
   mutating func clearA() {self._a = nil}
 
   /// NO_PROTO1
-  var foo: ProtobufUnittest_TestDupFieldNumber.Foo {
-    get {return _foo ?? ProtobufUnittest_TestDupFieldNumber.Foo()}
+  var foo: Proto2Unittest_TestDupFieldNumber.Foo {
+    get {return _foo ?? Proto2Unittest_TestDupFieldNumber.Foo()}
     set {_foo = newValue}
   }
   /// Returns true if `foo` has been explicitly set.
@@ -2699,8 +2699,8 @@ struct ProtobufUnittest_TestDupFieldNumber: Sendable {
   mutating func clearFoo() {self._foo = nil}
 
   /// NO_PROTO1
-  var bar: ProtobufUnittest_TestDupFieldNumber.Bar {
-    get {return _bar ?? ProtobufUnittest_TestDupFieldNumber.Bar()}
+  var bar: Proto2Unittest_TestDupFieldNumber.Bar {
+    get {return _bar ?? Proto2Unittest_TestDupFieldNumber.Bar()}
     set {_bar = newValue}
   }
   /// Returns true if `bar` has been explicitly set.
@@ -2759,18 +2759,18 @@ struct ProtobufUnittest_TestDupFieldNumber: Sendable {
   init() {}
 
   fileprivate var _a: Int32? = nil
-  fileprivate var _foo: ProtobufUnittest_TestDupFieldNumber.Foo? = nil
-  fileprivate var _bar: ProtobufUnittest_TestDupFieldNumber.Bar? = nil
+  fileprivate var _foo: Proto2Unittest_TestDupFieldNumber.Foo? = nil
+  fileprivate var _bar: Proto2Unittest_TestDupFieldNumber.Bar? = nil
 }
 
 /// Additional messages for testing lazy fields.
-struct ProtobufUnittest_TestEagerMessage: Sendable {
+struct Proto2Unittest_TestEagerMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var subMessage: ProtobufUnittest_TestAllTypes {
-    get {return _subMessage ?? ProtobufUnittest_TestAllTypes()}
+  var subMessage: Proto2Unittest_TestAllTypes {
+    get {return _subMessage ?? Proto2Unittest_TestAllTypes()}
     set {_subMessage = newValue}
   }
   /// Returns true if `subMessage` has been explicitly set.
@@ -2782,16 +2782,16 @@ struct ProtobufUnittest_TestEagerMessage: Sendable {
 
   init() {}
 
-  fileprivate var _subMessage: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _subMessage: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestLazyMessage: Sendable {
+struct Proto2Unittest_TestLazyMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var subMessage: ProtobufUnittest_TestAllTypes {
-    get {return _subMessage ?? ProtobufUnittest_TestAllTypes()}
+  var subMessage: Proto2Unittest_TestAllTypes {
+    get {return _subMessage ?? Proto2Unittest_TestAllTypes()}
     set {_subMessage = newValue}
   }
   /// Returns true if `subMessage` has been explicitly set.
@@ -2803,28 +2803,28 @@ struct ProtobufUnittest_TestLazyMessage: Sendable {
 
   init() {}
 
-  fileprivate var _subMessage: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _subMessage: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestLazyMessageRepeated: Sendable {
+struct Proto2Unittest_TestLazyMessageRepeated: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var repeatedMessage: [ProtobufUnittest_TestLazyMessage] = []
+  var repeatedMessage: [Proto2Unittest_TestLazyMessage] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestEagerMaybeLazy: Sendable {
+struct Proto2Unittest_TestEagerMaybeLazy: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var messageFoo: ProtobufUnittest_TestAllTypes {
-    get {return _messageFoo ?? ProtobufUnittest_TestAllTypes()}
+  var messageFoo: Proto2Unittest_TestAllTypes {
+    get {return _messageFoo ?? Proto2Unittest_TestAllTypes()}
     set {_messageFoo = newValue}
   }
   /// Returns true if `messageFoo` has been explicitly set.
@@ -2832,8 +2832,8 @@ struct ProtobufUnittest_TestEagerMaybeLazy: Sendable {
   /// Clears the value of `messageFoo`. Subsequent reads from it will return its default value.
   mutating func clearMessageFoo() {self._messageFoo = nil}
 
-  var messageBar: ProtobufUnittest_TestAllTypes {
-    get {return _messageBar ?? ProtobufUnittest_TestAllTypes()}
+  var messageBar: Proto2Unittest_TestAllTypes {
+    get {return _messageBar ?? Proto2Unittest_TestAllTypes()}
     set {_messageBar = newValue}
   }
   /// Returns true if `messageBar` has been explicitly set.
@@ -2841,8 +2841,8 @@ struct ProtobufUnittest_TestEagerMaybeLazy: Sendable {
   /// Clears the value of `messageBar`. Subsequent reads from it will return its default value.
   mutating func clearMessageBar() {self._messageBar = nil}
 
-  var messageBaz: ProtobufUnittest_TestEagerMaybeLazy.NestedMessage {
-    get {return _messageBaz ?? ProtobufUnittest_TestEagerMaybeLazy.NestedMessage()}
+  var messageBaz: Proto2Unittest_TestEagerMaybeLazy.NestedMessage {
+    get {return _messageBaz ?? Proto2Unittest_TestEagerMaybeLazy.NestedMessage()}
     set {_messageBaz = newValue}
   }
   /// Returns true if `messageBaz` has been explicitly set.
@@ -2857,8 +2857,8 @@ struct ProtobufUnittest_TestEagerMaybeLazy: Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var packed: ProtobufUnittest_TestPackedTypes {
-      get {return _packed ?? ProtobufUnittest_TestPackedTypes()}
+    var packed: Proto2Unittest_TestPackedTypes {
+      get {return _packed ?? Proto2Unittest_TestPackedTypes()}
       set {_packed = newValue}
     }
     /// Returns true if `packed` has been explicitly set.
@@ -2870,24 +2870,24 @@ struct ProtobufUnittest_TestEagerMaybeLazy: Sendable {
 
     init() {}
 
-    fileprivate var _packed: ProtobufUnittest_TestPackedTypes? = nil
+    fileprivate var _packed: Proto2Unittest_TestPackedTypes? = nil
   }
 
   init() {}
 
-  fileprivate var _messageFoo: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _messageBar: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _messageBaz: ProtobufUnittest_TestEagerMaybeLazy.NestedMessage? = nil
+  fileprivate var _messageFoo: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _messageBar: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _messageBaz: Proto2Unittest_TestEagerMaybeLazy.NestedMessage? = nil
 }
 
 /// Needed for a Python test.
-struct ProtobufUnittest_TestNestedMessageHasBits: Sendable {
+struct Proto2Unittest_TestNestedMessageHasBits: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalNestedMessage: ProtobufUnittest_TestNestedMessageHasBits.NestedMessage {
-    get {return _optionalNestedMessage ?? ProtobufUnittest_TestNestedMessageHasBits.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestNestedMessageHasBits.NestedMessage {
+    get {return _optionalNestedMessage ?? Proto2Unittest_TestNestedMessageHasBits.NestedMessage()}
     set {_optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -2904,7 +2904,7 @@ struct ProtobufUnittest_TestNestedMessageHasBits: Sendable {
 
     var nestedmessageRepeatedInt32: [Int32] = []
 
-    var nestedmessageRepeatedForeignmessage: [ProtobufUnittest_ForeignMessage] = []
+    var nestedmessageRepeatedForeignmessage: [Proto2Unittest_ForeignMessage] = []
 
     var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -2913,12 +2913,12 @@ struct ProtobufUnittest_TestNestedMessageHasBits: Sendable {
 
   init() {}
 
-  fileprivate var _optionalNestedMessage: ProtobufUnittest_TestNestedMessageHasBits.NestedMessage? = nil
+  fileprivate var _optionalNestedMessage: Proto2Unittest_TestNestedMessageHasBits.NestedMessage? = nil
 }
 
 /// Test message with CamelCase field names.  This violates Protocol Buffer
 /// standard style.
-struct ProtobufUnittest_TestCamelCaseFieldNames: Sendable {
+struct Proto2Unittest_TestCamelCaseFieldNames: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -2941,7 +2941,7 @@ struct ProtobufUnittest_TestCamelCaseFieldNames: Sendable {
   /// Clears the value of `stringField`. Subsequent reads from it will return its default value.
   mutating func clearStringField() {self._stringField = nil}
 
-  var enumField: ProtobufUnittest_ForeignEnum {
+  var enumField: Proto2Unittest_ForeignEnum {
     get {return _enumField ?? .foreignFoo}
     set {_enumField = newValue}
   }
@@ -2950,8 +2950,8 @@ struct ProtobufUnittest_TestCamelCaseFieldNames: Sendable {
   /// Clears the value of `enumField`. Subsequent reads from it will return its default value.
   mutating func clearEnumField() {self._enumField = nil}
 
-  var messageField: ProtobufUnittest_ForeignMessage {
-    get {return _messageField ?? ProtobufUnittest_ForeignMessage()}
+  var messageField: Proto2Unittest_ForeignMessage {
+    get {return _messageField ?? Proto2Unittest_ForeignMessage()}
     set {_messageField = newValue}
   }
   /// Returns true if `messageField` has been explicitly set.
@@ -2981,9 +2981,9 @@ struct ProtobufUnittest_TestCamelCaseFieldNames: Sendable {
 
   var repeatedStringField: [String] = []
 
-  var repeatedEnumField: [ProtobufUnittest_ForeignEnum] = []
+  var repeatedEnumField: [Proto2Unittest_ForeignEnum] = []
 
-  var repeatedMessageField: [ProtobufUnittest_ForeignMessage] = []
+  var repeatedMessageField: [Proto2Unittest_ForeignMessage] = []
 
   var repeatedStringPieceField: [String] = []
 
@@ -2995,15 +2995,15 @@ struct ProtobufUnittest_TestCamelCaseFieldNames: Sendable {
 
   fileprivate var _primitiveField: Int32? = nil
   fileprivate var _stringField: String? = nil
-  fileprivate var _enumField: ProtobufUnittest_ForeignEnum? = nil
-  fileprivate var _messageField: ProtobufUnittest_ForeignMessage? = nil
+  fileprivate var _enumField: Proto2Unittest_ForeignEnum? = nil
+  fileprivate var _messageField: Proto2Unittest_ForeignMessage? = nil
   fileprivate var _stringPieceField: String? = nil
   fileprivate var _cordField: String? = nil
 }
 
 /// We list fields out of order, to ensure that we're using field number and not
 /// field index to determine serialization order.
-struct ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestFieldOrderings: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3035,8 +3035,8 @@ struct ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.ExtensibleMessage, Sen
   /// Clears the value of `myFloat`. Subsequent reads from it will return its default value.
   mutating func clearMyFloat() {self._myFloat = nil}
 
-  var optionalNestedMessage: ProtobufUnittest_TestFieldOrderings.NestedMessage {
-    get {return _optionalNestedMessage ?? ProtobufUnittest_TestFieldOrderings.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestFieldOrderings.NestedMessage {
+    get {return _optionalNestedMessage ?? Proto2Unittest_TestFieldOrderings.NestedMessage()}
     set {_optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -3086,10 +3086,10 @@ struct ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.ExtensibleMessage, Sen
   fileprivate var _myString: String? = nil
   fileprivate var _myInt: Int64? = nil
   fileprivate var _myFloat: Float? = nil
-  fileprivate var _optionalNestedMessage: ProtobufUnittest_TestFieldOrderings.NestedMessage? = nil
+  fileprivate var _optionalNestedMessage: Proto2Unittest_TestFieldOrderings.NestedMessage? = nil
 }
 
-struct ProtobufUnittest_TestExtensionOrderings1: Sendable {
+struct Proto2Unittest_TestExtensionOrderings1: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3110,7 +3110,7 @@ struct ProtobufUnittest_TestExtensionOrderings1: Sendable {
   fileprivate var _myString: String? = nil
 }
 
-struct ProtobufUnittest_TestExtensionOrderings2: Sendable {
+struct Proto2Unittest_TestExtensionOrderings2: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3152,7 +3152,7 @@ struct ProtobufUnittest_TestExtensionOrderings2: Sendable {
   fileprivate var _myString: String? = nil
 }
 
-struct ProtobufUnittest_TestExtremeDefaultValues: @unchecked Sendable {
+struct Proto2Unittest_TestExtremeDefaultValues: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3419,12 +3419,12 @@ struct ProtobufUnittest_TestExtremeDefaultValues: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_SparseEnumMessage: Sendable {
+struct Proto2Unittest_SparseEnumMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var sparseEnum: ProtobufUnittest_TestSparseEnum {
+  var sparseEnum: Proto2Unittest_TestSparseEnum {
     get {return _sparseEnum ?? .sparseA}
     set {_sparseEnum = newValue}
   }
@@ -3437,11 +3437,11 @@ struct ProtobufUnittest_SparseEnumMessage: Sendable {
 
   init() {}
 
-  fileprivate var _sparseEnum: ProtobufUnittest_TestSparseEnum? = nil
+  fileprivate var _sparseEnum: Proto2Unittest_TestSparseEnum? = nil
 }
 
 /// Test String and Bytes: string is for valid UTF-8 strings
-struct ProtobufUnittest_OneString: Sendable {
+struct Proto2Unittest_OneString: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3462,7 +3462,7 @@ struct ProtobufUnittest_OneString: Sendable {
   fileprivate var _data: String? = nil
 }
 
-struct ProtobufUnittest_MoreString: Sendable {
+struct Proto2Unittest_MoreString: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3474,7 +3474,7 @@ struct ProtobufUnittest_MoreString: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_OneBytes: @unchecked Sendable {
+struct Proto2Unittest_OneBytes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3495,7 +3495,7 @@ struct ProtobufUnittest_OneBytes: @unchecked Sendable {
   fileprivate var _data: Data? = nil
 }
 
-struct ProtobufUnittest_MoreBytes: @unchecked Sendable {
+struct Proto2Unittest_MoreBytes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3507,7 +3507,7 @@ struct ProtobufUnittest_MoreBytes: @unchecked Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_ManyOptionalString: @unchecked Sendable {
+struct Proto2Unittest_ManyOptionalString: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3808,7 +3808,7 @@ struct ProtobufUnittest_ManyOptionalString: @unchecked Sendable {
 }
 
 /// Test int32, uint32, int64, uint64, and bool are all compatible
-struct ProtobufUnittest_Int32Message: Sendable {
+struct Proto2Unittest_Int32Message: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3829,7 +3829,7 @@ struct ProtobufUnittest_Int32Message: Sendable {
   fileprivate var _data: Int32? = nil
 }
 
-struct ProtobufUnittest_Uint32Message: Sendable {
+struct Proto2Unittest_Uint32Message: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3850,7 +3850,7 @@ struct ProtobufUnittest_Uint32Message: Sendable {
   fileprivate var _data: UInt32? = nil
 }
 
-struct ProtobufUnittest_Int64Message: Sendable {
+struct Proto2Unittest_Int64Message: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3871,7 +3871,7 @@ struct ProtobufUnittest_Int64Message: Sendable {
   fileprivate var _data: Int64? = nil
 }
 
-struct ProtobufUnittest_Uint64Message: Sendable {
+struct Proto2Unittest_Uint64Message: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3892,7 +3892,7 @@ struct ProtobufUnittest_Uint64Message: Sendable {
   fileprivate var _data: UInt64? = nil
 }
 
-struct ProtobufUnittest_BoolMessage: Sendable {
+struct Proto2Unittest_BoolMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -3914,12 +3914,12 @@ struct ProtobufUnittest_BoolMessage: Sendable {
 }
 
 /// Test oneofs.
-struct ProtobufUnittest_TestOneof: Sendable {
+struct Proto2Unittest_TestOneof: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var foo: ProtobufUnittest_TestOneof.OneOf_Foo? = nil
+  var foo: Proto2Unittest_TestOneof.OneOf_Foo? = nil
 
   var fooInt: Int32 {
     get {
@@ -3937,18 +3937,18 @@ struct ProtobufUnittest_TestOneof: Sendable {
     set {foo = .fooString(newValue)}
   }
 
-  var fooMessage: ProtobufUnittest_TestAllTypes {
+  var fooMessage: Proto2Unittest_TestAllTypes {
     get {
       if case .fooMessage(let v)? = foo {return v}
-      return ProtobufUnittest_TestAllTypes()
+      return Proto2Unittest_TestAllTypes()
     }
     set {foo = .fooMessage(newValue)}
   }
 
-  var fooGroup: ProtobufUnittest_TestOneof.FooGroup {
+  var fooGroup: Proto2Unittest_TestOneof.FooGroup {
     get {
       if case .fooGroup(let v)? = foo {return v}
-      return ProtobufUnittest_TestOneof.FooGroup()
+      return Proto2Unittest_TestOneof.FooGroup()
     }
     set {foo = .fooGroup(newValue)}
   }
@@ -3958,8 +3958,8 @@ struct ProtobufUnittest_TestOneof: Sendable {
   enum OneOf_Foo: Equatable, Sendable {
     case fooInt(Int32)
     case fooString(String)
-    case fooMessage(ProtobufUnittest_TestAllTypes)
-    case fooGroup(ProtobufUnittest_TestOneof.FooGroup)
+    case fooMessage(Proto2Unittest_TestAllTypes)
+    case fooGroup(Proto2Unittest_TestOneof.FooGroup)
 
   }
 
@@ -3997,7 +3997,7 @@ struct ProtobufUnittest_TestOneof: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestOneofBackwardsCompatible: Sendable {
+struct Proto2Unittest_TestOneofBackwardsCompatible: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4020,8 +4020,8 @@ struct ProtobufUnittest_TestOneofBackwardsCompatible: Sendable {
   /// Clears the value of `fooString`. Subsequent reads from it will return its default value.
   mutating func clearFooString() {self._fooString = nil}
 
-  var fooMessage: ProtobufUnittest_TestAllTypes {
-    get {return _fooMessage ?? ProtobufUnittest_TestAllTypes()}
+  var fooMessage: Proto2Unittest_TestAllTypes {
+    get {return _fooMessage ?? Proto2Unittest_TestAllTypes()}
     set {_fooMessage = newValue}
   }
   /// Returns true if `fooMessage` has been explicitly set.
@@ -4029,8 +4029,8 @@ struct ProtobufUnittest_TestOneofBackwardsCompatible: Sendable {
   /// Clears the value of `fooMessage`. Subsequent reads from it will return its default value.
   mutating func clearFooMessage() {self._fooMessage = nil}
 
-  var fooGroup: ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup {
-    get {return _fooGroup ?? ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup()}
+  var fooGroup: Proto2Unittest_TestOneofBackwardsCompatible.FooGroup {
+    get {return _fooGroup ?? Proto2Unittest_TestOneofBackwardsCompatible.FooGroup()}
     set {_fooGroup = newValue}
   }
   /// Returns true if `fooGroup` has been explicitly set.
@@ -4075,16 +4075,16 @@ struct ProtobufUnittest_TestOneofBackwardsCompatible: Sendable {
 
   fileprivate var _fooInt: Int32? = nil
   fileprivate var _fooString: String? = nil
-  fileprivate var _fooMessage: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _fooGroup: ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup? = nil
+  fileprivate var _fooMessage: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _fooGroup: Proto2Unittest_TestOneofBackwardsCompatible.FooGroup? = nil
 }
 
-struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
+struct Proto2Unittest_TestOneof2: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var foo: ProtobufUnittest_TestOneof2.OneOf_Foo? = nil
+  var foo: Proto2Unittest_TestOneof2.OneOf_Foo? = nil
 
   var fooInt: Int32 {
     get {
@@ -4126,7 +4126,7 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     set {foo = .fooBytes(newValue)}
   }
 
-  var fooEnum: ProtobufUnittest_TestOneof2.NestedEnum {
+  var fooEnum: Proto2Unittest_TestOneof2.NestedEnum {
     get {
       if case .fooEnum(let v)? = foo {return v}
       return .foo
@@ -4134,26 +4134,26 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     set {foo = .fooEnum(newValue)}
   }
 
-  var fooMessage: ProtobufUnittest_TestOneof2.NestedMessage {
+  var fooMessage: Proto2Unittest_TestOneof2.NestedMessage {
     get {
       if case .fooMessage(let v)? = foo {return v}
-      return ProtobufUnittest_TestOneof2.NestedMessage()
+      return Proto2Unittest_TestOneof2.NestedMessage()
     }
     set {foo = .fooMessage(newValue)}
   }
 
-  var fooGroup: ProtobufUnittest_TestOneof2.FooGroup {
+  var fooGroup: Proto2Unittest_TestOneof2.FooGroup {
     get {
       if case .fooGroup(let v)? = foo {return v}
-      return ProtobufUnittest_TestOneof2.FooGroup()
+      return Proto2Unittest_TestOneof2.FooGroup()
     }
     set {foo = .fooGroup(newValue)}
   }
 
-  var fooLazyMessage: ProtobufUnittest_TestOneof2.NestedMessage {
+  var fooLazyMessage: Proto2Unittest_TestOneof2.NestedMessage {
     get {
       if case .fooLazyMessage(let v)? = foo {return v}
-      return ProtobufUnittest_TestOneof2.NestedMessage()
+      return Proto2Unittest_TestOneof2.NestedMessage()
     }
     set {foo = .fooLazyMessage(newValue)}
   }
@@ -4166,7 +4166,7 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     set {foo = .fooBytesCord(newValue)}
   }
 
-  var bar: ProtobufUnittest_TestOneof2.OneOf_Bar? = nil
+  var bar: Proto2Unittest_TestOneof2.OneOf_Bar? = nil
 
   var barInt: Int32 {
     get {
@@ -4208,7 +4208,7 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     set {bar = .barBytes(newValue)}
   }
 
-  var barEnum: ProtobufUnittest_TestOneof2.NestedEnum {
+  var barEnum: Proto2Unittest_TestOneof2.NestedEnum {
     get {
       if case .barEnum(let v)? = bar {return v}
       return .bar
@@ -4274,10 +4274,10 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     case fooCord(String)
     case fooStringPiece(String)
     case fooBytes(Data)
-    case fooEnum(ProtobufUnittest_TestOneof2.NestedEnum)
-    case fooMessage(ProtobufUnittest_TestOneof2.NestedMessage)
-    case fooGroup(ProtobufUnittest_TestOneof2.FooGroup)
-    case fooLazyMessage(ProtobufUnittest_TestOneof2.NestedMessage)
+    case fooEnum(Proto2Unittest_TestOneof2.NestedEnum)
+    case fooMessage(Proto2Unittest_TestOneof2.NestedMessage)
+    case fooGroup(Proto2Unittest_TestOneof2.FooGroup)
+    case fooLazyMessage(Proto2Unittest_TestOneof2.NestedMessage)
     case fooBytesCord(Data)
 
   }
@@ -4288,7 +4288,7 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
     case barCord(String)
     case barStringPiece(String)
     case barBytes(Data)
-    case barEnum(ProtobufUnittest_TestOneof2.NestedEnum)
+    case barEnum(Proto2Unittest_TestOneof2.NestedEnum)
     case barStringWithEmptyDefault(String)
     case barCordWithEmptyDefault(String)
     case barStringPieceWithEmptyDefault(String)
@@ -4357,8 +4357,8 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
       set {_uniqueStorage()._corgeInt = newValue}
     }
 
-    var child: ProtobufUnittest_TestOneof2.NestedMessage {
-      get {return _storage._child ?? ProtobufUnittest_TestOneof2.NestedMessage()}
+    var child: Proto2Unittest_TestOneof2.NestedMessage {
+      get {return _storage._child ?? Proto2Unittest_TestOneof2.NestedMessage()}
       set {_uniqueStorage()._child = newValue}
     }
     /// Returns true if `child` has been explicitly set.
@@ -4379,12 +4379,12 @@ struct ProtobufUnittest_TestOneof2: @unchecked Sendable {
   fileprivate var _bazString: String? = nil
 }
 
-struct ProtobufUnittest_TestRequiredOneof: Sendable {
+struct Proto2Unittest_TestRequiredOneof: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var foo: ProtobufUnittest_TestRequiredOneof.OneOf_Foo? = nil
+  var foo: Proto2Unittest_TestRequiredOneof.OneOf_Foo? = nil
 
   var fooInt: Int32 {
     get {
@@ -4402,18 +4402,18 @@ struct ProtobufUnittest_TestRequiredOneof: Sendable {
     set {foo = .fooString(newValue)}
   }
 
-  var fooMessage: ProtobufUnittest_TestRequiredOneof.NestedMessage {
+  var fooMessage: Proto2Unittest_TestRequiredOneof.NestedMessage {
     get {
       if case .fooMessage(let v)? = foo {return v}
-      return ProtobufUnittest_TestRequiredOneof.NestedMessage()
+      return Proto2Unittest_TestRequiredOneof.NestedMessage()
     }
     set {foo = .fooMessage(newValue)}
   }
 
-  var fooLazyMessage: ProtobufUnittest_TestRequiredOneof.NestedMessage {
+  var fooLazyMessage: Proto2Unittest_TestRequiredOneof.NestedMessage {
     get {
       if case .fooLazyMessage(let v)? = foo {return v}
-      return ProtobufUnittest_TestRequiredOneof.NestedMessage()
+      return Proto2Unittest_TestRequiredOneof.NestedMessage()
     }
     set {foo = .fooLazyMessage(newValue)}
   }
@@ -4423,8 +4423,8 @@ struct ProtobufUnittest_TestRequiredOneof: Sendable {
   enum OneOf_Foo: Equatable, Sendable {
     case fooInt(Int32)
     case fooString(String)
-    case fooMessage(ProtobufUnittest_TestRequiredOneof.NestedMessage)
-    case fooLazyMessage(ProtobufUnittest_TestRequiredOneof.NestedMessage)
+    case fooMessage(Proto2Unittest_TestRequiredOneof.NestedMessage)
+    case fooLazyMessage(Proto2Unittest_TestRequiredOneof.NestedMessage)
 
     fileprivate var isInitialized: Bool {
       // The use of inline closures is to circumvent an issue where the compiler
@@ -4469,7 +4469,7 @@ struct ProtobufUnittest_TestRequiredOneof: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestPackedTypes: Sendable {
+struct Proto2Unittest_TestPackedTypes: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4500,7 +4500,7 @@ struct ProtobufUnittest_TestPackedTypes: Sendable {
 
   var packedBool: [Bool] = []
 
-  var packedEnum: [ProtobufUnittest_ForeignEnum] = []
+  var packedEnum: [Proto2Unittest_ForeignEnum] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -4509,7 +4509,7 @@ struct ProtobufUnittest_TestPackedTypes: Sendable {
 
 /// A message with the same fields as TestPackedTypes, but without packing. Used
 /// to test packed <-> unpacked wire compatibility.
-struct ProtobufUnittest_TestUnpackedTypes: Sendable {
+struct Proto2Unittest_TestUnpackedTypes: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4540,14 +4540,14 @@ struct ProtobufUnittest_TestUnpackedTypes: Sendable {
 
   var unpackedBool: [Bool] = []
 
-  var unpackedEnum: [ProtobufUnittest_ForeignEnum] = []
+  var unpackedEnum: [Proto2Unittest_ForeignEnum] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestPackedExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestPackedExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4559,7 +4559,7 @@ struct ProtobufUnittest_TestPackedExtensions: SwiftProtobuf.ExtensibleMessage, S
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_TestUnpackedExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestUnpackedExtensions: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4574,7 +4574,7 @@ struct ProtobufUnittest_TestUnpackedExtensions: SwiftProtobuf.ExtensibleMessage,
 /// Used by ExtensionSetTest/DynamicExtensions.  The test actually builds
 /// a set of extensions to TestAllExtensions dynamically, based on the fields
 /// of this message type.
-struct ProtobufUnittest_TestDynamicExtensions: Sendable {
+struct Proto2Unittest_TestDynamicExtensions: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4588,7 +4588,7 @@ struct ProtobufUnittest_TestDynamicExtensions: Sendable {
   /// Clears the value of `scalarExtension`. Subsequent reads from it will return its default value.
   mutating func clearScalarExtension() {self._scalarExtension = nil}
 
-  var enumExtension: ProtobufUnittest_ForeignEnum {
+  var enumExtension: Proto2Unittest_ForeignEnum {
     get {return _enumExtension ?? .foreignFoo}
     set {_enumExtension = newValue}
   }
@@ -4597,7 +4597,7 @@ struct ProtobufUnittest_TestDynamicExtensions: Sendable {
   /// Clears the value of `enumExtension`. Subsequent reads from it will return its default value.
   mutating func clearEnumExtension() {self._enumExtension = nil}
 
-  var dynamicEnumExtension: ProtobufUnittest_TestDynamicExtensions.DynamicEnumType {
+  var dynamicEnumExtension: Proto2Unittest_TestDynamicExtensions.DynamicEnumType {
     get {return _dynamicEnumExtension ?? .dynamicFoo}
     set {_dynamicEnumExtension = newValue}
   }
@@ -4606,8 +4606,8 @@ struct ProtobufUnittest_TestDynamicExtensions: Sendable {
   /// Clears the value of `dynamicEnumExtension`. Subsequent reads from it will return its default value.
   mutating func clearDynamicEnumExtension() {self._dynamicEnumExtension = nil}
 
-  var messageExtension: ProtobufUnittest_ForeignMessage {
-    get {return _messageExtension ?? ProtobufUnittest_ForeignMessage()}
+  var messageExtension: Proto2Unittest_ForeignMessage {
+    get {return _messageExtension ?? Proto2Unittest_ForeignMessage()}
     set {_messageExtension = newValue}
   }
   /// Returns true if `messageExtension` has been explicitly set.
@@ -4615,8 +4615,8 @@ struct ProtobufUnittest_TestDynamicExtensions: Sendable {
   /// Clears the value of `messageExtension`. Subsequent reads from it will return its default value.
   mutating func clearMessageExtension() {self._messageExtension = nil}
 
-  var dynamicMessageExtension: ProtobufUnittest_TestDynamicExtensions.DynamicMessageType {
-    get {return _dynamicMessageExtension ?? ProtobufUnittest_TestDynamicExtensions.DynamicMessageType()}
+  var dynamicMessageExtension: Proto2Unittest_TestDynamicExtensions.DynamicMessageType {
+    get {return _dynamicMessageExtension ?? Proto2Unittest_TestDynamicExtensions.DynamicMessageType()}
     set {_dynamicMessageExtension = newValue}
   }
   /// Returns true if `dynamicMessageExtension` has been explicitly set.
@@ -4665,13 +4665,13 @@ struct ProtobufUnittest_TestDynamicExtensions: Sendable {
   init() {}
 
   fileprivate var _scalarExtension: UInt32? = nil
-  fileprivate var _enumExtension: ProtobufUnittest_ForeignEnum? = nil
-  fileprivate var _dynamicEnumExtension: ProtobufUnittest_TestDynamicExtensions.DynamicEnumType? = nil
-  fileprivate var _messageExtension: ProtobufUnittest_ForeignMessage? = nil
-  fileprivate var _dynamicMessageExtension: ProtobufUnittest_TestDynamicExtensions.DynamicMessageType? = nil
+  fileprivate var _enumExtension: Proto2Unittest_ForeignEnum? = nil
+  fileprivate var _dynamicEnumExtension: Proto2Unittest_TestDynamicExtensions.DynamicEnumType? = nil
+  fileprivate var _messageExtension: Proto2Unittest_ForeignMessage? = nil
+  fileprivate var _dynamicMessageExtension: Proto2Unittest_TestDynamicExtensions.DynamicMessageType? = nil
 }
 
-struct ProtobufUnittest_TestRepeatedString: @unchecked Sendable {
+struct Proto2Unittest_TestRepeatedString: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4689,7 +4689,7 @@ struct ProtobufUnittest_TestRepeatedString: @unchecked Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestRepeatedScalarDifferentTagSizes: Sendable {
+struct Proto2Unittest_TestRepeatedScalarDifferentTagSizes: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4719,13 +4719,13 @@ struct ProtobufUnittest_TestRepeatedScalarDifferentTagSizes: Sendable {
 
 /// Test that if an optional or required message/group field appears multiple
 /// times in the input, they need to be merged.
-struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var requiredAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _requiredAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var requiredAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _requiredAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_requiredAllTypes = newValue}
   }
   /// Returns true if `requiredAllTypes` has been explicitly set.
@@ -4733,8 +4733,8 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
   /// Clears the value of `requiredAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearRequiredAllTypes() {self._requiredAllTypes = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -4742,10 +4742,10 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
-  var optionalGroup: ProtobufUnittest_TestParsingMerge.OptionalGroup {
-    get {return _optionalGroup ?? ProtobufUnittest_TestParsingMerge.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestParsingMerge.OptionalGroup {
+    get {return _optionalGroup ?? Proto2Unittest_TestParsingMerge.OptionalGroup()}
     set {_optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -4753,7 +4753,7 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
   /// Clears the value of `optionalGroup`. Subsequent reads from it will return its default value.
   mutating func clearOptionalGroup() {self._optionalGroup = nil}
 
-  var repeatedGroup: [ProtobufUnittest_TestParsingMerge.RepeatedGroup] = []
+  var repeatedGroup: [Proto2Unittest_TestParsingMerge.RepeatedGroup] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -4767,19 +4767,19 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var field1: [ProtobufUnittest_TestAllTypes] = []
+    var field1: [Proto2Unittest_TestAllTypes] = []
 
-    var field2: [ProtobufUnittest_TestAllTypes] = []
+    var field2: [Proto2Unittest_TestAllTypes] = []
 
-    var field3: [ProtobufUnittest_TestAllTypes] = []
+    var field3: [Proto2Unittest_TestAllTypes] = []
 
-    var group1: [ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group1] = []
+    var group1: [Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group1] = []
 
-    var group2: [ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group2] = []
+    var group2: [Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group2] = []
 
-    var ext1: [ProtobufUnittest_TestAllTypes] = []
+    var ext1: [Proto2Unittest_TestAllTypes] = []
 
-    var ext2: [ProtobufUnittest_TestAllTypes] = []
+    var ext2: [Proto2Unittest_TestAllTypes] = []
 
     var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -4788,8 +4788,8 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
       // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
       // methods supported on all messages.
 
-      var field1: ProtobufUnittest_TestAllTypes {
-        get {return _field1 ?? ProtobufUnittest_TestAllTypes()}
+      var field1: Proto2Unittest_TestAllTypes {
+        get {return _field1 ?? Proto2Unittest_TestAllTypes()}
         set {_field1 = newValue}
       }
       /// Returns true if `field1` has been explicitly set.
@@ -4801,7 +4801,7 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
 
       init() {}
 
-      fileprivate var _field1: ProtobufUnittest_TestAllTypes? = nil
+      fileprivate var _field1: Proto2Unittest_TestAllTypes? = nil
     }
 
     struct Group2: Sendable {
@@ -4809,8 +4809,8 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
       // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
       // methods supported on all messages.
 
-      var field1: ProtobufUnittest_TestAllTypes {
-        get {return _field1 ?? ProtobufUnittest_TestAllTypes()}
+      var field1: Proto2Unittest_TestAllTypes {
+        get {return _field1 ?? Proto2Unittest_TestAllTypes()}
         set {_field1 = newValue}
       }
       /// Returns true if `field1` has been explicitly set.
@@ -4822,7 +4822,7 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
 
       init() {}
 
-      fileprivate var _field1: ProtobufUnittest_TestAllTypes? = nil
+      fileprivate var _field1: Proto2Unittest_TestAllTypes? = nil
     }
 
     init() {}
@@ -4833,8 +4833,8 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var optionalGroupAllTypes: ProtobufUnittest_TestAllTypes {
-      get {return _optionalGroupAllTypes ?? ProtobufUnittest_TestAllTypes()}
+    var optionalGroupAllTypes: Proto2Unittest_TestAllTypes {
+      get {return _optionalGroupAllTypes ?? Proto2Unittest_TestAllTypes()}
       set {_optionalGroupAllTypes = newValue}
     }
     /// Returns true if `optionalGroupAllTypes` has been explicitly set.
@@ -4846,7 +4846,7 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
 
     init() {}
 
-    fileprivate var _optionalGroupAllTypes: ProtobufUnittest_TestAllTypes? = nil
+    fileprivate var _optionalGroupAllTypes: Proto2Unittest_TestAllTypes? = nil
   }
 
   struct RepeatedGroup: Sendable {
@@ -4854,8 +4854,8 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var repeatedGroupAllTypes: ProtobufUnittest_TestAllTypes {
-      get {return _repeatedGroupAllTypes ?? ProtobufUnittest_TestAllTypes()}
+    var repeatedGroupAllTypes: Proto2Unittest_TestAllTypes {
+      get {return _repeatedGroupAllTypes ?? Proto2Unittest_TestAllTypes()}
       set {_repeatedGroupAllTypes = newValue}
     }
     /// Returns true if `repeatedGroupAllTypes` has been explicitly set.
@@ -4867,26 +4867,26 @@ struct ProtobufUnittest_TestParsingMerge: SwiftProtobuf.ExtensibleMessage, Senda
 
     init() {}
 
-    fileprivate var _repeatedGroupAllTypes: ProtobufUnittest_TestAllTypes? = nil
+    fileprivate var _repeatedGroupAllTypes: Proto2Unittest_TestAllTypes? = nil
   }
 
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
-  fileprivate var _requiredAllTypes: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _optionalGroup: ProtobufUnittest_TestParsingMerge.OptionalGroup? = nil
+  fileprivate var _requiredAllTypes: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _optionalGroup: Proto2Unittest_TestParsingMerge.OptionalGroup? = nil
 }
 
 /// Test that the correct exception is thrown by parseFrom in a corner case
 /// involving merging, extensions, and required fields.
-struct ProtobufUnittest_TestMergeException: Sendable {
+struct Proto2Unittest_TestMergeException: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var allExtensions: ProtobufUnittest_TestAllExtensions {
-    get {return _allExtensions ?? ProtobufUnittest_TestAllExtensions()}
+  var allExtensions: Proto2Unittest_TestAllExtensions {
+    get {return _allExtensions ?? Proto2Unittest_TestAllExtensions()}
     set {_allExtensions = newValue}
   }
   /// Returns true if `allExtensions` has been explicitly set.
@@ -4898,10 +4898,10 @@ struct ProtobufUnittest_TestMergeException: Sendable {
 
   init() {}
 
-  fileprivate var _allExtensions: ProtobufUnittest_TestAllExtensions? = nil
+  fileprivate var _allExtensions: Proto2Unittest_TestAllExtensions? = nil
 }
 
-struct ProtobufUnittest_TestCommentInjectionMessage: Sendable {
+struct Proto2Unittest_TestCommentInjectionMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4925,7 +4925,7 @@ struct ProtobufUnittest_TestCommentInjectionMessage: Sendable {
 
 /// Used to check that the c++ code generator re-orders messages to reduce
 /// padding.
-struct ProtobufUnittest_TestMessageSize: Sendable {
+struct Proto2Unittest_TestMessageSize: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -4996,12 +4996,12 @@ struct ProtobufUnittest_TestMessageSize: Sendable {
   fileprivate var _m6: Int64? = nil
 }
 
-struct ProtobufUnittest_OpenEnumMessage: Sendable {
+struct Proto2Unittest_OpenEnumMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optOpen: ProtobufUnittest_OpenEnumMessage.TestEnum {
+  var optOpen: Proto2Unittest_OpenEnumMessage.TestEnum {
     get {return _optOpen ?? .unknown}
     set {_optOpen = newValue}
   }
@@ -5010,7 +5010,7 @@ struct ProtobufUnittest_OpenEnumMessage: Sendable {
   /// Clears the value of `optOpen`. Subsequent reads from it will return its default value.
   mutating func clearOptOpen() {self._optOpen = nil}
 
-  var optClosed: ProtobufUnittest_ForeignEnum {
+  var optClosed: Proto2Unittest_ForeignEnum {
     get {return _optClosed ?? .foreignFoo}
     set {_optClosed = newValue}
   }
@@ -5019,9 +5019,9 @@ struct ProtobufUnittest_OpenEnumMessage: Sendable {
   /// Clears the value of `optClosed`. Subsequent reads from it will return its default value.
   mutating func clearOptClosed() {self._optClosed = nil}
 
-  var repeatedOpen: [ProtobufUnittest_OpenEnumMessage.TestEnum] = []
+  var repeatedOpen: [Proto2Unittest_OpenEnumMessage.TestEnum] = []
 
-  var repeatedClosed: [ProtobufUnittest_ForeignEnum] = []
+  var repeatedClosed: [Proto2Unittest_ForeignEnum] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -5058,7 +5058,7 @@ struct ProtobufUnittest_OpenEnumMessage: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [ProtobufUnittest_OpenEnumMessage.TestEnum] = [
+    static let allCases: [Proto2Unittest_OpenEnumMessage.TestEnum] = [
       .unknown,
       .foo,
       .bar,
@@ -5069,18 +5069,18 @@ struct ProtobufUnittest_OpenEnumMessage: Sendable {
 
   init() {}
 
-  fileprivate var _optOpen: ProtobufUnittest_OpenEnumMessage.TestEnum? = nil
-  fileprivate var _optClosed: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _optOpen: Proto2Unittest_OpenEnumMessage.TestEnum? = nil
+  fileprivate var _optClosed: Proto2Unittest_ForeignEnum? = nil
 }
 
 /// Tests eager verification of a lazy message field.
-struct ProtobufUnittest_TestEagerlyVerifiedLazyMessage: Sendable {
+struct Proto2Unittest_TestEagerlyVerifiedLazyMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var lazyMessage: ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage {
-    get {return _lazyMessage ?? ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage()}
+  var lazyMessage: Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage {
+    get {return _lazyMessage ?? Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage()}
     set {_lazyMessage = newValue}
   }
   /// Returns true if `lazyMessage` has been explicitly set.
@@ -5113,11 +5113,11 @@ struct ProtobufUnittest_TestEagerlyVerifiedLazyMessage: Sendable {
 
   init() {}
 
-  fileprivate var _lazyMessage: ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage? = nil
+  fileprivate var _lazyMessage: Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage? = nil
 }
 
 /// Test that RPC services work.
-struct ProtobufUnittest_FooRequest: Sendable {
+struct Proto2Unittest_FooRequest: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5127,7 +5127,7 @@ struct ProtobufUnittest_FooRequest: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_FooResponse: Sendable {
+struct Proto2Unittest_FooResponse: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5137,7 +5137,7 @@ struct ProtobufUnittest_FooResponse: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_FooClientMessage: Sendable {
+struct Proto2Unittest_FooClientMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5147,7 +5147,7 @@ struct ProtobufUnittest_FooClientMessage: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_FooServerMessage: Sendable {
+struct Proto2Unittest_FooServerMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5157,7 +5157,7 @@ struct ProtobufUnittest_FooServerMessage: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_BarRequest: Sendable {
+struct Proto2Unittest_BarRequest: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5167,7 +5167,7 @@ struct ProtobufUnittest_BarRequest: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_BarResponse: Sendable {
+struct Proto2Unittest_BarResponse: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5177,7 +5177,7 @@ struct ProtobufUnittest_BarResponse: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestJsonName: Sendable {
+struct Proto2Unittest_TestJsonName: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5258,7 +5258,7 @@ struct ProtobufUnittest_TestJsonName: Sendable {
   fileprivate var _fieldname7: Int32? = nil
 }
 
-struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
+struct Proto2Unittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5285,7 +5285,7 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
 
   var packedInt32: [Int32] = []
 
-  var optionalEnum: ProtobufUnittest_ForeignEnum {
+  var optionalEnum: Proto2Unittest_ForeignEnum {
     get {return _optionalEnum ?? .foreignFoo}
     set {_optionalEnum = newValue}
   }
@@ -5312,8 +5312,8 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
   /// Clears the value of `optionalBytes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBytes() {self._optionalBytes = nil}
 
-  var optionalMessage: ProtobufUnittest_ForeignMessage {
-    get {return _optionalMessage ?? ProtobufUnittest_ForeignMessage()}
+  var optionalMessage: Proto2Unittest_ForeignMessage {
+    get {return _optionalMessage ?? Proto2Unittest_ForeignMessage()}
     set {_optionalMessage = newValue}
   }
   /// Returns true if `optionalMessage` has been explicitly set.
@@ -5321,8 +5321,8 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
   /// Clears the value of `optionalMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalMessage() {self._optionalMessage = nil}
 
-  var optionalGroup: ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup {
-    get {return _optionalGroup ?? ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestHugeFieldNumbers.OptionalGroup {
+    get {return _optionalGroup ?? Proto2Unittest_TestHugeFieldNumbers.OptionalGroup()}
     set {_optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -5332,7 +5332,7 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
 
   var stringStringMap: Dictionary<String,String> = [:]
 
-  var oneofField: ProtobufUnittest_TestHugeFieldNumbers.OneOf_OneofField? = nil
+  var oneofField: Proto2Unittest_TestHugeFieldNumbers.OneOf_OneofField? = nil
 
   var oneofUint32: UInt32 {
     get {
@@ -5342,10 +5342,10 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
     set {oneofField = .oneofUint32(newValue)}
   }
 
-  var oneofTestAllTypes: ProtobufUnittest_TestAllTypes {
+  var oneofTestAllTypes: Proto2Unittest_TestAllTypes {
     get {
       if case .oneofTestAllTypes(let v)? = oneofField {return v}
-      return ProtobufUnittest_TestAllTypes()
+      return Proto2Unittest_TestAllTypes()
     }
     set {oneofField = .oneofTestAllTypes(newValue)}
   }
@@ -5370,7 +5370,7 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
     case oneofUint32(UInt32)
-    case oneofTestAllTypes(ProtobufUnittest_TestAllTypes)
+    case oneofTestAllTypes(Proto2Unittest_TestAllTypes)
     case oneofString(String)
     case oneofBytes(Data)
 
@@ -5402,14 +5402,14 @@ struct ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.ExtensibleMessage, @
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
   fileprivate var _optionalInt32: Int32? = nil
   fileprivate var _fixed32: Int32? = nil
-  fileprivate var _optionalEnum: ProtobufUnittest_ForeignEnum? = nil
+  fileprivate var _optionalEnum: Proto2Unittest_ForeignEnum? = nil
   fileprivate var _optionalString: String? = nil
   fileprivate var _optionalBytes: Data? = nil
-  fileprivate var _optionalMessage: ProtobufUnittest_ForeignMessage? = nil
-  fileprivate var _optionalGroup: ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup? = nil
+  fileprivate var _optionalMessage: Proto2Unittest_ForeignMessage? = nil
+  fileprivate var _optionalGroup: Proto2Unittest_TestHugeFieldNumbers.OptionalGroup? = nil
 }
 
-struct ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestExtensionInsideTable: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5512,13 +5512,13 @@ struct ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.ExtensibleMessag
 }
 
 /// NOTE: Intentionally nested to mirror go/glep.
-struct ProtobufUnittest_TestNestedGroupExtensionOuter: Sendable {
+struct Proto2Unittest_TestNestedGroupExtensionOuter: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var layer1OptionalGroup: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup {
-    get {return _layer1OptionalGroup ?? ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup()}
+  var layer1OptionalGroup: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup {
+    get {return _layer1OptionalGroup ?? Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup()}
     set {_layer1OptionalGroup = newValue}
   }
   /// Returns true if `layer1OptionalGroup` has been explicitly set.
@@ -5533,9 +5533,9 @@ struct ProtobufUnittest_TestNestedGroupExtensionOuter: Sendable {
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var layer2RepeatedGroup: [ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup] = []
+    var layer2RepeatedGroup: [Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup] = []
 
-    var layer2AnotherOptionalRepeatedGroup: [ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup] = []
+    var layer2AnotherOptionalRepeatedGroup: [Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup] = []
 
     var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -5587,10 +5587,10 @@ struct ProtobufUnittest_TestNestedGroupExtensionOuter: Sendable {
 
   init() {}
 
-  fileprivate var _layer1OptionalGroup: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup? = nil
+  fileprivate var _layer1OptionalGroup: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup? = nil
 }
 
-struct ProtobufUnittest_TestNestedGroupExtensionInnerExtension: Sendable {
+struct Proto2Unittest_TestNestedGroupExtensionInnerExtension: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5611,7 +5611,7 @@ struct ProtobufUnittest_TestNestedGroupExtensionInnerExtension: Sendable {
   fileprivate var _innerName: String? = nil
 }
 
-struct ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestExtensionRangeSerialize: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5663,7 +5663,7 @@ struct ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.ExtensibleMes
   fileprivate var _fooFour: Int32? = nil
 }
 
-struct ProtobufUnittest_TestVerifyInt32Simple: Sendable {
+struct Proto2Unittest_TestVerifyInt32Simple: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5714,7 +5714,7 @@ struct ProtobufUnittest_TestVerifyInt32Simple: Sendable {
   fileprivate var _optionalInt3264: Int32? = nil
 }
 
-struct ProtobufUnittest_TestVerifyInt32: Sendable {
+struct Proto2Unittest_TestVerifyInt32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5755,8 +5755,8 @@ struct ProtobufUnittest_TestVerifyInt32: Sendable {
   /// Clears the value of `optionalInt3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt3264() {self._optionalInt3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -5764,7 +5764,7 @@ struct ProtobufUnittest_TestVerifyInt32: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -5774,10 +5774,10 @@ struct ProtobufUnittest_TestVerifyInt32: Sendable {
   fileprivate var _optionalInt322: Int32? = nil
   fileprivate var _optionalInt3263: Int32? = nil
   fileprivate var _optionalInt3264: Int32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyMostlyInt32: Sendable {
+struct Proto2Unittest_TestVerifyMostlyInt32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5845,8 +5845,8 @@ struct ProtobufUnittest_TestVerifyMostlyInt32: Sendable {
   /// Clears the value of `optionalInt3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt3264() {self._optionalInt3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -5854,7 +5854,7 @@ struct ProtobufUnittest_TestVerifyMostlyInt32: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -5867,10 +5867,10 @@ struct ProtobufUnittest_TestVerifyMostlyInt32: Sendable {
   fileprivate var _optionalInt324: Int32? = nil
   fileprivate var _optionalInt3263: Int32? = nil
   fileprivate var _optionalInt3264: Int32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: Sendable {
+struct Proto2Unittest_TestVerifyMostlyInt32BigFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -5947,8 +5947,8 @@ struct ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalInt3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt3264() {self._optionalInt3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -5956,7 +5956,7 @@ struct ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -5970,10 +5970,10 @@ struct ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: Sendable {
   fileprivate var _optionalInt324: Int32? = nil
   fileprivate var _optionalInt3263: Int32? = nil
   fileprivate var _optionalInt3264: Int32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyUint32Simple: Sendable {
+struct Proto2Unittest_TestVerifyUint32Simple: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6024,7 +6024,7 @@ struct ProtobufUnittest_TestVerifyUint32Simple: Sendable {
   fileprivate var _optionalUint3264: UInt32? = nil
 }
 
-struct ProtobufUnittest_TestVerifyUint32: Sendable {
+struct Proto2Unittest_TestVerifyUint32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6065,8 +6065,8 @@ struct ProtobufUnittest_TestVerifyUint32: Sendable {
   /// Clears the value of `optionalUint3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUint3264() {self._optionalUint3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -6074,7 +6074,7 @@ struct ProtobufUnittest_TestVerifyUint32: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -6084,10 +6084,10 @@ struct ProtobufUnittest_TestVerifyUint32: Sendable {
   fileprivate var _optionalUint322: UInt32? = nil
   fileprivate var _optionalUint3263: UInt32? = nil
   fileprivate var _optionalUint3264: UInt32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyOneUint32: Sendable {
+struct Proto2Unittest_TestVerifyOneUint32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6128,8 +6128,8 @@ struct ProtobufUnittest_TestVerifyOneUint32: Sendable {
   /// Clears the value of `optionalInt3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt3264() {self._optionalInt3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -6137,7 +6137,7 @@ struct ProtobufUnittest_TestVerifyOneUint32: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -6147,10 +6147,10 @@ struct ProtobufUnittest_TestVerifyOneUint32: Sendable {
   fileprivate var _optionalInt322: Int32? = nil
   fileprivate var _optionalInt3263: Int32? = nil
   fileprivate var _optionalInt3264: Int32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: Sendable {
+struct Proto2Unittest_TestVerifyOneInt32BigFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6200,8 +6200,8 @@ struct ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalInt6464`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt6464() {self._optionalInt6464 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -6209,7 +6209,7 @@ struct ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -6220,10 +6220,10 @@ struct ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: Sendable {
   fileprivate var _optionalInt642: Int64? = nil
   fileprivate var _optionalInt6463: Int64? = nil
   fileprivate var _optionalInt6464: Int64? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyInt32BigFieldNumber: Sendable {
+struct Proto2Unittest_TestVerifyInt32BigFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6282,8 +6282,8 @@ struct ProtobufUnittest_TestVerifyInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalInt3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt3264() {self._optionalInt3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -6291,7 +6291,7 @@ struct ProtobufUnittest_TestVerifyInt32BigFieldNumber: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -6303,10 +6303,10 @@ struct ProtobufUnittest_TestVerifyInt32BigFieldNumber: Sendable {
   fileprivate var _optionalInt322: Int32? = nil
   fileprivate var _optionalInt3263: Int32? = nil
   fileprivate var _optionalInt3264: Int32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyUint32BigFieldNumber: Sendable {
+struct Proto2Unittest_TestVerifyUint32BigFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6365,8 +6365,8 @@ struct ProtobufUnittest_TestVerifyUint32BigFieldNumber: Sendable {
   /// Clears the value of `optionalUint3264`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUint3264() {self._optionalUint3264 = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypes()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypes {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypes()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -6374,7 +6374,7 @@ struct ProtobufUnittest_TestVerifyUint32BigFieldNumber: Sendable {
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypes] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypes] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -6386,16 +6386,16 @@ struct ProtobufUnittest_TestVerifyUint32BigFieldNumber: Sendable {
   fileprivate var _optionalUint322: UInt32? = nil
   fileprivate var _optionalUint3263: UInt32? = nil
   fileprivate var _optionalUint3264: UInt32? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypes? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypes? = nil
 }
 
-struct ProtobufUnittest_TestVerifyBigFieldNumberUint32: Sendable {
+struct Proto2Unittest_TestVerifyBigFieldNumberUint32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalNested: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested {
-    get {return _optionalNested ?? ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested()}
+  var optionalNested: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested {
+    get {return _optionalNested ?? Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested()}
     set {_optionalNested = newValue}
   }
   /// Returns true if `optionalNested` has been explicitly set.
@@ -6482,8 +6482,8 @@ struct ProtobufUnittest_TestVerifyBigFieldNumberUint32: Sendable {
     /// Clears the value of `optionalUint3264`. Subsequent reads from it will return its default value.
     mutating func clearOptionalUint3264() {_uniqueStorage()._optionalUint3264 = nil}
 
-    var optionalNested: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested {
-      get {return _storage._optionalNested ?? ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested()}
+    var optionalNested: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested {
+      get {return _storage._optionalNested ?? Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested()}
       set {_uniqueStorage()._optionalNested = newValue}
     }
     /// Returns true if `optionalNested` has been explicitly set.
@@ -6491,7 +6491,7 @@ struct ProtobufUnittest_TestVerifyBigFieldNumberUint32: Sendable {
     /// Clears the value of `optionalNested`. Subsequent reads from it will return its default value.
     mutating func clearOptionalNested() {_uniqueStorage()._optionalNested = nil}
 
-    var repeatedNested: [ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested] {
+    var repeatedNested: [Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested] {
       get {return _storage._repeatedNested}
       set {_uniqueStorage()._repeatedNested = newValue}
     }
@@ -6505,17 +6505,17 @@ struct ProtobufUnittest_TestVerifyBigFieldNumberUint32: Sendable {
 
   init() {}
 
-  fileprivate var _optionalNested: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested? = nil
+  fileprivate var _optionalNested: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested? = nil
 }
 
 /// This message contains different kind of enums to exercise the different
 /// parsers in table-driven.
-struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
+struct Proto2Unittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var optionalSeqSmall0Lowfield: ProtobufUnittest_EnumParseTester.SeqSmall0 {
+  var optionalSeqSmall0Lowfield: Proto2Unittest_EnumParseTester.SeqSmall0 {
     get {return _storage._optionalSeqSmall0Lowfield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall0Lowfield = newValue}
   }
@@ -6524,7 +6524,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall0Lowfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall0Lowfield() {_uniqueStorage()._optionalSeqSmall0Lowfield = nil}
 
-  var optionalSeqSmall0Midfield: ProtobufUnittest_EnumParseTester.SeqSmall0 {
+  var optionalSeqSmall0Midfield: Proto2Unittest_EnumParseTester.SeqSmall0 {
     get {return _storage._optionalSeqSmall0Midfield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall0Midfield = newValue}
   }
@@ -6533,7 +6533,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall0Midfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall0Midfield() {_uniqueStorage()._optionalSeqSmall0Midfield = nil}
 
-  var optionalSeqSmall0Hifield: ProtobufUnittest_EnumParseTester.SeqSmall0 {
+  var optionalSeqSmall0Hifield: Proto2Unittest_EnumParseTester.SeqSmall0 {
     get {return _storage._optionalSeqSmall0Hifield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall0Hifield = newValue}
   }
@@ -6542,37 +6542,37 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall0Hifield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall0Hifield() {_uniqueStorage()._optionalSeqSmall0Hifield = nil}
 
-  var repeatedSeqSmall0Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var repeatedSeqSmall0Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._repeatedSeqSmall0Lowfield}
     set {_uniqueStorage()._repeatedSeqSmall0Lowfield = newValue}
   }
 
-  var repeatedSeqSmall0Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var repeatedSeqSmall0Midfield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._repeatedSeqSmall0Midfield}
     set {_uniqueStorage()._repeatedSeqSmall0Midfield = newValue}
   }
 
-  var repeatedSeqSmall0Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var repeatedSeqSmall0Hifield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._repeatedSeqSmall0Hifield}
     set {_uniqueStorage()._repeatedSeqSmall0Hifield = newValue}
   }
 
-  var packedSeqSmall0Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var packedSeqSmall0Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._packedSeqSmall0Lowfield}
     set {_uniqueStorage()._packedSeqSmall0Lowfield = newValue}
   }
 
-  var packedSeqSmall0Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var packedSeqSmall0Midfield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._packedSeqSmall0Midfield}
     set {_uniqueStorage()._packedSeqSmall0Midfield = newValue}
   }
 
-  var packedSeqSmall0Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall0] {
+  var packedSeqSmall0Hifield: [Proto2Unittest_EnumParseTester.SeqSmall0] {
     get {return _storage._packedSeqSmall0Hifield}
     set {_uniqueStorage()._packedSeqSmall0Hifield = newValue}
   }
 
-  var optionalSeqSmall1Lowfield: ProtobufUnittest_EnumParseTester.SeqSmall1 {
+  var optionalSeqSmall1Lowfield: Proto2Unittest_EnumParseTester.SeqSmall1 {
     get {return _storage._optionalSeqSmall1Lowfield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall1Lowfield = newValue}
   }
@@ -6581,7 +6581,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall1Lowfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall1Lowfield() {_uniqueStorage()._optionalSeqSmall1Lowfield = nil}
 
-  var optionalSeqSmall1Midfield: ProtobufUnittest_EnumParseTester.SeqSmall1 {
+  var optionalSeqSmall1Midfield: Proto2Unittest_EnumParseTester.SeqSmall1 {
     get {return _storage._optionalSeqSmall1Midfield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall1Midfield = newValue}
   }
@@ -6590,7 +6590,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall1Midfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall1Midfield() {_uniqueStorage()._optionalSeqSmall1Midfield = nil}
 
-  var optionalSeqSmall1Hifield: ProtobufUnittest_EnumParseTester.SeqSmall1 {
+  var optionalSeqSmall1Hifield: Proto2Unittest_EnumParseTester.SeqSmall1 {
     get {return _storage._optionalSeqSmall1Hifield ?? .default}
     set {_uniqueStorage()._optionalSeqSmall1Hifield = newValue}
   }
@@ -6599,37 +6599,37 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqSmall1Hifield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqSmall1Hifield() {_uniqueStorage()._optionalSeqSmall1Hifield = nil}
 
-  var repeatedSeqSmall1Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var repeatedSeqSmall1Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._repeatedSeqSmall1Lowfield}
     set {_uniqueStorage()._repeatedSeqSmall1Lowfield = newValue}
   }
 
-  var repeatedSeqSmall1Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var repeatedSeqSmall1Midfield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._repeatedSeqSmall1Midfield}
     set {_uniqueStorage()._repeatedSeqSmall1Midfield = newValue}
   }
 
-  var repeatedSeqSmall1Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var repeatedSeqSmall1Hifield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._repeatedSeqSmall1Hifield}
     set {_uniqueStorage()._repeatedSeqSmall1Hifield = newValue}
   }
 
-  var packedSeqSmall1Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var packedSeqSmall1Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._packedSeqSmall1Lowfield}
     set {_uniqueStorage()._packedSeqSmall1Lowfield = newValue}
   }
 
-  var packedSeqSmall1Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var packedSeqSmall1Midfield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._packedSeqSmall1Midfield}
     set {_uniqueStorage()._packedSeqSmall1Midfield = newValue}
   }
 
-  var packedSeqSmall1Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall1] {
+  var packedSeqSmall1Hifield: [Proto2Unittest_EnumParseTester.SeqSmall1] {
     get {return _storage._packedSeqSmall1Hifield}
     set {_uniqueStorage()._packedSeqSmall1Hifield = newValue}
   }
 
-  var optionalSeqLargeLowfield: ProtobufUnittest_EnumParseTester.SeqLarge {
+  var optionalSeqLargeLowfield: Proto2Unittest_EnumParseTester.SeqLarge {
     get {return _storage._optionalSeqLargeLowfield ?? .default}
     set {_uniqueStorage()._optionalSeqLargeLowfield = newValue}
   }
@@ -6638,7 +6638,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqLargeLowfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqLargeLowfield() {_uniqueStorage()._optionalSeqLargeLowfield = nil}
 
-  var optionalSeqLargeMidfield: ProtobufUnittest_EnumParseTester.SeqLarge {
+  var optionalSeqLargeMidfield: Proto2Unittest_EnumParseTester.SeqLarge {
     get {return _storage._optionalSeqLargeMidfield ?? .default}
     set {_uniqueStorage()._optionalSeqLargeMidfield = newValue}
   }
@@ -6647,7 +6647,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqLargeMidfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqLargeMidfield() {_uniqueStorage()._optionalSeqLargeMidfield = nil}
 
-  var optionalSeqLargeHifield: ProtobufUnittest_EnumParseTester.SeqLarge {
+  var optionalSeqLargeHifield: Proto2Unittest_EnumParseTester.SeqLarge {
     get {return _storage._optionalSeqLargeHifield ?? .default}
     set {_uniqueStorage()._optionalSeqLargeHifield = newValue}
   }
@@ -6656,37 +6656,37 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalSeqLargeHifield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalSeqLargeHifield() {_uniqueStorage()._optionalSeqLargeHifield = nil}
 
-  var repeatedSeqLargeLowfield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var repeatedSeqLargeLowfield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._repeatedSeqLargeLowfield}
     set {_uniqueStorage()._repeatedSeqLargeLowfield = newValue}
   }
 
-  var repeatedSeqLargeMidfield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var repeatedSeqLargeMidfield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._repeatedSeqLargeMidfield}
     set {_uniqueStorage()._repeatedSeqLargeMidfield = newValue}
   }
 
-  var repeatedSeqLargeHifield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var repeatedSeqLargeHifield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._repeatedSeqLargeHifield}
     set {_uniqueStorage()._repeatedSeqLargeHifield = newValue}
   }
 
-  var packedSeqLargeLowfield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var packedSeqLargeLowfield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._packedSeqLargeLowfield}
     set {_uniqueStorage()._packedSeqLargeLowfield = newValue}
   }
 
-  var packedSeqLargeMidfield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var packedSeqLargeMidfield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._packedSeqLargeMidfield}
     set {_uniqueStorage()._packedSeqLargeMidfield = newValue}
   }
 
-  var packedSeqLargeHifield: [ProtobufUnittest_EnumParseTester.SeqLarge] {
+  var packedSeqLargeHifield: [Proto2Unittest_EnumParseTester.SeqLarge] {
     get {return _storage._packedSeqLargeHifield}
     set {_uniqueStorage()._packedSeqLargeHifield = newValue}
   }
 
-  var optionalArbitraryLowfield: ProtobufUnittest_EnumParseTester.Arbitrary {
+  var optionalArbitraryLowfield: Proto2Unittest_EnumParseTester.Arbitrary {
     get {return _storage._optionalArbitraryLowfield ?? .default}
     set {_uniqueStorage()._optionalArbitraryLowfield = newValue}
   }
@@ -6695,7 +6695,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalArbitraryLowfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalArbitraryLowfield() {_uniqueStorage()._optionalArbitraryLowfield = nil}
 
-  var optionalArbitraryMidfield: ProtobufUnittest_EnumParseTester.Arbitrary {
+  var optionalArbitraryMidfield: Proto2Unittest_EnumParseTester.Arbitrary {
     get {return _storage._optionalArbitraryMidfield ?? .default}
     set {_uniqueStorage()._optionalArbitraryMidfield = newValue}
   }
@@ -6704,7 +6704,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalArbitraryMidfield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalArbitraryMidfield() {_uniqueStorage()._optionalArbitraryMidfield = nil}
 
-  var optionalArbitraryHifield: ProtobufUnittest_EnumParseTester.Arbitrary {
+  var optionalArbitraryHifield: Proto2Unittest_EnumParseTester.Arbitrary {
     get {return _storage._optionalArbitraryHifield ?? .default}
     set {_uniqueStorage()._optionalArbitraryHifield = newValue}
   }
@@ -6713,32 +6713,32 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
   /// Clears the value of `optionalArbitraryHifield`. Subsequent reads from it will return its default value.
   mutating func clearOptionalArbitraryHifield() {_uniqueStorage()._optionalArbitraryHifield = nil}
 
-  var repeatedArbitraryLowfield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var repeatedArbitraryLowfield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._repeatedArbitraryLowfield}
     set {_uniqueStorage()._repeatedArbitraryLowfield = newValue}
   }
 
-  var repeatedArbitraryMidfield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var repeatedArbitraryMidfield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._repeatedArbitraryMidfield}
     set {_uniqueStorage()._repeatedArbitraryMidfield = newValue}
   }
 
-  var repeatedArbitraryHifield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var repeatedArbitraryHifield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._repeatedArbitraryHifield}
     set {_uniqueStorage()._repeatedArbitraryHifield = newValue}
   }
 
-  var packedArbitraryLowfield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var packedArbitraryLowfield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._packedArbitraryLowfield}
     set {_uniqueStorage()._packedArbitraryLowfield = newValue}
   }
 
-  var packedArbitraryMidfield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var packedArbitraryMidfield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._packedArbitraryMidfield}
     set {_uniqueStorage()._packedArbitraryMidfield = newValue}
   }
 
-  var packedArbitraryHifield: [ProtobufUnittest_EnumParseTester.Arbitrary] {
+  var packedArbitraryHifield: [Proto2Unittest_EnumParseTester.Arbitrary] {
     get {return _storage._packedArbitraryHifield}
     set {_uniqueStorage()._packedArbitraryHifield = newValue}
   }
@@ -6842,7 +6842,7 @@ struct ProtobufUnittest_EnumParseTester: SwiftProtobuf.ExtensibleMessage, @unche
 
 /// This message contains different kind of bool fields to exercise the different
 /// parsers in table-drived.
-struct ProtobufUnittest_BoolParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_BoolParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6907,7 +6907,7 @@ struct ProtobufUnittest_BoolParseTester: SwiftProtobuf.ExtensibleMessage, Sendab
   fileprivate var _otherField: Int32? = nil
 }
 
-struct ProtobufUnittest_Int32ParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_Int32ParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -6972,7 +6972,7 @@ struct ProtobufUnittest_Int32ParseTester: SwiftProtobuf.ExtensibleMessage, Senda
   fileprivate var _otherField: Int32? = nil
 }
 
-struct ProtobufUnittest_Int64ParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_Int64ParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7037,7 +7037,7 @@ struct ProtobufUnittest_Int64ParseTester: SwiftProtobuf.ExtensibleMessage, Senda
   fileprivate var _otherField: Int32? = nil
 }
 
-struct ProtobufUnittest_InlinedStringIdxRegressionProto: @unchecked Sendable {
+struct Proto2Unittest_InlinedStringIdxRegressionProto: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7054,8 +7054,8 @@ struct ProtobufUnittest_InlinedStringIdxRegressionProto: @unchecked Sendable {
   mutating func clearStr1() {_uniqueStorage()._str1 = nil}
 
   /// aux_idx == 2
-  var sub: ProtobufUnittest_InlinedStringIdxRegressionProto {
-    get {return _storage._sub ?? ProtobufUnittest_InlinedStringIdxRegressionProto()}
+  var sub: Proto2Unittest_InlinedStringIdxRegressionProto {
+    get {return _storage._sub ?? Proto2Unittest_InlinedStringIdxRegressionProto()}
     set {_uniqueStorage()._sub = newValue}
   }
   /// Returns true if `sub` has been explicitly set.
@@ -7090,7 +7090,7 @@ struct ProtobufUnittest_InlinedStringIdxRegressionProto: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_StringParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_StringParseTester: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7138,7 +7138,7 @@ struct ProtobufUnittest_StringParseTester: SwiftProtobuf.ExtensibleMessage, Send
   fileprivate var _optionalStringHifield: String? = nil
 }
 
-struct ProtobufUnittest_BadFieldNames: Sendable {
+struct Proto2Unittest_BadFieldNames: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7169,7 +7169,7 @@ struct ProtobufUnittest_BadFieldNames: Sendable {
   fileprivate var _for: Int32? = nil
 }
 
-struct ProtobufUnittest_TestNestedMessageRedaction: Sendable {
+struct Proto2Unittest_TestNestedMessageRedaction: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7200,7 +7200,7 @@ struct ProtobufUnittest_TestNestedMessageRedaction: Sendable {
   fileprivate var _optionalRedactedNestedString: String? = nil
 }
 
-struct ProtobufUnittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7227,8 +7227,8 @@ struct ProtobufUnittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendabl
 
   var repeatedUnredactedString: [String] = []
 
-  var optionalRedactedMessage: ProtobufUnittest_TestNestedMessageRedaction {
-    get {return _optionalRedactedMessage ?? ProtobufUnittest_TestNestedMessageRedaction()}
+  var optionalRedactedMessage: Proto2Unittest_TestNestedMessageRedaction {
+    get {return _optionalRedactedMessage ?? Proto2Unittest_TestNestedMessageRedaction()}
     set {_optionalRedactedMessage = newValue}
   }
   /// Returns true if `optionalRedactedMessage` has been explicitly set.
@@ -7236,8 +7236,8 @@ struct ProtobufUnittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendabl
   /// Clears the value of `optionalRedactedMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalRedactedMessage() {self._optionalRedactedMessage = nil}
 
-  var optionalUnredactedMessage: ProtobufUnittest_TestNestedMessageRedaction {
-    get {return _optionalUnredactedMessage ?? ProtobufUnittest_TestNestedMessageRedaction()}
+  var optionalUnredactedMessage: Proto2Unittest_TestNestedMessageRedaction {
+    get {return _optionalUnredactedMessage ?? Proto2Unittest_TestNestedMessageRedaction()}
     set {_optionalUnredactedMessage = newValue}
   }
   /// Returns true if `optionalUnredactedMessage` has been explicitly set.
@@ -7245,9 +7245,9 @@ struct ProtobufUnittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendabl
   /// Clears the value of `optionalUnredactedMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUnredactedMessage() {self._optionalUnredactedMessage = nil}
 
-  var repeatedRedactedMessage: [ProtobufUnittest_TestNestedMessageRedaction] = []
+  var repeatedRedactedMessage: [Proto2Unittest_TestNestedMessageRedaction] = []
 
-  var repeatedUnredactedMessage: [ProtobufUnittest_TestNestedMessageRedaction] = []
+  var repeatedUnredactedMessage: [Proto2Unittest_TestNestedMessageRedaction] = []
 
   var mapRedactedString: Dictionary<String,String> = [:]
 
@@ -7269,12 +7269,12 @@ struct ProtobufUnittest_RedactedFields: SwiftProtobuf.ExtensibleMessage, Sendabl
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
   fileprivate var _optionalRedactedString: String? = nil
   fileprivate var _optionalUnredactedString: String? = nil
-  fileprivate var _optionalRedactedMessage: ProtobufUnittest_TestNestedMessageRedaction? = nil
-  fileprivate var _optionalUnredactedMessage: ProtobufUnittest_TestNestedMessageRedaction? = nil
+  fileprivate var _optionalRedactedMessage: Proto2Unittest_TestNestedMessageRedaction? = nil
+  fileprivate var _optionalUnredactedMessage: Proto2Unittest_TestNestedMessageRedaction? = nil
   fileprivate var _optionalRedactedFalseString: String? = nil
 }
 
-struct ProtobufUnittest_TestString: Sendable {
+struct Proto2Unittest_TestString: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7295,7 +7295,7 @@ struct ProtobufUnittest_TestString: Sendable {
   fileprivate var _optionalString: String? = nil
 }
 
-struct ProtobufUnittest_TestCord: @unchecked Sendable {
+struct Proto2Unittest_TestCord: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7326,12 +7326,12 @@ struct ProtobufUnittest_TestCord: @unchecked Sendable {
   fileprivate var _optionalBytesCordDefault: Data? = nil
 }
 
-struct ProtobufUnittest_TestPackedEnumSmallRange: Sendable {
+struct Proto2Unittest_TestPackedEnumSmallRange: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var vals: [ProtobufUnittest_TestPackedEnumSmallRange.NestedEnum] = []
+  var vals: [Proto2Unittest_TestPackedEnumSmallRange.NestedEnum] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -7350,7 +7350,7 @@ struct ProtobufUnittest_TestPackedEnumSmallRange: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_EnumsForBenchmark: Sendable {
+struct Proto2Unittest_EnumsForBenchmark: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7433,7 +7433,7 @@ struct ProtobufUnittest_EnumsForBenchmark: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_TestMessageWithManyRepeatedPtrFields: @unchecked Sendable {
+struct Proto2Unittest_TestMessageWithManyRepeatedPtrFields: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7605,7 +7605,7 @@ struct ProtobufUnittest_TestMessageWithManyRepeatedPtrFields: @unchecked Sendabl
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_MessageCreatorZeroInit: @unchecked Sendable {
+struct Proto2Unittest_MessageCreatorZeroInit: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7628,8 +7628,8 @@ struct ProtobufUnittest_MessageCreatorZeroInit: @unchecked Sendable {
   /// Clears the value of `d`. Subsequent reads from it will return its default value.
   mutating func clearD() {_uniqueStorage()._d = nil}
 
-  var m: ProtobufUnittest_MessageCreatorZeroInit {
-    get {return _storage._m ?? ProtobufUnittest_MessageCreatorZeroInit()}
+  var m: Proto2Unittest_MessageCreatorZeroInit {
+    get {return _storage._m ?? Proto2Unittest_MessageCreatorZeroInit()}
     set {_uniqueStorage()._m = newValue}
   }
   /// Returns true if `m` has been explicitly set.
@@ -7666,10 +7666,10 @@ struct ProtobufUnittest_MessageCreatorZeroInit: @unchecked Sendable {
     set {_uniqueStorage()._one = .of(newValue)}
   }
 
-  var ol: ProtobufUnittest_MessageCreatorZeroInit {
+  var ol: Proto2Unittest_MessageCreatorZeroInit {
     get {
       if case .ol(let v)? = _storage._one {return v}
-      return ProtobufUnittest_MessageCreatorZeroInit()
+      return Proto2Unittest_MessageCreatorZeroInit()
     }
     set {_uniqueStorage()._one = .ol(newValue)}
   }
@@ -7680,7 +7680,7 @@ struct ProtobufUnittest_MessageCreatorZeroInit: @unchecked Sendable {
     case os(String)
     case oc(String)
     case of(UInt64)
-    case ol(ProtobufUnittest_MessageCreatorZeroInit)
+    case ol(Proto2Unittest_MessageCreatorZeroInit)
 
   }
 
@@ -7689,7 +7689,7 @@ struct ProtobufUnittest_MessageCreatorZeroInit: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_MessageCreatorMemcpy: @unchecked Sendable {
+struct Proto2Unittest_MessageCreatorMemcpy: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7708,8 +7708,8 @@ struct ProtobufUnittest_MessageCreatorMemcpy: @unchecked Sendable {
     set {_uniqueStorage()._i = newValue}
   }
 
-  var m: ProtobufUnittest_MessageCreatorMemcpy {
-    get {return _storage._m ?? ProtobufUnittest_MessageCreatorMemcpy()}
+  var m: Proto2Unittest_MessageCreatorMemcpy {
+    get {return _storage._m ?? Proto2Unittest_MessageCreatorMemcpy()}
     set {_uniqueStorage()._m = newValue}
   }
   /// Returns true if `m` has been explicitly set.
@@ -7729,7 +7729,7 @@ struct ProtobufUnittest_MessageCreatorMemcpy: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_MessageCreatorFunc: Sendable {
+struct Proto2Unittest_MessageCreatorFunc: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -7760,1717 +7760,1739 @@ struct ProtobufUnittest_MessageCreatorFunc: Sendable {
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_BoolParseTester {
+extension Proto2Unittest_BoolParseTester {
 
-  var ProtobufUnittest_BoolParseTester_optionalBoolExt: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext) ?? false}
-    set {setExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext, value: newValue)}
+  var Proto2Unittest_BoolParseTester_optionalBoolExt: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext) ?? false}
+    set {setExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext`
+  /// Returns true if extension `Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_BoolParseTester_optionalBoolExt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext)
+  var hasProto2Unittest_BoolParseTester_optionalBoolExt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext`.
+  /// Clears the value of extension `Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_BoolParseTester_optionalBoolExt() {
-    clearExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext)
+  mutating func clearProto2Unittest_BoolParseTester_optionalBoolExt() {
+    clearExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext)
   }
 
-  var ProtobufUnittest_BoolParseTester_repeatedBoolExt: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.repeated_bool_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.repeated_bool_ext, value: newValue)}
+  var Proto2Unittest_BoolParseTester_repeatedBoolExt: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.repeated_bool_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.repeated_bool_ext, value: newValue)}
   }
 
-  var ProtobufUnittest_BoolParseTester_packedBoolExt: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.packed_bool_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_BoolParseTester.Extensions.packed_bool_ext, value: newValue)}
+  var Proto2Unittest_BoolParseTester_packedBoolExt: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.packed_bool_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_BoolParseTester.Extensions.packed_bool_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_EnumParseTester {
+extension Proto2Unittest_EnumParseTester {
 
-  var ProtobufUnittest_EnumParseTester_optionalArbitraryExt: ProtobufUnittest_EnumParseTester.Arbitrary {
-    get {return getExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext) ?? .default}
-    set {setExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext, value: newValue)}
+  var Proto2Unittest_EnumParseTester_optionalArbitraryExt: Proto2Unittest_EnumParseTester.Arbitrary {
+    get {return getExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext) ?? .default}
+    set {setExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext`
+  /// Returns true if extension `Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_EnumParseTester_optionalArbitraryExt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext)
+  var hasProto2Unittest_EnumParseTester_optionalArbitraryExt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext`.
+  /// Clears the value of extension `Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_EnumParseTester_optionalArbitraryExt() {
-    clearExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext)
+  mutating func clearProto2Unittest_EnumParseTester_optionalArbitraryExt() {
+    clearExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext)
   }
 
-  var ProtobufUnittest_EnumParseTester_repeatedArbitraryExt: [ProtobufUnittest_EnumParseTester.Arbitrary] {
-    get {return getExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.repeated_arbitrary_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.repeated_arbitrary_ext, value: newValue)}
+  var Proto2Unittest_EnumParseTester_repeatedArbitraryExt: [Proto2Unittest_EnumParseTester.Arbitrary] {
+    get {return getExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.repeated_arbitrary_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.repeated_arbitrary_ext, value: newValue)}
   }
 
-  var ProtobufUnittest_EnumParseTester_packedArbitraryExt: [ProtobufUnittest_EnumParseTester.Arbitrary] {
-    get {return getExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.packed_arbitrary_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_EnumParseTester.Extensions.packed_arbitrary_ext, value: newValue)}
+  var Proto2Unittest_EnumParseTester_packedArbitraryExt: [Proto2Unittest_EnumParseTester.Arbitrary] {
+    get {return getExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.packed_arbitrary_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_EnumParseTester.Extensions.packed_arbitrary_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_Int32ParseTester {
+extension Proto2Unittest_Int32ParseTester {
 
-  var ProtobufUnittest_Int32ParseTester_optionalInt32Ext: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext, value: newValue)}
+  var Proto2Unittest_Int32ParseTester_optionalInt32Ext: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext`
+  /// Returns true if extension `Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_Int32ParseTester_optionalInt32Ext: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext)
+  var hasProto2Unittest_Int32ParseTester_optionalInt32Ext: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext`.
+  /// Clears the value of extension `Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_Int32ParseTester_optionalInt32Ext() {
-    clearExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext)
+  mutating func clearProto2Unittest_Int32ParseTester_optionalInt32Ext() {
+    clearExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext)
   }
 
-  var ProtobufUnittest_Int32ParseTester_repeatedInt32Ext: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.repeated_int32_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.repeated_int32_ext, value: newValue)}
+  var Proto2Unittest_Int32ParseTester_repeatedInt32Ext: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.repeated_int32_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.repeated_int32_ext, value: newValue)}
   }
 
-  var ProtobufUnittest_Int32ParseTester_packedInt32Ext: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.packed_int32_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Int32ParseTester.Extensions.packed_int32_ext, value: newValue)}
+  var Proto2Unittest_Int32ParseTester_packedInt32Ext: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.packed_int32_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Int32ParseTester.Extensions.packed_int32_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_Int64ParseTester {
+extension Proto2Unittest_Int64ParseTester {
 
-  var ProtobufUnittest_Int64ParseTester_optionalInt64Ext: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext, value: newValue)}
+  var Proto2Unittest_Int64ParseTester_optionalInt64Ext: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext`
+  /// Returns true if extension `Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_Int64ParseTester_optionalInt64Ext: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext)
+  var hasProto2Unittest_Int64ParseTester_optionalInt64Ext: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext`.
+  /// Clears the value of extension `Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_Int64ParseTester_optionalInt64Ext() {
-    clearExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext)
+  mutating func clearProto2Unittest_Int64ParseTester_optionalInt64Ext() {
+    clearExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext)
   }
 
-  var ProtobufUnittest_Int64ParseTester_repeatedInt64Ext: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.repeated_int64_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.repeated_int64_ext, value: newValue)}
+  var Proto2Unittest_Int64ParseTester_repeatedInt64Ext: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.repeated_int64_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.repeated_int64_ext, value: newValue)}
   }
 
-  var ProtobufUnittest_Int64ParseTester_packedInt64Ext: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.packed_int64_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Int64ParseTester.Extensions.packed_int64_ext, value: newValue)}
+  var Proto2Unittest_Int64ParseTester_packedInt64Ext: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.packed_int64_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Int64ParseTester.Extensions.packed_int64_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_RedactedFields {
+extension Proto2Unittest_RedactedFields {
 
-  var ProtobufUnittest_redactedExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_redacted_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_redacted_extension, value: newValue)}
+  var Proto2Unittest_redactedExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_redacted_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_redacted_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_redacted_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_redacted_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_redactedExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_redacted_extension)
+  var hasProto2Unittest_redactedExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_redacted_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_redacted_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_redacted_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_redactedExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_redacted_extension)
+  mutating func clearProto2Unittest_redactedExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_redacted_extension)
   }
 }
 
-extension ProtobufUnittest_StringParseTester {
+extension Proto2Unittest_StringParseTester {
 
-  var ProtobufUnittest_StringParseTester_optionalStringExt: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.optional_string_ext) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.optional_string_ext, value: newValue)}
+  var Proto2Unittest_StringParseTester_optionalStringExt: String {
+    get {return getExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.optional_string_ext) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.optional_string_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_StringParseTester.Extensions.optional_string_ext`
+  /// Returns true if extension `Proto2Unittest_StringParseTester.Extensions.optional_string_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_StringParseTester_optionalStringExt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.optional_string_ext)
+  var hasProto2Unittest_StringParseTester_optionalStringExt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.optional_string_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_StringParseTester.Extensions.optional_string_ext`.
+  /// Clears the value of extension `Proto2Unittest_StringParseTester.Extensions.optional_string_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_StringParseTester_optionalStringExt() {
-    clearExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.optional_string_ext)
+  mutating func clearProto2Unittest_StringParseTester_optionalStringExt() {
+    clearExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.optional_string_ext)
   }
 
-  var ProtobufUnittest_StringParseTester_repeatedStringExt: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.repeated_string_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_StringParseTester.Extensions.repeated_string_ext, value: newValue)}
+  var Proto2Unittest_StringParseTester_repeatedStringExt: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.repeated_string_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_StringParseTester.Extensions.repeated_string_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestAllExtensions {
+extension Proto2Unittest_TestAllExtensions {
 
   /// Singular
-  var ProtobufUnittest_optionalInt32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension, value: newValue)}
+  var Proto2Unittest_optionalInt32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_int32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_int32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalInt32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension)
+  var hasProto2Unittest_optionalInt32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_int32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_int32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalInt32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension)
+  mutating func clearProto2Unittest_optionalInt32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension)
   }
 
-  var ProtobufUnittest_optionalInt64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension, value: newValue)}
+  var Proto2Unittest_optionalInt64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_int64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_int64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalInt64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension)
+  var hasProto2Unittest_optionalInt64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_int64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_int64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalInt64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension)
+  mutating func clearProto2Unittest_optionalInt64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension)
   }
 
-  var ProtobufUnittest_optionalUint32Extension: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension, value: newValue)}
+  var Proto2Unittest_optionalUint32Extension: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_uint32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_uint32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUint32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension)
+  var hasProto2Unittest_optionalUint32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_uint32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_uint32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUint32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension)
+  mutating func clearProto2Unittest_optionalUint32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension)
   }
 
-  var ProtobufUnittest_optionalUint64Extension: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension, value: newValue)}
+  var Proto2Unittest_optionalUint64Extension: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_uint64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_uint64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUint64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension)
+  var hasProto2Unittest_optionalUint64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_uint64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_uint64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUint64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension)
+  mutating func clearProto2Unittest_optionalUint64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension)
   }
 
-  var ProtobufUnittest_optionalSint32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension, value: newValue)}
+  var Proto2Unittest_optionalSint32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sint32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sint32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSint32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension)
+  var hasProto2Unittest_optionalSint32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sint32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sint32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSint32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension)
+  mutating func clearProto2Unittest_optionalSint32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension)
   }
 
-  var ProtobufUnittest_optionalSint64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension, value: newValue)}
+  var Proto2Unittest_optionalSint64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sint64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sint64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSint64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension)
+  var hasProto2Unittest_optionalSint64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sint64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sint64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSint64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension)
+  mutating func clearProto2Unittest_optionalSint64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension)
   }
 
-  var ProtobufUnittest_optionalFixed32Extension: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension, value: newValue)}
+  var Proto2Unittest_optionalFixed32Extension: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_fixed32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_fixed32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFixed32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension)
+  var hasProto2Unittest_optionalFixed32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_fixed32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_fixed32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFixed32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension)
+  mutating func clearProto2Unittest_optionalFixed32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension)
   }
 
-  var ProtobufUnittest_optionalFixed64Extension: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension, value: newValue)}
+  var Proto2Unittest_optionalFixed64Extension: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_fixed64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_fixed64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFixed64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension)
+  var hasProto2Unittest_optionalFixed64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_fixed64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_fixed64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFixed64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension)
+  mutating func clearProto2Unittest_optionalFixed64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension)
   }
 
-  var ProtobufUnittest_optionalSfixed32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension, value: newValue)}
+  var Proto2Unittest_optionalSfixed32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sfixed32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sfixed32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSfixed32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension)
+  var hasProto2Unittest_optionalSfixed32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sfixed32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sfixed32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSfixed32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension)
+  mutating func clearProto2Unittest_optionalSfixed32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension)
   }
 
-  var ProtobufUnittest_optionalSfixed64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension, value: newValue)}
+  var Proto2Unittest_optionalSfixed64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sfixed64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sfixed64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSfixed64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension)
+  var hasProto2Unittest_optionalSfixed64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sfixed64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sfixed64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSfixed64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension)
+  mutating func clearProto2Unittest_optionalSfixed64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension)
   }
 
-  var ProtobufUnittest_optionalFloatExtension: Float {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension, value: newValue)}
+  var Proto2Unittest_optionalFloatExtension: Float {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_float_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_float_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFloatExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension)
+  var hasProto2Unittest_optionalFloatExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_float_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_float_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFloatExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension)
+  mutating func clearProto2Unittest_optionalFloatExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension)
   }
 
-  var ProtobufUnittest_optionalDoubleExtension: Double {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension, value: newValue)}
+  var Proto2Unittest_optionalDoubleExtension: Double {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_double_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_double_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalDoubleExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension)
+  var hasProto2Unittest_optionalDoubleExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_double_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_double_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalDoubleExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension)
+  mutating func clearProto2Unittest_optionalDoubleExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension)
   }
 
-  var ProtobufUnittest_optionalBoolExtension: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension) ?? false}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension, value: newValue)}
+  var Proto2Unittest_optionalBoolExtension: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension) ?? false}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bool_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bool_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBoolExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension)
+  var hasProto2Unittest_optionalBoolExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bool_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bool_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBoolExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension)
+  mutating func clearProto2Unittest_optionalBoolExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension)
   }
 
-  var ProtobufUnittest_optionalStringExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension, value: newValue)}
+  var Proto2Unittest_optionalStringExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_string_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_string_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalStringExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension)
+  var hasProto2Unittest_optionalStringExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_string_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_string_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalStringExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension)
+  mutating func clearProto2Unittest_optionalStringExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension)
   }
 
-  var ProtobufUnittest_optionalBytesExtension: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension, value: newValue)}
+  var Proto2Unittest_optionalBytesExtension: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bytes_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bytes_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBytesExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension)
+  var hasProto2Unittest_optionalBytesExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bytes_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bytes_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBytesExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension)
+  mutating func clearProto2Unittest_optionalBytesExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension)
   }
 
-  var ProtobufUnittest_optionalGroupExtension: ProtobufUnittest_OptionalGroup_extension {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension) ?? ProtobufUnittest_OptionalGroup_extension()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension, value: newValue)}
+  var Proto2Unittest_optionalGroupExtension: Proto2Unittest_OptionalGroup_extension {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension) ?? Proto2Unittest_OptionalGroup_extension()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_OptionalGroup_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_OptionalGroup_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalGroupExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension)
+  var hasProto2Unittest_optionalGroupExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_OptionalGroup_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_OptionalGroup_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalGroupExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension)
+  mutating func clearProto2Unittest_optionalGroupExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension)
   }
 
-  var ProtobufUnittest_optionalNestedMessageExtension: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension) ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension, value: newValue)}
+  var Proto2Unittest_optionalNestedMessageExtension: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension) ?? Proto2Unittest_TestAllTypes.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_nested_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_nested_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalNestedMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension)
+  var hasProto2Unittest_optionalNestedMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_nested_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_nested_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalNestedMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension)
+  mutating func clearProto2Unittest_optionalNestedMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension)
   }
 
-  var ProtobufUnittest_optionalForeignMessageExtension: ProtobufUnittest_ForeignMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension) ?? ProtobufUnittest_ForeignMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension, value: newValue)}
+  var Proto2Unittest_optionalForeignMessageExtension: Proto2Unittest_ForeignMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension) ?? Proto2Unittest_ForeignMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_foreign_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_foreign_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalForeignMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension)
+  var hasProto2Unittest_optionalForeignMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_foreign_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_foreign_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalForeignMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension)
+  mutating func clearProto2Unittest_optionalForeignMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension)
   }
 
-  var ProtobufUnittest_optionalImportMessageExtension: ProtobufUnittestImport_ImportMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension) ?? ProtobufUnittestImport_ImportMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension, value: newValue)}
+  var Proto2Unittest_optionalImportMessageExtension: Proto2UnittestImport_ImportMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension) ?? Proto2UnittestImport_ImportMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_import_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_import_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalImportMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension)
+  var hasProto2Unittest_optionalImportMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_import_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_import_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalImportMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension)
+  mutating func clearProto2Unittest_optionalImportMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension)
   }
 
-  var ProtobufUnittest_optionalNestedEnumExtension: ProtobufUnittest_TestAllTypes.NestedEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension) ?? .foo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension, value: newValue)}
+  var Proto2Unittest_optionalNestedEnumExtension: Proto2Unittest_TestAllTypes.NestedEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension) ?? .foo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_nested_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_nested_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalNestedEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension)
+  var hasProto2Unittest_optionalNestedEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_nested_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_nested_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalNestedEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension)
+  mutating func clearProto2Unittest_optionalNestedEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension)
   }
 
-  var ProtobufUnittest_optionalForeignEnumExtension: ProtobufUnittest_ForeignEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension) ?? .foreignFoo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension, value: newValue)}
+  var Proto2Unittest_optionalForeignEnumExtension: Proto2Unittest_ForeignEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension) ?? .foreignFoo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_foreign_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_foreign_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalForeignEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension)
+  var hasProto2Unittest_optionalForeignEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_foreign_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_foreign_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalForeignEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension)
+  mutating func clearProto2Unittest_optionalForeignEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension)
   }
 
-  var ProtobufUnittest_optionalImportEnumExtension: ProtobufUnittestImport_ImportEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension) ?? .importFoo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension, value: newValue)}
+  var Proto2Unittest_optionalImportEnumExtension: Proto2UnittestImport_ImportEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension) ?? .importFoo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_import_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_import_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalImportEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension)
+  var hasProto2Unittest_optionalImportEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_import_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_import_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalImportEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension)
+  mutating func clearProto2Unittest_optionalImportEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension)
   }
 
-  var ProtobufUnittest_optionalStringPieceExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension, value: newValue)}
+  var Proto2Unittest_optionalStringPieceExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_string_piece_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_string_piece_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalStringPieceExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension)
+  var hasProto2Unittest_optionalStringPieceExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_string_piece_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_string_piece_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalStringPieceExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension)
+  mutating func clearProto2Unittest_optionalStringPieceExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension)
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_optionalCordExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension, value: newValue)}
+  var Proto2Unittest_optionalCordExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_cord_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_cord_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalCordExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension)
+  var hasProto2Unittest_optionalCordExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_cord_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_cord_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalCordExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension)
+  mutating func clearProto2Unittest_optionalCordExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension)
   }
 
-  var ProtobufUnittest_optionalBytesCordExtension: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension, value: newValue)}
+  var Proto2Unittest_optionalBytesCordExtension: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bytes_cord_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bytes_cord_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBytesCordExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension)
+  var hasProto2Unittest_optionalBytesCordExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bytes_cord_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bytes_cord_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBytesCordExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension)
+  mutating func clearProto2Unittest_optionalBytesCordExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension)
   }
 
-  var ProtobufUnittest_optionalPublicImportMessageExtension: ProtobufUnittestImport_PublicImportMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension) ?? ProtobufUnittestImport_PublicImportMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension, value: newValue)}
+  var Proto2Unittest_optionalPublicImportMessageExtension: Proto2UnittestImport_PublicImportMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension) ?? Proto2UnittestImport_PublicImportMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_public_import_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_public_import_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalPublicImportMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension)
+  var hasProto2Unittest_optionalPublicImportMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_public_import_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_public_import_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalPublicImportMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension)
+  mutating func clearProto2Unittest_optionalPublicImportMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension)
   }
 
-  var ProtobufUnittest_optionalLazyMessageExtension: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension) ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension, value: newValue)}
+  var Proto2Unittest_optionalLazyMessageExtension: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension) ?? Proto2Unittest_TestAllTypes.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_lazy_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_lazy_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalLazyMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension)
+  var hasProto2Unittest_optionalLazyMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_lazy_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_lazy_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalLazyMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension)
+  mutating func clearProto2Unittest_optionalLazyMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension)
   }
 
-  var ProtobufUnittest_optionalUnverifiedLazyMessageExtension: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension) ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension, value: newValue)}
+  var Proto2Unittest_optionalUnverifiedLazyMessageExtension: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension) ?? Proto2Unittest_TestAllTypes.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_unverified_lazy_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUnverifiedLazyMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension)
+  var hasProto2Unittest_optionalUnverifiedLazyMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_unverified_lazy_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUnverifiedLazyMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension)
+  mutating func clearProto2Unittest_optionalUnverifiedLazyMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension)
   }
 
   /// Repeated
-  var ProtobufUnittest_repeatedInt32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int32_extension, value: newValue)}
+  var Proto2Unittest_repeatedInt32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_int32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_int32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedInt64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int64_extension, value: newValue)}
+  var Proto2Unittest_repeatedInt64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_int64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_int64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedUint32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint32_extension, value: newValue)}
+  var Proto2Unittest_repeatedUint32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedUint64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint64_extension, value: newValue)}
+  var Proto2Unittest_repeatedUint64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSint32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint32_extension, value: newValue)}
+  var Proto2Unittest_repeatedSint32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSint64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint64_extension, value: newValue)}
+  var Proto2Unittest_repeatedSint64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFixed32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed32_extension, value: newValue)}
+  var Proto2Unittest_repeatedFixed32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFixed64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed64_extension, value: newValue)}
+  var Proto2Unittest_repeatedFixed64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSfixed32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed32_extension, value: newValue)}
+  var Proto2Unittest_repeatedSfixed32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSfixed64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed64_extension, value: newValue)}
+  var Proto2Unittest_repeatedSfixed64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFloatExtension: [Float] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_float_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_float_extension, value: newValue)}
+  var Proto2Unittest_repeatedFloatExtension: [Float] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_float_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_float_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedDoubleExtension: [Double] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_double_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_double_extension, value: newValue)}
+  var Proto2Unittest_repeatedDoubleExtension: [Double] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_double_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_double_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedBoolExtension: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bool_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bool_extension, value: newValue)}
+  var Proto2Unittest_repeatedBoolExtension: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_bool_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_bool_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedStringExtension: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_extension, value: newValue)}
+  var Proto2Unittest_repeatedStringExtension: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedBytesExtension: [Data] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_extension, value: newValue)}
+  var Proto2Unittest_repeatedBytesExtension: [Data] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedGroupExtension: [ProtobufUnittest_RepeatedGroup_extension] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_RepeatedGroup_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_RepeatedGroup_extension, value: newValue)}
+  var Proto2Unittest_repeatedGroupExtension: [Proto2Unittest_RepeatedGroup_extension] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_RepeatedGroup_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_RepeatedGroup_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedNestedMessageExtension: [ProtobufUnittest_TestAllTypes.NestedMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_message_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_message_extension, value: newValue)}
+  var Proto2Unittest_repeatedNestedMessageExtension: [Proto2Unittest_TestAllTypes.NestedMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_message_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_message_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedForeignMessageExtension: [ProtobufUnittest_ForeignMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_message_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_message_extension, value: newValue)}
+  var Proto2Unittest_repeatedForeignMessageExtension: [Proto2Unittest_ForeignMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_message_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_message_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedImportMessageExtension: [ProtobufUnittestImport_ImportMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_message_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_message_extension, value: newValue)}
+  var Proto2Unittest_repeatedImportMessageExtension: [Proto2UnittestImport_ImportMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_message_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_message_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedNestedEnumExtension: [ProtobufUnittest_TestAllTypes.NestedEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_enum_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_enum_extension, value: newValue)}
+  var Proto2Unittest_repeatedNestedEnumExtension: [Proto2Unittest_TestAllTypes.NestedEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_enum_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_enum_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedForeignEnumExtension: [ProtobufUnittest_ForeignEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_enum_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_enum_extension, value: newValue)}
+  var Proto2Unittest_repeatedForeignEnumExtension: [Proto2Unittest_ForeignEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_enum_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_enum_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedImportEnumExtension: [ProtobufUnittestImport_ImportEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_enum_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_enum_extension, value: newValue)}
+  var Proto2Unittest_repeatedImportEnumExtension: [Proto2UnittestImport_ImportEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_enum_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_enum_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedStringPieceExtension: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_piece_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_piece_extension, value: newValue)}
+  var Proto2Unittest_repeatedStringPieceExtension: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_piece_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_piece_extension, value: newValue)}
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_repeatedCordExtension: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_cord_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_cord_extension, value: newValue)}
+  var Proto2Unittest_repeatedCordExtension: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_cord_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_cord_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedLazyMessageExtension: [ProtobufUnittest_TestAllTypes.NestedMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_lazy_message_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_lazy_message_extension, value: newValue)}
+  var Proto2Unittest_repeatedLazyMessageExtension: [Proto2Unittest_TestAllTypes.NestedMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_lazy_message_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_lazy_message_extension, value: newValue)}
   }
 
   /// Singular with defaults
-  var ProtobufUnittest_defaultInt32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension) ?? 41}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension, value: newValue)}
+  var Proto2Unittest_defaultInt32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension) ?? 41}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_int32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_int32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultInt32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension)
+  var hasProto2Unittest_defaultInt32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_int32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_int32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultInt32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension)
+  mutating func clearProto2Unittest_defaultInt32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension)
   }
 
-  var ProtobufUnittest_defaultInt64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension) ?? 42}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension, value: newValue)}
+  var Proto2Unittest_defaultInt64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension) ?? 42}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_int64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_int64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultInt64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension)
+  var hasProto2Unittest_defaultInt64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_int64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_int64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultInt64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension)
+  mutating func clearProto2Unittest_defaultInt64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension)
   }
 
-  var ProtobufUnittest_defaultUint32Extension: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension) ?? 43}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension, value: newValue)}
+  var Proto2Unittest_defaultUint32Extension: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension) ?? 43}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_uint32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_uint32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultUint32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension)
+  var hasProto2Unittest_defaultUint32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_uint32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_uint32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultUint32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension)
+  mutating func clearProto2Unittest_defaultUint32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension)
   }
 
-  var ProtobufUnittest_defaultUint64Extension: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension) ?? 44}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension, value: newValue)}
+  var Proto2Unittest_defaultUint64Extension: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension) ?? 44}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_uint64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_uint64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultUint64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension)
+  var hasProto2Unittest_defaultUint64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_uint64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_uint64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultUint64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension)
+  mutating func clearProto2Unittest_defaultUint64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension)
   }
 
-  var ProtobufUnittest_defaultSint32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension) ?? -45}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension, value: newValue)}
+  var Proto2Unittest_defaultSint32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension) ?? -45}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sint32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sint32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSint32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension)
+  var hasProto2Unittest_defaultSint32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sint32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sint32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSint32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension)
+  mutating func clearProto2Unittest_defaultSint32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension)
   }
 
-  var ProtobufUnittest_defaultSint64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension) ?? 46}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension, value: newValue)}
+  var Proto2Unittest_defaultSint64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension) ?? 46}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sint64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sint64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSint64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension)
+  var hasProto2Unittest_defaultSint64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sint64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sint64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSint64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension)
+  mutating func clearProto2Unittest_defaultSint64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension)
   }
 
-  var ProtobufUnittest_defaultFixed32Extension: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension) ?? 47}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension, value: newValue)}
+  var Proto2Unittest_defaultFixed32Extension: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension) ?? 47}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_fixed32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_fixed32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFixed32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension)
+  var hasProto2Unittest_defaultFixed32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_fixed32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_fixed32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFixed32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension)
+  mutating func clearProto2Unittest_defaultFixed32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension)
   }
 
-  var ProtobufUnittest_defaultFixed64Extension: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension) ?? 48}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension, value: newValue)}
+  var Proto2Unittest_defaultFixed64Extension: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension) ?? 48}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_fixed64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_fixed64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFixed64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension)
+  var hasProto2Unittest_defaultFixed64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_fixed64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_fixed64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFixed64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension)
+  mutating func clearProto2Unittest_defaultFixed64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension)
   }
 
-  var ProtobufUnittest_defaultSfixed32Extension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension) ?? 49}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension, value: newValue)}
+  var Proto2Unittest_defaultSfixed32Extension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension) ?? 49}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sfixed32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sfixed32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSfixed32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension)
+  var hasProto2Unittest_defaultSfixed32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sfixed32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sfixed32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSfixed32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension)
+  mutating func clearProto2Unittest_defaultSfixed32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension)
   }
 
-  var ProtobufUnittest_defaultSfixed64Extension: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension) ?? -50}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension, value: newValue)}
+  var Proto2Unittest_defaultSfixed64Extension: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension) ?? -50}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sfixed64_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sfixed64_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSfixed64Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension)
+  var hasProto2Unittest_defaultSfixed64Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sfixed64_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sfixed64_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSfixed64Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension)
+  mutating func clearProto2Unittest_defaultSfixed64Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension)
   }
 
-  var ProtobufUnittest_defaultFloatExtension: Float {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension) ?? 51.5}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension, value: newValue)}
+  var Proto2Unittest_defaultFloatExtension: Float {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension) ?? 51.5}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_float_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_float_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFloatExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension)
+  var hasProto2Unittest_defaultFloatExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_float_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_float_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFloatExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension)
+  mutating func clearProto2Unittest_defaultFloatExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension)
   }
 
-  var ProtobufUnittest_defaultDoubleExtension: Double {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension) ?? 52000}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension, value: newValue)}
+  var Proto2Unittest_defaultDoubleExtension: Double {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension) ?? 52000}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_double_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_double_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultDoubleExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension)
+  var hasProto2Unittest_defaultDoubleExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_double_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_double_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultDoubleExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension)
+  mutating func clearProto2Unittest_defaultDoubleExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension)
   }
 
-  var ProtobufUnittest_defaultBoolExtension: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension) ?? true}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension, value: newValue)}
+  var Proto2Unittest_defaultBoolExtension: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension) ?? true}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_bool_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_bool_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultBoolExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension)
+  var hasProto2Unittest_defaultBoolExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_bool_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_bool_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultBoolExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension)
+  mutating func clearProto2Unittest_defaultBoolExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension)
   }
 
-  var ProtobufUnittest_defaultStringExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension) ?? "hello"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension, value: newValue)}
+  var Proto2Unittest_defaultStringExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension) ?? "hello"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_string_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_string_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultStringExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension)
+  var hasProto2Unittest_defaultStringExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_string_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_string_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultStringExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension)
+  mutating func clearProto2Unittest_defaultStringExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension)
   }
 
-  var ProtobufUnittest_defaultBytesExtension: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension) ?? Data([119, 111, 114, 108, 100])}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension, value: newValue)}
+  var Proto2Unittest_defaultBytesExtension: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension) ?? Data([119, 111, 114, 108, 100])}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_bytes_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_bytes_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultBytesExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension)
+  var hasProto2Unittest_defaultBytesExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_bytes_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_bytes_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultBytesExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension)
+  mutating func clearProto2Unittest_defaultBytesExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension)
   }
 
-  var ProtobufUnittest_defaultNestedEnumExtension: ProtobufUnittest_TestAllTypes.NestedEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension) ?? .bar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension, value: newValue)}
+  var Proto2Unittest_defaultNestedEnumExtension: Proto2Unittest_TestAllTypes.NestedEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension) ?? .bar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_nested_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_nested_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultNestedEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension)
+  var hasProto2Unittest_defaultNestedEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_nested_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_nested_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultNestedEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension)
+  mutating func clearProto2Unittest_defaultNestedEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension)
   }
 
-  var ProtobufUnittest_defaultForeignEnumExtension: ProtobufUnittest_ForeignEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension) ?? .foreignBar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension, value: newValue)}
+  var Proto2Unittest_defaultForeignEnumExtension: Proto2Unittest_ForeignEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension) ?? .foreignBar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_foreign_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_foreign_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultForeignEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension)
+  var hasProto2Unittest_defaultForeignEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_foreign_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_foreign_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultForeignEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension)
+  mutating func clearProto2Unittest_defaultForeignEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension)
   }
 
-  var ProtobufUnittest_defaultImportEnumExtension: ProtobufUnittestImport_ImportEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension) ?? .importBar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension, value: newValue)}
+  var Proto2Unittest_defaultImportEnumExtension: Proto2UnittestImport_ImportEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension) ?? .importBar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_import_enum_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_import_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultImportEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension)
+  var hasProto2Unittest_defaultImportEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_import_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_import_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultImportEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension)
+  mutating func clearProto2Unittest_defaultImportEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension)
   }
 
-  var ProtobufUnittest_defaultStringPieceExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension) ?? "abc"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension, value: newValue)}
+  var Proto2Unittest_defaultStringPieceExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension) ?? "abc"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_string_piece_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_string_piece_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultStringPieceExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension)
+  var hasProto2Unittest_defaultStringPieceExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_string_piece_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_string_piece_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultStringPieceExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension)
+  mutating func clearProto2Unittest_defaultStringPieceExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension)
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_defaultCordExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension) ?? "123"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension, value: newValue)}
+  var Proto2Unittest_defaultCordExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension) ?? "123"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_cord_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_cord_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultCordExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension)
+  var hasProto2Unittest_defaultCordExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_cord_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_cord_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultCordExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension)
+  mutating func clearProto2Unittest_defaultCordExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension)
   }
 
   /// For oneof test
-  var ProtobufUnittest_oneofUint32Extension: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension, value: newValue)}
+  var Proto2Unittest_oneofUint32Extension: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_uint32_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_uint32_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofUint32Extension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension)
+  var hasProto2Unittest_oneofUint32Extension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_uint32_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_uint32_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofUint32Extension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension)
+  mutating func clearProto2Unittest_oneofUint32Extension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension)
   }
 
-  var ProtobufUnittest_oneofNestedMessageExtension: ProtobufUnittest_TestAllTypes.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension) ?? ProtobufUnittest_TestAllTypes.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension, value: newValue)}
+  var Proto2Unittest_oneofNestedMessageExtension: Proto2Unittest_TestAllTypes.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension) ?? Proto2Unittest_TestAllTypes.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_nested_message_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_nested_message_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofNestedMessageExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension)
+  var hasProto2Unittest_oneofNestedMessageExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_nested_message_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_nested_message_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofNestedMessageExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension)
+  mutating func clearProto2Unittest_oneofNestedMessageExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension)
   }
 
-  var ProtobufUnittest_oneofStringExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension, value: newValue)}
+  var Proto2Unittest_oneofStringExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_string_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_string_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofStringExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension)
+  var hasProto2Unittest_oneofStringExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_string_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_string_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofStringExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension)
+  mutating func clearProto2Unittest_oneofStringExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension)
   }
 
-  var ProtobufUnittest_oneofBytesExtension: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension, value: newValue)}
+  var Proto2Unittest_oneofBytesExtension: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_bytes_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_bytes_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofBytesExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension)
+  var hasProto2Unittest_oneofBytesExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_bytes_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_bytes_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofBytesExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension)
+  mutating func clearProto2Unittest_oneofBytesExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension)
+  }
+
+  var Proto2Unittest_optionalUtf8StringExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_utf8_string_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_utf8_string_extension, value: newValue)}
+  }
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_utf8_string_extension`
+  /// has been explicitly set.
+  var hasProto2Unittest_optionalUtf8StringExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_utf8_string_extension)
+  }
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_utf8_string_extension`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProto2Unittest_optionalUtf8StringExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_utf8_string_extension)
+  }
+
+  var Proto2Unittest_repeatedUtf8StringExtension: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_utf8_string_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_utf8_string_extension, value: newValue)}
   }
 
   /// Check for bug where string extensions declared in tested scope did not
   /// compile.
-  var ProtobufUnittest_TestNestedExtension_test: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.test) ?? "test"}
-    set {setExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.test, value: newValue)}
+  var Proto2Unittest_TestNestedExtension_test: String {
+    get {return getExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.test) ?? "test"}
+    set {setExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.test, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestNestedExtension.Extensions.test`
+  /// Returns true if extension `Proto2Unittest_TestNestedExtension.Extensions.test`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestNestedExtension_test: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.test)
+  var hasProto2Unittest_TestNestedExtension_test: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.test)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestNestedExtension.Extensions.test`.
+  /// Clears the value of extension `Proto2Unittest_TestNestedExtension.Extensions.test`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestNestedExtension_test() {
-    clearExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.test)
+  mutating func clearProto2Unittest_TestNestedExtension_test() {
+    clearExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.test)
   }
 
   /// Used to test if generated extension name is correct when there are
   /// underscores.
-  var ProtobufUnittest_TestNestedExtension_nestedStringExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension, value: newValue)}
+  var Proto2Unittest_TestNestedExtension_nestedStringExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension`
+  /// Returns true if extension `Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestNestedExtension_nestedStringExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension)
+  var hasProto2Unittest_TestNestedExtension_nestedStringExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestNestedExtension_nestedStringExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension)
+  mutating func clearProto2Unittest_TestNestedExtension_nestedStringExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension)
   }
 
-  var ProtobufUnittest_TestRequired_single: ProtobufUnittest_TestRequired {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.single) ?? ProtobufUnittest_TestRequired()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.single, value: newValue)}
+  var Proto2Unittest_TestRequired_single: Proto2Unittest_TestRequired {
+    get {return getExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.single) ?? Proto2Unittest_TestRequired()}
+    set {setExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.single, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestRequired.Extensions.single`
+  /// Returns true if extension `Proto2Unittest_TestRequired.Extensions.single`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestRequired_single: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.single)
+  var hasProto2Unittest_TestRequired_single: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.single)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestRequired.Extensions.single`.
+  /// Clears the value of extension `Proto2Unittest_TestRequired.Extensions.single`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestRequired_single() {
-    clearExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.single)
+  mutating func clearProto2Unittest_TestRequired_single() {
+    clearExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.single)
   }
 
-  var ProtobufUnittest_TestRequired_multi: [ProtobufUnittest_TestRequired] {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.multi) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_TestRequired.Extensions.multi, value: newValue)}
+  var Proto2Unittest_TestRequired_multi: [Proto2Unittest_TestRequired] {
+    get {return getExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.multi) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_TestRequired.Extensions.multi, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestExtensionInsideTable {
+extension Proto2Unittest_TestExtensionInsideTable {
 
-  var ProtobufUnittest_testExtensionInsideTableExtension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_test_extension_inside_table_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_test_extension_inside_table_extension, value: newValue)}
+  var Proto2Unittest_testExtensionInsideTableExtension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_test_extension_inside_table_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_test_extension_inside_table_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_test_extension_inside_table_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_test_extension_inside_table_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_testExtensionInsideTableExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_test_extension_inside_table_extension)
+  var hasProto2Unittest_testExtensionInsideTableExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_test_extension_inside_table_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_test_extension_inside_table_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_test_extension_inside_table_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_testExtensionInsideTableExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_test_extension_inside_table_extension)
+  mutating func clearProto2Unittest_testExtensionInsideTableExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_test_extension_inside_table_extension)
   }
 }
 
-extension ProtobufUnittest_TestExtensionRangeSerialize {
+extension Proto2Unittest_TestExtensionRangeSerialize {
 
-  var ProtobufUnittest_TestExtensionRangeSerialize_barOne: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one, value: newValue)}
+  var Proto2Unittest_TestExtensionRangeSerialize_barOne: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one`
+  /// Returns true if extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionRangeSerialize_barOne: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one)
+  var hasProto2Unittest_TestExtensionRangeSerialize_barOne: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionRangeSerialize_barOne() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one)
+  mutating func clearProto2Unittest_TestExtensionRangeSerialize_barOne() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one)
   }
 
-  var ProtobufUnittest_TestExtensionRangeSerialize_barTwo: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two, value: newValue)}
+  var Proto2Unittest_TestExtensionRangeSerialize_barTwo: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two`
+  /// Returns true if extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionRangeSerialize_barTwo: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two)
+  var hasProto2Unittest_TestExtensionRangeSerialize_barTwo: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionRangeSerialize_barTwo() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two)
+  mutating func clearProto2Unittest_TestExtensionRangeSerialize_barTwo() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two)
   }
 
-  var ProtobufUnittest_TestExtensionRangeSerialize_barThree: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three, value: newValue)}
+  var Proto2Unittest_TestExtensionRangeSerialize_barThree: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three`
+  /// Returns true if extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionRangeSerialize_barThree: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three)
+  var hasProto2Unittest_TestExtensionRangeSerialize_barThree: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionRangeSerialize_barThree() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three)
+  mutating func clearProto2Unittest_TestExtensionRangeSerialize_barThree() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three)
   }
 
-  var ProtobufUnittest_TestExtensionRangeSerialize_barFour: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four, value: newValue)}
+  var Proto2Unittest_TestExtensionRangeSerialize_barFour: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four`
+  /// Returns true if extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionRangeSerialize_barFour: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four)
+  var hasProto2Unittest_TestExtensionRangeSerialize_barFour: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionRangeSerialize_barFour() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four)
+  mutating func clearProto2Unittest_TestExtensionRangeSerialize_barFour() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four)
   }
 
-  var ProtobufUnittest_TestExtensionRangeSerialize_barFive: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five, value: newValue)}
+  var Proto2Unittest_TestExtensionRangeSerialize_barFive: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five`
+  /// Returns true if extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionRangeSerialize_barFive: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five)
+  var hasProto2Unittest_TestExtensionRangeSerialize_barFive: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionRangeSerialize_barFive() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five)
+  mutating func clearProto2Unittest_TestExtensionRangeSerialize_barFive() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five)
   }
 }
 
-extension ProtobufUnittest_TestFieldOrderings {
+extension Proto2Unittest_TestFieldOrderings {
 
-  var ProtobufUnittest_myExtensionString: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_string) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_string, value: newValue)}
+  var Proto2Unittest_myExtensionString: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_my_extension_string) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_my_extension_string, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_my_extension_string`
+  /// Returns true if extension `Proto2Unittest_Extensions_my_extension_string`
   /// has been explicitly set.
-  var hasProtobufUnittest_myExtensionString: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_string)
+  var hasProto2Unittest_myExtensionString: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_my_extension_string)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_my_extension_string`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_my_extension_string`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_myExtensionString() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_string)
+  mutating func clearProto2Unittest_myExtensionString() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_my_extension_string)
   }
 
-  var ProtobufUnittest_myExtensionInt: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_int) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_int, value: newValue)}
+  var Proto2Unittest_myExtensionInt: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_my_extension_int) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_my_extension_int, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_my_extension_int`
+  /// Returns true if extension `Proto2Unittest_Extensions_my_extension_int`
   /// has been explicitly set.
-  var hasProtobufUnittest_myExtensionInt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_int)
+  var hasProto2Unittest_myExtensionInt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_my_extension_int)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_my_extension_int`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_my_extension_int`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_myExtensionInt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_my_extension_int)
+  mutating func clearProto2Unittest_myExtensionInt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_my_extension_int)
   }
 
-  var ProtobufUnittest_TestExtensionOrderings1_testExtOrderings1: ProtobufUnittest_TestExtensionOrderings1 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1) ?? ProtobufUnittest_TestExtensionOrderings1()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1, value: newValue)}
+  var Proto2Unittest_TestExtensionOrderings1_testExtOrderings1: Proto2Unittest_TestExtensionOrderings1 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1) ?? Proto2Unittest_TestExtensionOrderings1()}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1`
+  /// Returns true if extension `Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionOrderings1_testExtOrderings1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1)
+  var hasProto2Unittest_TestExtensionOrderings1_testExtOrderings1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionOrderings1_testExtOrderings1() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1)
+  mutating func clearProto2Unittest_TestExtensionOrderings1_testExtOrderings1() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1)
   }
 
-  var ProtobufUnittest_TestExtensionOrderings2_testExtOrderings2: ProtobufUnittest_TestExtensionOrderings2 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2) ?? ProtobufUnittest_TestExtensionOrderings2()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2, value: newValue)}
+  var Proto2Unittest_TestExtensionOrderings2_testExtOrderings2: Proto2Unittest_TestExtensionOrderings2 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2) ?? Proto2Unittest_TestExtensionOrderings2()}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2`
+  /// Returns true if extension `Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionOrderings2_testExtOrderings2: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2)
+  var hasProto2Unittest_TestExtensionOrderings2_testExtOrderings2: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionOrderings2_testExtOrderings2() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2)
+  mutating func clearProto2Unittest_TestExtensionOrderings2_testExtOrderings2() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2)
   }
 
-  var ProtobufUnittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3) ?? ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3, value: newValue)}
+  var Proto2Unittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3) ?? Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3()}
+    set {setExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3`
+  /// Returns true if extension `Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3)
+  var hasProto2Unittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3`.
+  /// Clears the value of extension `Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3() {
-    clearExtensionValue(ext: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3)
+  mutating func clearProto2Unittest_TestExtensionOrderings2_TestExtensionOrderings3_testExtOrderings3() {
+    clearExtensionValue(ext: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3)
   }
 }
 
-extension ProtobufUnittest_TestGroupExtension {
+extension Proto2Unittest_TestGroupExtension {
 
-  var ProtobufUnittest_TestNestedExtension_optionalGroupExtension: ProtobufUnittest_TestNestedExtension.OptionalGroup_extension {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension) ?? ProtobufUnittest_TestNestedExtension.OptionalGroup_extension()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension, value: newValue)}
+  var Proto2Unittest_TestNestedExtension_optionalGroupExtension: Proto2Unittest_TestNestedExtension.OptionalGroup_extension {
+    get {return getExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension) ?? Proto2Unittest_TestNestedExtension.OptionalGroup_extension()}
+    set {setExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension`
+  /// Returns true if extension `Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestNestedExtension_optionalGroupExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension)
+  var hasProto2Unittest_TestNestedExtension_optionalGroupExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestNestedExtension_optionalGroupExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension)
+  mutating func clearProto2Unittest_TestNestedExtension_optionalGroupExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension)
   }
 
-  var ProtobufUnittest_TestNestedExtension_optionalForeignEnumExtension: ProtobufUnittest_ForeignEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension) ?? .foreignFoo}
-    set {setExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension, value: newValue)}
+  var Proto2Unittest_TestNestedExtension_optionalForeignEnumExtension: Proto2Unittest_ForeignEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension) ?? .foreignFoo}
+    set {setExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension`
+  /// Returns true if extension `Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestNestedExtension_optionalForeignEnumExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension)
+  var hasProto2Unittest_TestNestedExtension_optionalForeignEnumExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestNestedExtension_optionalForeignEnumExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension)
+  mutating func clearProto2Unittest_TestNestedExtension_optionalForeignEnumExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension)
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbers {
+extension Proto2Unittest_TestHugeFieldNumbers {
 
-  var ProtobufUnittest_testAllTypes: ProtobufUnittest_TestAllTypes {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types) ?? ProtobufUnittest_TestAllTypes()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types, value: newValue)}
+  var Proto2Unittest_testAllTypes: Proto2Unittest_TestAllTypes {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_test_all_types) ?? Proto2Unittest_TestAllTypes()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_test_all_types, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_test_all_types`
+  /// Returns true if extension `Proto2Unittest_Extensions_test_all_types`
   /// has been explicitly set.
-  var hasProtobufUnittest_testAllTypes: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types)
+  var hasProto2Unittest_testAllTypes: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_test_all_types)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_test_all_types`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_test_all_types`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_testAllTypes() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types)
+  mutating func clearProto2Unittest_testAllTypes() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_test_all_types)
   }
 }
 
-extension ProtobufUnittest_TestMixedFieldsAndExtensions {
+extension Proto2Unittest_TestMixedFieldsAndExtensions {
 
-  var ProtobufUnittest_TestMixedFieldsAndExtensions_c: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c, value: newValue)}
+  var Proto2Unittest_TestMixedFieldsAndExtensions_c: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c`
+  /// Returns true if extension `Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestMixedFieldsAndExtensions_c: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c)
+  var hasProto2Unittest_TestMixedFieldsAndExtensions_c: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c`.
+  /// Clears the value of extension `Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestMixedFieldsAndExtensions_c() {
-    clearExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c)
+  mutating func clearProto2Unittest_TestMixedFieldsAndExtensions_c() {
+    clearExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c)
   }
 
-  var ProtobufUnittest_TestMixedFieldsAndExtensions_d: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.d) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.d, value: newValue)}
+  var Proto2Unittest_TestMixedFieldsAndExtensions_d: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.d) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.d, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup {
+extension Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup {
 
-  var ProtobufUnittest_inner: ProtobufUnittest_TestNestedGroupExtensionInnerExtension {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_inner) ?? ProtobufUnittest_TestNestedGroupExtensionInnerExtension()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_inner, value: newValue)}
+  var Proto2Unittest_inner: Proto2Unittest_TestNestedGroupExtensionInnerExtension {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_inner) ?? Proto2Unittest_TestNestedGroupExtensionInnerExtension()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_inner, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_inner`
+  /// Returns true if extension `Proto2Unittest_Extensions_inner`
   /// has been explicitly set.
-  var hasProtobufUnittest_inner: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_inner)
+  var hasProto2Unittest_inner: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_inner)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_inner`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_inner`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_inner() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_inner)
+  mutating func clearProto2Unittest_inner() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_inner)
   }
 }
 
-extension ProtobufUnittest_TestPackedExtensions {
+extension Proto2Unittest_TestPackedExtensions {
 
-  var ProtobufUnittest_packedInt32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_int32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_int32_extension, value: newValue)}
+  var Proto2Unittest_packedInt32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_int32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_int32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedInt64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_int64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_int64_extension, value: newValue)}
+  var Proto2Unittest_packedInt64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_int64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_int64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedUint32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint32_extension, value: newValue)}
+  var Proto2Unittest_packedUint32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_uint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_uint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedUint64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint64_extension, value: newValue)}
+  var Proto2Unittest_packedUint64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_uint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_uint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSint32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint32_extension, value: newValue)}
+  var Proto2Unittest_packedSint32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSint64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint64_extension, value: newValue)}
+  var Proto2Unittest_packedSint64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFixed32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed32_extension, value: newValue)}
+  var Proto2Unittest_packedFixed32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFixed64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed64_extension, value: newValue)}
+  var Proto2Unittest_packedFixed64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSfixed32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed32_extension, value: newValue)}
+  var Proto2Unittest_packedSfixed32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSfixed64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed64_extension, value: newValue)}
+  var Proto2Unittest_packedSfixed64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFloatExtension: [Float] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_float_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_float_extension, value: newValue)}
+  var Proto2Unittest_packedFloatExtension: [Float] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_float_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_float_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedDoubleExtension: [Double] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_double_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_double_extension, value: newValue)}
+  var Proto2Unittest_packedDoubleExtension: [Double] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_double_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_double_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedBoolExtension: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_bool_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_bool_extension, value: newValue)}
+  var Proto2Unittest_packedBoolExtension: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_bool_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_bool_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_packedEnumExtension: [ProtobufUnittest_ForeignEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_enum_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_enum_extension, value: newValue)}
+  var Proto2Unittest_packedEnumExtension: [Proto2Unittest_ForeignEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_enum_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_enum_extension, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge {
+extension Proto2Unittest_TestParsingMerge {
 
-  var ProtobufUnittest_TestParsingMerge_optionalExt: ProtobufUnittest_TestAllTypes {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.optional_ext) ?? ProtobufUnittest_TestAllTypes()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.optional_ext, value: newValue)}
+  var Proto2Unittest_TestParsingMerge_optionalExt: Proto2Unittest_TestAllTypes {
+    get {return getExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.optional_ext) ?? Proto2Unittest_TestAllTypes()}
+    set {setExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.optional_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestParsingMerge.Extensions.optional_ext`
+  /// Returns true if extension `Proto2Unittest_TestParsingMerge.Extensions.optional_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestParsingMerge_optionalExt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.optional_ext)
+  var hasProto2Unittest_TestParsingMerge_optionalExt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.optional_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestParsingMerge.Extensions.optional_ext`.
+  /// Clears the value of extension `Proto2Unittest_TestParsingMerge.Extensions.optional_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestParsingMerge_optionalExt() {
-    clearExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.optional_ext)
+  mutating func clearProto2Unittest_TestParsingMerge_optionalExt() {
+    clearExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.optional_ext)
   }
 
-  var ProtobufUnittest_TestParsingMerge_repeatedExt: [ProtobufUnittest_TestAllTypes] {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.repeated_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_TestParsingMerge.Extensions.repeated_ext, value: newValue)}
+  var Proto2Unittest_TestParsingMerge_repeatedExt: [Proto2Unittest_TestAllTypes] {
+    get {return getExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.repeated_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_TestParsingMerge.Extensions.repeated_ext, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestUnpackedExtensions {
+extension Proto2Unittest_TestUnpackedExtensions {
 
-  var ProtobufUnittest_unpackedInt32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_int32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_int32_extension, value: newValue)}
+  var Proto2Unittest_unpackedInt32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_int32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_int32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedInt64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_int64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_int64_extension, value: newValue)}
+  var Proto2Unittest_unpackedInt64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_int64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_int64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedUint32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_uint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_uint32_extension, value: newValue)}
+  var Proto2Unittest_unpackedUint32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_uint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_uint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedUint64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_uint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_uint64_extension, value: newValue)}
+  var Proto2Unittest_unpackedUint64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_uint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_uint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedSint32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sint32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sint32_extension, value: newValue)}
+  var Proto2Unittest_unpackedSint32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sint32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sint32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedSint64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sint64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sint64_extension, value: newValue)}
+  var Proto2Unittest_unpackedSint64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sint64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sint64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedFixed32Extension: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_fixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_fixed32_extension, value: newValue)}
+  var Proto2Unittest_unpackedFixed32Extension: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_fixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_fixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedFixed64Extension: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_fixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_fixed64_extension, value: newValue)}
+  var Proto2Unittest_unpackedFixed64Extension: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_fixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_fixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedSfixed32Extension: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sfixed32_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sfixed32_extension, value: newValue)}
+  var Proto2Unittest_unpackedSfixed32Extension: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sfixed32_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sfixed32_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedSfixed64Extension: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sfixed64_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_sfixed64_extension, value: newValue)}
+  var Proto2Unittest_unpackedSfixed64Extension: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sfixed64_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_sfixed64_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedFloatExtension: [Float] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_float_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_float_extension, value: newValue)}
+  var Proto2Unittest_unpackedFloatExtension: [Float] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_float_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_float_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedDoubleExtension: [Double] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_double_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_double_extension, value: newValue)}
+  var Proto2Unittest_unpackedDoubleExtension: [Double] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_double_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_double_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedBoolExtension: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_bool_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_bool_extension, value: newValue)}
+  var Proto2Unittest_unpackedBoolExtension: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_bool_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_bool_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_unpackedEnumExtension: [ProtobufUnittest_ForeignEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_enum_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_unpacked_enum_extension, value: newValue)}
+  var Proto2Unittest_unpackedEnumExtension: [Proto2Unittest_ForeignEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_unpacked_enum_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_unpacked_enum_extension, value: newValue)}
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_Unittest_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_Unittest_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_Unittest_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Extensions_optional_int32_extension,
-  ProtobufUnittest_Extensions_optional_int64_extension,
-  ProtobufUnittest_Extensions_optional_uint32_extension,
-  ProtobufUnittest_Extensions_optional_uint64_extension,
-  ProtobufUnittest_Extensions_optional_sint32_extension,
-  ProtobufUnittest_Extensions_optional_sint64_extension,
-  ProtobufUnittest_Extensions_optional_fixed32_extension,
-  ProtobufUnittest_Extensions_optional_fixed64_extension,
-  ProtobufUnittest_Extensions_optional_sfixed32_extension,
-  ProtobufUnittest_Extensions_optional_sfixed64_extension,
-  ProtobufUnittest_Extensions_optional_float_extension,
-  ProtobufUnittest_Extensions_optional_double_extension,
-  ProtobufUnittest_Extensions_optional_bool_extension,
-  ProtobufUnittest_Extensions_optional_string_extension,
-  ProtobufUnittest_Extensions_optional_bytes_extension,
-  ProtobufUnittest_Extensions_OptionalGroup_extension,
-  ProtobufUnittest_Extensions_optional_nested_message_extension,
-  ProtobufUnittest_Extensions_optional_foreign_message_extension,
-  ProtobufUnittest_Extensions_optional_import_message_extension,
-  ProtobufUnittest_Extensions_optional_nested_enum_extension,
-  ProtobufUnittest_Extensions_optional_foreign_enum_extension,
-  ProtobufUnittest_Extensions_optional_import_enum_extension,
-  ProtobufUnittest_Extensions_optional_string_piece_extension,
-  ProtobufUnittest_Extensions_optional_cord_extension,
-  ProtobufUnittest_Extensions_optional_bytes_cord_extension,
-  ProtobufUnittest_Extensions_optional_public_import_message_extension,
-  ProtobufUnittest_Extensions_optional_lazy_message_extension,
-  ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension,
-  ProtobufUnittest_Extensions_repeated_int32_extension,
-  ProtobufUnittest_Extensions_repeated_int64_extension,
-  ProtobufUnittest_Extensions_repeated_uint32_extension,
-  ProtobufUnittest_Extensions_repeated_uint64_extension,
-  ProtobufUnittest_Extensions_repeated_sint32_extension,
-  ProtobufUnittest_Extensions_repeated_sint64_extension,
-  ProtobufUnittest_Extensions_repeated_fixed32_extension,
-  ProtobufUnittest_Extensions_repeated_fixed64_extension,
-  ProtobufUnittest_Extensions_repeated_sfixed32_extension,
-  ProtobufUnittest_Extensions_repeated_sfixed64_extension,
-  ProtobufUnittest_Extensions_repeated_float_extension,
-  ProtobufUnittest_Extensions_repeated_double_extension,
-  ProtobufUnittest_Extensions_repeated_bool_extension,
-  ProtobufUnittest_Extensions_repeated_string_extension,
-  ProtobufUnittest_Extensions_repeated_bytes_extension,
-  ProtobufUnittest_Extensions_RepeatedGroup_extension,
-  ProtobufUnittest_Extensions_repeated_nested_message_extension,
-  ProtobufUnittest_Extensions_repeated_foreign_message_extension,
-  ProtobufUnittest_Extensions_repeated_import_message_extension,
-  ProtobufUnittest_Extensions_repeated_nested_enum_extension,
-  ProtobufUnittest_Extensions_repeated_foreign_enum_extension,
-  ProtobufUnittest_Extensions_repeated_import_enum_extension,
-  ProtobufUnittest_Extensions_repeated_string_piece_extension,
-  ProtobufUnittest_Extensions_repeated_cord_extension,
-  ProtobufUnittest_Extensions_repeated_lazy_message_extension,
-  ProtobufUnittest_Extensions_default_int32_extension,
-  ProtobufUnittest_Extensions_default_int64_extension,
-  ProtobufUnittest_Extensions_default_uint32_extension,
-  ProtobufUnittest_Extensions_default_uint64_extension,
-  ProtobufUnittest_Extensions_default_sint32_extension,
-  ProtobufUnittest_Extensions_default_sint64_extension,
-  ProtobufUnittest_Extensions_default_fixed32_extension,
-  ProtobufUnittest_Extensions_default_fixed64_extension,
-  ProtobufUnittest_Extensions_default_sfixed32_extension,
-  ProtobufUnittest_Extensions_default_sfixed64_extension,
-  ProtobufUnittest_Extensions_default_float_extension,
-  ProtobufUnittest_Extensions_default_double_extension,
-  ProtobufUnittest_Extensions_default_bool_extension,
-  ProtobufUnittest_Extensions_default_string_extension,
-  ProtobufUnittest_Extensions_default_bytes_extension,
-  ProtobufUnittest_Extensions_default_nested_enum_extension,
-  ProtobufUnittest_Extensions_default_foreign_enum_extension,
-  ProtobufUnittest_Extensions_default_import_enum_extension,
-  ProtobufUnittest_Extensions_default_string_piece_extension,
-  ProtobufUnittest_Extensions_default_cord_extension,
-  ProtobufUnittest_Extensions_oneof_uint32_extension,
-  ProtobufUnittest_Extensions_oneof_nested_message_extension,
-  ProtobufUnittest_Extensions_oneof_string_extension,
-  ProtobufUnittest_Extensions_oneof_bytes_extension,
-  ProtobufUnittest_Extensions_my_extension_string,
-  ProtobufUnittest_Extensions_my_extension_int,
-  ProtobufUnittest_Extensions_packed_int32_extension,
-  ProtobufUnittest_Extensions_packed_int64_extension,
-  ProtobufUnittest_Extensions_packed_uint32_extension,
-  ProtobufUnittest_Extensions_packed_uint64_extension,
-  ProtobufUnittest_Extensions_packed_sint32_extension,
-  ProtobufUnittest_Extensions_packed_sint64_extension,
-  ProtobufUnittest_Extensions_packed_fixed32_extension,
-  ProtobufUnittest_Extensions_packed_fixed64_extension,
-  ProtobufUnittest_Extensions_packed_sfixed32_extension,
-  ProtobufUnittest_Extensions_packed_sfixed64_extension,
-  ProtobufUnittest_Extensions_packed_float_extension,
-  ProtobufUnittest_Extensions_packed_double_extension,
-  ProtobufUnittest_Extensions_packed_bool_extension,
-  ProtobufUnittest_Extensions_packed_enum_extension,
-  ProtobufUnittest_Extensions_unpacked_int32_extension,
-  ProtobufUnittest_Extensions_unpacked_int64_extension,
-  ProtobufUnittest_Extensions_unpacked_uint32_extension,
-  ProtobufUnittest_Extensions_unpacked_uint64_extension,
-  ProtobufUnittest_Extensions_unpacked_sint32_extension,
-  ProtobufUnittest_Extensions_unpacked_sint64_extension,
-  ProtobufUnittest_Extensions_unpacked_fixed32_extension,
-  ProtobufUnittest_Extensions_unpacked_fixed64_extension,
-  ProtobufUnittest_Extensions_unpacked_sfixed32_extension,
-  ProtobufUnittest_Extensions_unpacked_sfixed64_extension,
-  ProtobufUnittest_Extensions_unpacked_float_extension,
-  ProtobufUnittest_Extensions_unpacked_double_extension,
-  ProtobufUnittest_Extensions_unpacked_bool_extension,
-  ProtobufUnittest_Extensions_unpacked_enum_extension,
-  ProtobufUnittest_Extensions_test_all_types,
-  ProtobufUnittest_Extensions_test_extension_inside_table_extension,
-  ProtobufUnittest_Extensions_inner,
-  ProtobufUnittest_Extensions_redacted_extension,
-  ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.c,
-  ProtobufUnittest_TestMixedFieldsAndExtensions.Extensions.d,
-  ProtobufUnittest_TestNestedExtension.Extensions.test,
-  ProtobufUnittest_TestNestedExtension.Extensions.nested_string_extension,
-  ProtobufUnittest_TestNestedExtension.Extensions.OptionalGroup_extension,
-  ProtobufUnittest_TestNestedExtension.Extensions.optional_foreign_enum_extension,
-  ProtobufUnittest_TestRequired.Extensions.single,
-  ProtobufUnittest_TestRequired.Extensions.multi,
-  ProtobufUnittest_TestExtensionOrderings1.Extensions.test_ext_orderings1,
-  ProtobufUnittest_TestExtensionOrderings2.Extensions.test_ext_orderings2,
-  ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3,
-  ProtobufUnittest_TestParsingMerge.Extensions.optional_ext,
-  ProtobufUnittest_TestParsingMerge.Extensions.repeated_ext,
-  ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_one,
-  ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_two,
-  ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_three,
-  ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_four,
-  ProtobufUnittest_TestExtensionRangeSerialize.Extensions.bar_five,
-  ProtobufUnittest_EnumParseTester.Extensions.optional_arbitrary_ext,
-  ProtobufUnittest_EnumParseTester.Extensions.repeated_arbitrary_ext,
-  ProtobufUnittest_EnumParseTester.Extensions.packed_arbitrary_ext,
-  ProtobufUnittest_BoolParseTester.Extensions.optional_bool_ext,
-  ProtobufUnittest_BoolParseTester.Extensions.repeated_bool_ext,
-  ProtobufUnittest_BoolParseTester.Extensions.packed_bool_ext,
-  ProtobufUnittest_Int32ParseTester.Extensions.optional_int32_ext,
-  ProtobufUnittest_Int32ParseTester.Extensions.repeated_int32_ext,
-  ProtobufUnittest_Int32ParseTester.Extensions.packed_int32_ext,
-  ProtobufUnittest_Int64ParseTester.Extensions.optional_int64_ext,
-  ProtobufUnittest_Int64ParseTester.Extensions.repeated_int64_ext,
-  ProtobufUnittest_Int64ParseTester.Extensions.packed_int64_ext,
-  ProtobufUnittest_StringParseTester.Extensions.optional_string_ext,
-  ProtobufUnittest_StringParseTester.Extensions.repeated_string_ext
+let Proto2Unittest_Unittest_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_optional_int32_extension,
+  Proto2Unittest_Extensions_optional_int64_extension,
+  Proto2Unittest_Extensions_optional_uint32_extension,
+  Proto2Unittest_Extensions_optional_uint64_extension,
+  Proto2Unittest_Extensions_optional_sint32_extension,
+  Proto2Unittest_Extensions_optional_sint64_extension,
+  Proto2Unittest_Extensions_optional_fixed32_extension,
+  Proto2Unittest_Extensions_optional_fixed64_extension,
+  Proto2Unittest_Extensions_optional_sfixed32_extension,
+  Proto2Unittest_Extensions_optional_sfixed64_extension,
+  Proto2Unittest_Extensions_optional_float_extension,
+  Proto2Unittest_Extensions_optional_double_extension,
+  Proto2Unittest_Extensions_optional_bool_extension,
+  Proto2Unittest_Extensions_optional_string_extension,
+  Proto2Unittest_Extensions_optional_bytes_extension,
+  Proto2Unittest_Extensions_OptionalGroup_extension,
+  Proto2Unittest_Extensions_optional_nested_message_extension,
+  Proto2Unittest_Extensions_optional_foreign_message_extension,
+  Proto2Unittest_Extensions_optional_import_message_extension,
+  Proto2Unittest_Extensions_optional_nested_enum_extension,
+  Proto2Unittest_Extensions_optional_foreign_enum_extension,
+  Proto2Unittest_Extensions_optional_import_enum_extension,
+  Proto2Unittest_Extensions_optional_string_piece_extension,
+  Proto2Unittest_Extensions_optional_cord_extension,
+  Proto2Unittest_Extensions_optional_bytes_cord_extension,
+  Proto2Unittest_Extensions_optional_public_import_message_extension,
+  Proto2Unittest_Extensions_optional_lazy_message_extension,
+  Proto2Unittest_Extensions_optional_unverified_lazy_message_extension,
+  Proto2Unittest_Extensions_repeated_int32_extension,
+  Proto2Unittest_Extensions_repeated_int64_extension,
+  Proto2Unittest_Extensions_repeated_uint32_extension,
+  Proto2Unittest_Extensions_repeated_uint64_extension,
+  Proto2Unittest_Extensions_repeated_sint32_extension,
+  Proto2Unittest_Extensions_repeated_sint64_extension,
+  Proto2Unittest_Extensions_repeated_fixed32_extension,
+  Proto2Unittest_Extensions_repeated_fixed64_extension,
+  Proto2Unittest_Extensions_repeated_sfixed32_extension,
+  Proto2Unittest_Extensions_repeated_sfixed64_extension,
+  Proto2Unittest_Extensions_repeated_float_extension,
+  Proto2Unittest_Extensions_repeated_double_extension,
+  Proto2Unittest_Extensions_repeated_bool_extension,
+  Proto2Unittest_Extensions_repeated_string_extension,
+  Proto2Unittest_Extensions_repeated_bytes_extension,
+  Proto2Unittest_Extensions_RepeatedGroup_extension,
+  Proto2Unittest_Extensions_repeated_nested_message_extension,
+  Proto2Unittest_Extensions_repeated_foreign_message_extension,
+  Proto2Unittest_Extensions_repeated_import_message_extension,
+  Proto2Unittest_Extensions_repeated_nested_enum_extension,
+  Proto2Unittest_Extensions_repeated_foreign_enum_extension,
+  Proto2Unittest_Extensions_repeated_import_enum_extension,
+  Proto2Unittest_Extensions_repeated_string_piece_extension,
+  Proto2Unittest_Extensions_repeated_cord_extension,
+  Proto2Unittest_Extensions_repeated_lazy_message_extension,
+  Proto2Unittest_Extensions_default_int32_extension,
+  Proto2Unittest_Extensions_default_int64_extension,
+  Proto2Unittest_Extensions_default_uint32_extension,
+  Proto2Unittest_Extensions_default_uint64_extension,
+  Proto2Unittest_Extensions_default_sint32_extension,
+  Proto2Unittest_Extensions_default_sint64_extension,
+  Proto2Unittest_Extensions_default_fixed32_extension,
+  Proto2Unittest_Extensions_default_fixed64_extension,
+  Proto2Unittest_Extensions_default_sfixed32_extension,
+  Proto2Unittest_Extensions_default_sfixed64_extension,
+  Proto2Unittest_Extensions_default_float_extension,
+  Proto2Unittest_Extensions_default_double_extension,
+  Proto2Unittest_Extensions_default_bool_extension,
+  Proto2Unittest_Extensions_default_string_extension,
+  Proto2Unittest_Extensions_default_bytes_extension,
+  Proto2Unittest_Extensions_default_nested_enum_extension,
+  Proto2Unittest_Extensions_default_foreign_enum_extension,
+  Proto2Unittest_Extensions_default_import_enum_extension,
+  Proto2Unittest_Extensions_default_string_piece_extension,
+  Proto2Unittest_Extensions_default_cord_extension,
+  Proto2Unittest_Extensions_oneof_uint32_extension,
+  Proto2Unittest_Extensions_oneof_nested_message_extension,
+  Proto2Unittest_Extensions_oneof_string_extension,
+  Proto2Unittest_Extensions_oneof_bytes_extension,
+  Proto2Unittest_Extensions_optional_utf8_string_extension,
+  Proto2Unittest_Extensions_repeated_utf8_string_extension,
+  Proto2Unittest_Extensions_my_extension_string,
+  Proto2Unittest_Extensions_my_extension_int,
+  Proto2Unittest_Extensions_packed_int32_extension,
+  Proto2Unittest_Extensions_packed_int64_extension,
+  Proto2Unittest_Extensions_packed_uint32_extension,
+  Proto2Unittest_Extensions_packed_uint64_extension,
+  Proto2Unittest_Extensions_packed_sint32_extension,
+  Proto2Unittest_Extensions_packed_sint64_extension,
+  Proto2Unittest_Extensions_packed_fixed32_extension,
+  Proto2Unittest_Extensions_packed_fixed64_extension,
+  Proto2Unittest_Extensions_packed_sfixed32_extension,
+  Proto2Unittest_Extensions_packed_sfixed64_extension,
+  Proto2Unittest_Extensions_packed_float_extension,
+  Proto2Unittest_Extensions_packed_double_extension,
+  Proto2Unittest_Extensions_packed_bool_extension,
+  Proto2Unittest_Extensions_packed_enum_extension,
+  Proto2Unittest_Extensions_unpacked_int32_extension,
+  Proto2Unittest_Extensions_unpacked_int64_extension,
+  Proto2Unittest_Extensions_unpacked_uint32_extension,
+  Proto2Unittest_Extensions_unpacked_uint64_extension,
+  Proto2Unittest_Extensions_unpacked_sint32_extension,
+  Proto2Unittest_Extensions_unpacked_sint64_extension,
+  Proto2Unittest_Extensions_unpacked_fixed32_extension,
+  Proto2Unittest_Extensions_unpacked_fixed64_extension,
+  Proto2Unittest_Extensions_unpacked_sfixed32_extension,
+  Proto2Unittest_Extensions_unpacked_sfixed64_extension,
+  Proto2Unittest_Extensions_unpacked_float_extension,
+  Proto2Unittest_Extensions_unpacked_double_extension,
+  Proto2Unittest_Extensions_unpacked_bool_extension,
+  Proto2Unittest_Extensions_unpacked_enum_extension,
+  Proto2Unittest_Extensions_test_all_types,
+  Proto2Unittest_Extensions_test_extension_inside_table_extension,
+  Proto2Unittest_Extensions_inner,
+  Proto2Unittest_Extensions_redacted_extension,
+  Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.c,
+  Proto2Unittest_TestMixedFieldsAndExtensions.Extensions.d,
+  Proto2Unittest_TestNestedExtension.Extensions.test,
+  Proto2Unittest_TestNestedExtension.Extensions.nested_string_extension,
+  Proto2Unittest_TestNestedExtension.Extensions.OptionalGroup_extension,
+  Proto2Unittest_TestNestedExtension.Extensions.optional_foreign_enum_extension,
+  Proto2Unittest_TestRequired.Extensions.single,
+  Proto2Unittest_TestRequired.Extensions.multi,
+  Proto2Unittest_TestExtensionOrderings1.Extensions.test_ext_orderings1,
+  Proto2Unittest_TestExtensionOrderings2.Extensions.test_ext_orderings2,
+  Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3.Extensions.test_ext_orderings3,
+  Proto2Unittest_TestParsingMerge.Extensions.optional_ext,
+  Proto2Unittest_TestParsingMerge.Extensions.repeated_ext,
+  Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_one,
+  Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_two,
+  Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_three,
+  Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_four,
+  Proto2Unittest_TestExtensionRangeSerialize.Extensions.bar_five,
+  Proto2Unittest_EnumParseTester.Extensions.optional_arbitrary_ext,
+  Proto2Unittest_EnumParseTester.Extensions.repeated_arbitrary_ext,
+  Proto2Unittest_EnumParseTester.Extensions.packed_arbitrary_ext,
+  Proto2Unittest_BoolParseTester.Extensions.optional_bool_ext,
+  Proto2Unittest_BoolParseTester.Extensions.repeated_bool_ext,
+  Proto2Unittest_BoolParseTester.Extensions.packed_bool_ext,
+  Proto2Unittest_Int32ParseTester.Extensions.optional_int32_ext,
+  Proto2Unittest_Int32ParseTester.Extensions.repeated_int32_ext,
+  Proto2Unittest_Int32ParseTester.Extensions.packed_int32_ext,
+  Proto2Unittest_Int64ParseTester.Extensions.optional_int64_ext,
+  Proto2Unittest_Int64ParseTester.Extensions.repeated_int64_ext,
+  Proto2Unittest_Int64ParseTester.Extensions.packed_int64_ext,
+  Proto2Unittest_StringParseTester.Extensions.optional_string_ext,
+  Proto2Unittest_StringParseTester.Extensions.repeated_string_ext
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
@@ -9478,791 +9500,801 @@ let ProtobufUnittest_Unittest_Extensions: SwiftProtobuf.SimpleExtensionMap = [
 // accessors for the extension fields on the messages directly.
 
 /// Singular
-let ProtobufUnittest_Extensions_optional_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 1,
-  fieldName: "protobuf_unittest.optional_int32_extension"
+  fieldName: "proto2_unittest.optional_int32_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 2,
-  fieldName: "protobuf_unittest.optional_int64_extension"
+  fieldName: "proto2_unittest.optional_int64_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 3,
-  fieldName: "protobuf_unittest.optional_uint32_extension"
+  fieldName: "proto2_unittest.optional_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 4,
-  fieldName: "protobuf_unittest.optional_uint64_extension"
+  fieldName: "proto2_unittest.optional_uint64_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 5,
-  fieldName: "protobuf_unittest.optional_sint32_extension"
+  fieldName: "proto2_unittest.optional_sint32_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 6,
-  fieldName: "protobuf_unittest.optional_sint64_extension"
+  fieldName: "proto2_unittest.optional_sint64_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 7,
-  fieldName: "protobuf_unittest.optional_fixed32_extension"
+  fieldName: "proto2_unittest.optional_fixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 8,
-  fieldName: "protobuf_unittest.optional_fixed64_extension"
+  fieldName: "proto2_unittest.optional_fixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 9,
-  fieldName: "protobuf_unittest.optional_sfixed32_extension"
+  fieldName: "proto2_unittest.optional_sfixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 10,
-  fieldName: "protobuf_unittest.optional_sfixed64_extension"
+  fieldName: "proto2_unittest.optional_sfixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 11,
-  fieldName: "protobuf_unittest.optional_float_extension"
+  fieldName: "proto2_unittest.optional_float_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 12,
-  fieldName: "protobuf_unittest.optional_double_extension"
+  fieldName: "proto2_unittest.optional_double_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 13,
-  fieldName: "protobuf_unittest.optional_bool_extension"
+  fieldName: "proto2_unittest.optional_bool_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 14,
-  fieldName: "protobuf_unittest.optional_string_extension"
+  fieldName: "proto2_unittest.optional_string_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 15,
-  fieldName: "protobuf_unittest.optional_bytes_extension"
+  fieldName: "proto2_unittest.optional_bytes_extension"
 )
 
-let ProtobufUnittest_Extensions_OptionalGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufUnittest_OptionalGroup_extension>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_OptionalGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<Proto2Unittest_OptionalGroup_extension>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 16,
-  fieldName: "protobuf_unittest.optionalgroup_extension"
+  fieldName: "proto2_unittest.optionalgroup_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 18,
-  fieldName: "protobuf_unittest.optional_nested_message_extension"
+  fieldName: "proto2_unittest.optional_nested_message_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_foreign_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ForeignMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_foreign_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ForeignMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 19,
-  fieldName: "protobuf_unittest.optional_foreign_message_extension"
+  fieldName: "proto2_unittest.optional_foreign_message_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_ImportMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_ImportMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 20,
-  fieldName: "protobuf_unittest.optional_import_message_extension"
+  fieldName: "proto2_unittest.optional_import_message_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_TestAllTypes.NestedEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_TestAllTypes.NestedEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 21,
-  fieldName: "protobuf_unittest.optional_nested_enum_extension"
+  fieldName: "proto2_unittest.optional_nested_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 22,
-  fieldName: "protobuf_unittest.optional_foreign_enum_extension"
+  fieldName: "proto2_unittest.optional_foreign_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 23,
-  fieldName: "protobuf_unittest.optional_import_enum_extension"
+  fieldName: "proto2_unittest.optional_import_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 24,
-  fieldName: "protobuf_unittest.optional_string_piece_extension"
+  fieldName: "proto2_unittest.optional_string_piece_extension"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_optional_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 25,
-  fieldName: "protobuf_unittest.optional_cord_extension"
+  fieldName: "proto2_unittest.optional_cord_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_bytes_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_bytes_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 86,
-  fieldName: "protobuf_unittest.optional_bytes_cord_extension"
+  fieldName: "proto2_unittest.optional_bytes_cord_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_public_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_PublicImportMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_public_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_PublicImportMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 26,
-  fieldName: "protobuf_unittest.optional_public_import_message_extension"
+  fieldName: "proto2_unittest.optional_public_import_message_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 27,
-  fieldName: "protobuf_unittest.optional_lazy_message_extension"
+  fieldName: "proto2_unittest.optional_lazy_message_extension"
 )
 
-let ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_optional_unverified_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 28,
-  fieldName: "protobuf_unittest.optional_unverified_lazy_message_extension"
+  fieldName: "proto2_unittest.optional_unverified_lazy_message_extension"
 )
 
 /// Repeated
-let ProtobufUnittest_Extensions_repeated_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 31,
-  fieldName: "protobuf_unittest.repeated_int32_extension"
+  fieldName: "proto2_unittest.repeated_int32_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 32,
-  fieldName: "protobuf_unittest.repeated_int64_extension"
+  fieldName: "proto2_unittest.repeated_int64_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 33,
-  fieldName: "protobuf_unittest.repeated_uint32_extension"
+  fieldName: "proto2_unittest.repeated_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 34,
-  fieldName: "protobuf_unittest.repeated_uint64_extension"
+  fieldName: "proto2_unittest.repeated_uint64_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 35,
-  fieldName: "protobuf_unittest.repeated_sint32_extension"
+  fieldName: "proto2_unittest.repeated_sint32_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 36,
-  fieldName: "protobuf_unittest.repeated_sint64_extension"
+  fieldName: "proto2_unittest.repeated_sint64_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 37,
-  fieldName: "protobuf_unittest.repeated_fixed32_extension"
+  fieldName: "proto2_unittest.repeated_fixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 38,
-  fieldName: "protobuf_unittest.repeated_fixed64_extension"
+  fieldName: "proto2_unittest.repeated_fixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 39,
-  fieldName: "protobuf_unittest.repeated_sfixed32_extension"
+  fieldName: "proto2_unittest.repeated_sfixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 40,
-  fieldName: "protobuf_unittest.repeated_sfixed64_extension"
+  fieldName: "proto2_unittest.repeated_sfixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 41,
-  fieldName: "protobuf_unittest.repeated_float_extension"
+  fieldName: "proto2_unittest.repeated_float_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 42,
-  fieldName: "protobuf_unittest.repeated_double_extension"
+  fieldName: "proto2_unittest.repeated_double_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 43,
-  fieldName: "protobuf_unittest.repeated_bool_extension"
+  fieldName: "proto2_unittest.repeated_bool_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 44,
-  fieldName: "protobuf_unittest.repeated_string_extension"
+  fieldName: "proto2_unittest.repeated_string_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 45,
-  fieldName: "protobuf_unittest.repeated_bytes_extension"
+  fieldName: "proto2_unittest.repeated_bytes_extension"
 )
 
-let ProtobufUnittest_Extensions_RepeatedGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedGroupExtensionField<ProtobufUnittest_RepeatedGroup_extension>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_RepeatedGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedGroupExtensionField<Proto2Unittest_RepeatedGroup_extension>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 46,
-  fieldName: "protobuf_unittest.repeatedgroup_extension"
+  fieldName: "proto2_unittest.repeatedgroup_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 48,
-  fieldName: "protobuf_unittest.repeated_nested_message_extension"
+  fieldName: "proto2_unittest.repeated_nested_message_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_foreign_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_ForeignMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_foreign_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_ForeignMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 49,
-  fieldName: "protobuf_unittest.repeated_foreign_message_extension"
+  fieldName: "proto2_unittest.repeated_foreign_message_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittestImport_ImportMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_import_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2UnittestImport_ImportMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 50,
-  fieldName: "protobuf_unittest.repeated_import_message_extension"
+  fieldName: "proto2_unittest.repeated_import_message_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_TestAllTypes.NestedEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_TestAllTypes.NestedEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 51,
-  fieldName: "protobuf_unittest.repeated_nested_enum_extension"
+  fieldName: "proto2_unittest.repeated_nested_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 52,
-  fieldName: "protobuf_unittest.repeated_foreign_enum_extension"
+  fieldName: "proto2_unittest.repeated_foreign_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittestImport_ImportEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2UnittestImport_ImportEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 53,
-  fieldName: "protobuf_unittest.repeated_import_enum_extension"
+  fieldName: "proto2_unittest.repeated_import_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 54,
-  fieldName: "protobuf_unittest.repeated_string_piece_extension"
+  fieldName: "proto2_unittest.repeated_string_piece_extension"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_repeated_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 55,
-  fieldName: "protobuf_unittest.repeated_cord_extension"
+  fieldName: "proto2_unittest.repeated_cord_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_repeated_lazy_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 57,
-  fieldName: "protobuf_unittest.repeated_lazy_message_extension"
+  fieldName: "proto2_unittest.repeated_lazy_message_extension"
 )
 
 /// Singular with defaults
-let ProtobufUnittest_Extensions_default_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 61,
-  fieldName: "protobuf_unittest.default_int32_extension"
+  fieldName: "proto2_unittest.default_int32_extension"
 )
 
-let ProtobufUnittest_Extensions_default_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 62,
-  fieldName: "protobuf_unittest.default_int64_extension"
+  fieldName: "proto2_unittest.default_int64_extension"
 )
 
-let ProtobufUnittest_Extensions_default_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 63,
-  fieldName: "protobuf_unittest.default_uint32_extension"
+  fieldName: "proto2_unittest.default_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_default_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 64,
-  fieldName: "protobuf_unittest.default_uint64_extension"
+  fieldName: "proto2_unittest.default_uint64_extension"
 )
 
-let ProtobufUnittest_Extensions_default_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 65,
-  fieldName: "protobuf_unittest.default_sint32_extension"
+  fieldName: "proto2_unittest.default_sint32_extension"
 )
 
-let ProtobufUnittest_Extensions_default_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 66,
-  fieldName: "protobuf_unittest.default_sint64_extension"
+  fieldName: "proto2_unittest.default_sint64_extension"
 )
 
-let ProtobufUnittest_Extensions_default_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 67,
-  fieldName: "protobuf_unittest.default_fixed32_extension"
+  fieldName: "proto2_unittest.default_fixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_default_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 68,
-  fieldName: "protobuf_unittest.default_fixed64_extension"
+  fieldName: "proto2_unittest.default_fixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_default_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 69,
-  fieldName: "protobuf_unittest.default_sfixed32_extension"
+  fieldName: "proto2_unittest.default_sfixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_default_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 70,
-  fieldName: "protobuf_unittest.default_sfixed64_extension"
+  fieldName: "proto2_unittest.default_sfixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_default_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 71,
-  fieldName: "protobuf_unittest.default_float_extension"
+  fieldName: "proto2_unittest.default_float_extension"
 )
 
-let ProtobufUnittest_Extensions_default_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 72,
-  fieldName: "protobuf_unittest.default_double_extension"
+  fieldName: "proto2_unittest.default_double_extension"
 )
 
-let ProtobufUnittest_Extensions_default_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 73,
-  fieldName: "protobuf_unittest.default_bool_extension"
+  fieldName: "proto2_unittest.default_bool_extension"
 )
 
-let ProtobufUnittest_Extensions_default_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 74,
-  fieldName: "protobuf_unittest.default_string_extension"
+  fieldName: "proto2_unittest.default_string_extension"
 )
 
-let ProtobufUnittest_Extensions_default_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 75,
-  fieldName: "protobuf_unittest.default_bytes_extension"
+  fieldName: "proto2_unittest.default_bytes_extension"
 )
 
-let ProtobufUnittest_Extensions_default_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_TestAllTypes.NestedEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_nested_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_TestAllTypes.NestedEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 81,
-  fieldName: "protobuf_unittest.default_nested_enum_extension"
+  fieldName: "proto2_unittest.default_nested_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_default_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 82,
-  fieldName: "protobuf_unittest.default_foreign_enum_extension"
+  fieldName: "proto2_unittest.default_foreign_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_default_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnum>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_import_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnum>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 83,
-  fieldName: "protobuf_unittest.default_import_enum_extension"
+  fieldName: "proto2_unittest.default_import_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_default_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_string_piece_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 84,
-  fieldName: "protobuf_unittest.default_string_piece_extension"
+  fieldName: "proto2_unittest.default_string_piece_extension"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_default_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_default_cord_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 85,
-  fieldName: "protobuf_unittest.default_cord_extension"
+  fieldName: "proto2_unittest.default_cord_extension"
 )
 
 /// For oneof test
-let ProtobufUnittest_Extensions_oneof_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_oneof_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 111,
-  fieldName: "protobuf_unittest.oneof_uint32_extension"
+  fieldName: "proto2_unittest.oneof_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_oneof_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes.NestedMessage>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_oneof_nested_message_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes.NestedMessage>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 112,
-  fieldName: "protobuf_unittest.oneof_nested_message_extension"
+  fieldName: "proto2_unittest.oneof_nested_message_extension"
 )
 
-let ProtobufUnittest_Extensions_oneof_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_oneof_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 113,
-  fieldName: "protobuf_unittest.oneof_string_extension"
+  fieldName: "proto2_unittest.oneof_string_extension"
 )
 
-let ProtobufUnittest_Extensions_oneof_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensions>(
+let Proto2Unittest_Extensions_oneof_bytes_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensions>(
   _protobuf_fieldNumber: 114,
-  fieldName: "protobuf_unittest.oneof_bytes_extension"
+  fieldName: "proto2_unittest.oneof_bytes_extension"
+)
+
+let Proto2Unittest_Extensions_optional_utf8_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
+  _protobuf_fieldNumber: 115,
+  fieldName: "proto2_unittest.optional_utf8_string_extension"
+)
+
+let Proto2Unittest_Extensions_repeated_utf8_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
+  _protobuf_fieldNumber: 116,
+  fieldName: "proto2_unittest.repeated_utf8_string_extension"
 )
 
-let ProtobufUnittest_Extensions_my_extension_string = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestFieldOrderings>(
+let Proto2Unittest_Extensions_my_extension_string = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestFieldOrderings>(
   _protobuf_fieldNumber: 50,
-  fieldName: "protobuf_unittest.my_extension_string"
+  fieldName: "proto2_unittest.my_extension_string"
 )
 
-let ProtobufUnittest_Extensions_my_extension_int = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestFieldOrderings>(
+let Proto2Unittest_Extensions_my_extension_int = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestFieldOrderings>(
   _protobuf_fieldNumber: 5,
-  fieldName: "protobuf_unittest.my_extension_int"
+  fieldName: "proto2_unittest.my_extension_int"
 )
 
-let ProtobufUnittest_Extensions_packed_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 90,
-  fieldName: "protobuf_unittest.packed_int32_extension"
+  fieldName: "proto2_unittest.packed_int32_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 91,
-  fieldName: "protobuf_unittest.packed_int64_extension"
+  fieldName: "proto2_unittest.packed_int64_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 92,
-  fieldName: "protobuf_unittest.packed_uint32_extension"
+  fieldName: "proto2_unittest.packed_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 93,
-  fieldName: "protobuf_unittest.packed_uint64_extension"
+  fieldName: "proto2_unittest.packed_uint64_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 94,
-  fieldName: "protobuf_unittest.packed_sint32_extension"
+  fieldName: "proto2_unittest.packed_sint32_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 95,
-  fieldName: "protobuf_unittest.packed_sint64_extension"
+  fieldName: "proto2_unittest.packed_sint64_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 96,
-  fieldName: "protobuf_unittest.packed_fixed32_extension"
+  fieldName: "proto2_unittest.packed_fixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 97,
-  fieldName: "protobuf_unittest.packed_fixed64_extension"
+  fieldName: "proto2_unittest.packed_fixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 98,
-  fieldName: "protobuf_unittest.packed_sfixed32_extension"
+  fieldName: "proto2_unittest.packed_sfixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 99,
-  fieldName: "protobuf_unittest.packed_sfixed64_extension"
+  fieldName: "proto2_unittest.packed_sfixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 100,
-  fieldName: "protobuf_unittest.packed_float_extension"
+  fieldName: "proto2_unittest.packed_float_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 101,
-  fieldName: "protobuf_unittest.packed_double_extension"
+  fieldName: "proto2_unittest.packed_double_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 102,
-  fieldName: "protobuf_unittest.packed_bool_extension"
+  fieldName: "proto2_unittest.packed_bool_extension"
 )
 
-let ProtobufUnittest_Extensions_packed_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestPackedExtensions>(
+let Proto2Unittest_Extensions_packed_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestPackedExtensions>(
   _protobuf_fieldNumber: 103,
-  fieldName: "protobuf_unittest.packed_enum_extension"
+  fieldName: "proto2_unittest.packed_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_int32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 90,
-  fieldName: "protobuf_unittest.unpacked_int32_extension"
+  fieldName: "proto2_unittest.unpacked_int32_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_int64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 91,
-  fieldName: "protobuf_unittest.unpacked_int64_extension"
+  fieldName: "proto2_unittest.unpacked_int64_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_uint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 92,
-  fieldName: "protobuf_unittest.unpacked_uint32_extension"
+  fieldName: "proto2_unittest.unpacked_uint32_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_uint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 93,
-  fieldName: "protobuf_unittest.unpacked_uint64_extension"
+  fieldName: "proto2_unittest.unpacked_uint64_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_sint32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 94,
-  fieldName: "protobuf_unittest.unpacked_sint32_extension"
+  fieldName: "proto2_unittest.unpacked_sint32_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_sint64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 95,
-  fieldName: "protobuf_unittest.unpacked_sint64_extension"
+  fieldName: "proto2_unittest.unpacked_sint64_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_fixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 96,
-  fieldName: "protobuf_unittest.unpacked_fixed32_extension"
+  fieldName: "proto2_unittest.unpacked_fixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_fixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 97,
-  fieldName: "protobuf_unittest.unpacked_fixed64_extension"
+  fieldName: "proto2_unittest.unpacked_fixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_sfixed32_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 98,
-  fieldName: "protobuf_unittest.unpacked_sfixed32_extension"
+  fieldName: "proto2_unittest.unpacked_sfixed32_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_sfixed64_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 99,
-  fieldName: "protobuf_unittest.unpacked_sfixed64_extension"
+  fieldName: "proto2_unittest.unpacked_sfixed64_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_float_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 100,
-  fieldName: "protobuf_unittest.unpacked_float_extension"
+  fieldName: "proto2_unittest.unpacked_float_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_double_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 101,
-  fieldName: "protobuf_unittest.unpacked_double_extension"
+  fieldName: "proto2_unittest.unpacked_double_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_bool_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 102,
-  fieldName: "protobuf_unittest.unpacked_bool_extension"
+  fieldName: "proto2_unittest.unpacked_bool_extension"
 )
 
-let ProtobufUnittest_Extensions_unpacked_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestUnpackedExtensions>(
+let Proto2Unittest_Extensions_unpacked_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestUnpackedExtensions>(
   _protobuf_fieldNumber: 103,
-  fieldName: "protobuf_unittest.unpacked_enum_extension"
+  fieldName: "proto2_unittest.unpacked_enum_extension"
 )
 
-let ProtobufUnittest_Extensions_test_all_types = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes>, ProtobufUnittest_TestHugeFieldNumbers>(
+let Proto2Unittest_Extensions_test_all_types = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes>, Proto2Unittest_TestHugeFieldNumbers>(
   _protobuf_fieldNumber: 536860000,
-  fieldName: "protobuf_unittest.test_all_types"
+  fieldName: "proto2_unittest.test_all_types"
 )
 
-let ProtobufUnittest_Extensions_test_extension_inside_table_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionInsideTable>(
+let Proto2Unittest_Extensions_test_extension_inside_table_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionInsideTable>(
   _protobuf_fieldNumber: 5,
-  fieldName: "protobuf_unittest.test_extension_inside_table_extension"
+  fieldName: "proto2_unittest.test_extension_inside_table_extension"
 )
 
-let ProtobufUnittest_Extensions_inner = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestNestedGroupExtensionInnerExtension>, ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup>(
+let Proto2Unittest_Extensions_inner = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestNestedGroupExtensionInnerExtension>, Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup>(
   _protobuf_fieldNumber: 3,
-  fieldName: "protobuf_unittest.inner"
+  fieldName: "proto2_unittest.inner"
 )
 
-let ProtobufUnittest_Extensions_redacted_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_RedactedFields>(
+let Proto2Unittest_Extensions_redacted_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_RedactedFields>(
   _protobuf_fieldNumber: 20,
-  fieldName: "protobuf_unittest.redacted_extension"
+  fieldName: "proto2_unittest.redacted_extension"
 )
 
-extension ProtobufUnittest_TestMixedFieldsAndExtensions {
+extension Proto2Unittest_TestMixedFieldsAndExtensions {
   enum Extensions {
-    static let c = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestMixedFieldsAndExtensions>(
+    static let c = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestMixedFieldsAndExtensions>(
       _protobuf_fieldNumber: 2,
-      fieldName: "protobuf_unittest.TestMixedFieldsAndExtensions.c"
+      fieldName: "proto2_unittest.TestMixedFieldsAndExtensions.c"
     )
 
-    static let d = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestMixedFieldsAndExtensions>(
+    static let d = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestMixedFieldsAndExtensions>(
       _protobuf_fieldNumber: 4,
-      fieldName: "protobuf_unittest.TestMixedFieldsAndExtensions.d"
+      fieldName: "proto2_unittest.TestMixedFieldsAndExtensions.d"
     )
   }
 }
 
-extension ProtobufUnittest_TestNestedExtension {
+extension Proto2Unittest_TestNestedExtension {
   enum Extensions {
     /// Check for bug where string extensions declared in tested scope did not
     /// compile.
-    static let test = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+    static let test = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
       _protobuf_fieldNumber: 1002,
-      fieldName: "protobuf_unittest.TestNestedExtension.test"
+      fieldName: "proto2_unittest.TestNestedExtension.test"
     )
 
     /// Used to test if generated extension name is correct when there are
     /// underscores.
-    static let nested_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensions>(
+    static let nested_string_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensions>(
       _protobuf_fieldNumber: 1003,
-      fieldName: "protobuf_unittest.TestNestedExtension.nested_string_extension"
+      fieldName: "proto2_unittest.TestNestedExtension.nested_string_extension"
     )
 
-    static let OptionalGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufUnittest_TestNestedExtension.OptionalGroup_extension>, ProtobufUnittest_TestGroupExtension>(
+    static let OptionalGroup_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<Proto2Unittest_TestNestedExtension.OptionalGroup_extension>, Proto2Unittest_TestGroupExtension>(
       _protobuf_fieldNumber: 16,
-      fieldName: "protobuf_unittest.TestNestedExtension.optionalgroup_extension"
+      fieldName: "proto2_unittest.TestNestedExtension.optionalgroup_extension"
     )
 
-    static let optional_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_ForeignEnum>, ProtobufUnittest_TestGroupExtension>(
+    static let optional_foreign_enum_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_ForeignEnum>, Proto2Unittest_TestGroupExtension>(
       _protobuf_fieldNumber: 22,
-      fieldName: "protobuf_unittest.TestNestedExtension.optional_foreign_enum_extension"
+      fieldName: "proto2_unittest.TestNestedExtension.optional_foreign_enum_extension"
     )
   }
 }
 
-extension ProtobufUnittest_TestRequired {
+extension Proto2Unittest_TestRequired {
   enum Extensions {
-    static let single = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestRequired>, ProtobufUnittest_TestAllExtensions>(
+    static let single = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestRequired>, Proto2Unittest_TestAllExtensions>(
       _protobuf_fieldNumber: 1000,
-      fieldName: "protobuf_unittest.TestRequired.single"
+      fieldName: "proto2_unittest.TestRequired.single"
     )
 
-    static let multi = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestRequired>, ProtobufUnittest_TestAllExtensions>(
+    static let multi = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestRequired>, Proto2Unittest_TestAllExtensions>(
       _protobuf_fieldNumber: 1001,
-      fieldName: "protobuf_unittest.TestRequired.multi"
+      fieldName: "proto2_unittest.TestRequired.multi"
     )
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings1 {
+extension Proto2Unittest_TestExtensionOrderings1 {
   enum Extensions {
-    static let test_ext_orderings1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestExtensionOrderings1>, ProtobufUnittest_TestFieldOrderings>(
+    static let test_ext_orderings1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestExtensionOrderings1>, Proto2Unittest_TestFieldOrderings>(
       _protobuf_fieldNumber: 13,
-      fieldName: "protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1"
+      fieldName: "proto2_unittest.TestExtensionOrderings1.test_ext_orderings1"
     )
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings2 {
+extension Proto2Unittest_TestExtensionOrderings2 {
   enum Extensions {
-    static let test_ext_orderings2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestExtensionOrderings2>, ProtobufUnittest_TestFieldOrderings>(
+    static let test_ext_orderings2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestExtensionOrderings2>, Proto2Unittest_TestFieldOrderings>(
       _protobuf_fieldNumber: 12,
-      fieldName: "protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2"
+      fieldName: "proto2_unittest.TestExtensionOrderings2.test_ext_orderings2"
     )
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3 {
+extension Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3 {
   enum Extensions {
-    static let test_ext_orderings3 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3>, ProtobufUnittest_TestFieldOrderings>(
+    static let test_ext_orderings3 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3>, Proto2Unittest_TestFieldOrderings>(
       _protobuf_fieldNumber: 14,
-      fieldName: "protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3.test_ext_orderings3"
+      fieldName: "proto2_unittest.TestExtensionOrderings2.TestExtensionOrderings3.test_ext_orderings3"
     )
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge {
+extension Proto2Unittest_TestParsingMerge {
   enum Extensions {
-    static let optional_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypes>, ProtobufUnittest_TestParsingMerge>(
+    static let optional_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypes>, Proto2Unittest_TestParsingMerge>(
       _protobuf_fieldNumber: 1000,
-      fieldName: "protobuf_unittest.TestParsingMerge.optional_ext"
+      fieldName: "proto2_unittest.TestParsingMerge.optional_ext"
     )
 
-    static let repeated_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypes>, ProtobufUnittest_TestParsingMerge>(
+    static let repeated_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypes>, Proto2Unittest_TestParsingMerge>(
       _protobuf_fieldNumber: 1001,
-      fieldName: "protobuf_unittest.TestParsingMerge.repeated_ext"
+      fieldName: "proto2_unittest.TestParsingMerge.repeated_ext"
     )
   }
 }
 
-extension ProtobufUnittest_TestExtensionRangeSerialize {
+extension Proto2Unittest_TestExtensionRangeSerialize {
   enum Extensions {
-    static let bar_one = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionRangeSerialize>(
+    static let bar_one = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionRangeSerialize>(
       _protobuf_fieldNumber: 2,
-      fieldName: "protobuf_unittest.TestExtensionRangeSerialize.bar_one"
+      fieldName: "proto2_unittest.TestExtensionRangeSerialize.bar_one"
     )
 
-    static let bar_two = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionRangeSerialize>(
+    static let bar_two = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionRangeSerialize>(
       _protobuf_fieldNumber: 4,
-      fieldName: "protobuf_unittest.TestExtensionRangeSerialize.bar_two"
+      fieldName: "proto2_unittest.TestExtensionRangeSerialize.bar_two"
     )
 
-    static let bar_three = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionRangeSerialize>(
+    static let bar_three = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionRangeSerialize>(
       _protobuf_fieldNumber: 10,
-      fieldName: "protobuf_unittest.TestExtensionRangeSerialize.bar_three"
+      fieldName: "proto2_unittest.TestExtensionRangeSerialize.bar_three"
     )
 
-    static let bar_four = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionRangeSerialize>(
+    static let bar_four = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionRangeSerialize>(
       _protobuf_fieldNumber: 15,
-      fieldName: "protobuf_unittest.TestExtensionRangeSerialize.bar_four"
+      fieldName: "proto2_unittest.TestExtensionRangeSerialize.bar_four"
     )
 
-    static let bar_five = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestExtensionRangeSerialize>(
+    static let bar_five = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestExtensionRangeSerialize>(
       _protobuf_fieldNumber: 19,
-      fieldName: "protobuf_unittest.TestExtensionRangeSerialize.bar_five"
+      fieldName: "proto2_unittest.TestExtensionRangeSerialize.bar_five"
     )
   }
 }
 
-extension ProtobufUnittest_EnumParseTester {
+extension Proto2Unittest_EnumParseTester {
   enum Extensions {
-    static let optional_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_EnumParseTester.Arbitrary>, ProtobufUnittest_EnumParseTester>(
+    static let optional_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_EnumParseTester.Arbitrary>, Proto2Unittest_EnumParseTester>(
       _protobuf_fieldNumber: 2000000,
-      fieldName: "protobuf_unittest.EnumParseTester.optional_arbitrary_ext"
+      fieldName: "proto2_unittest.EnumParseTester.optional_arbitrary_ext"
     )
 
-    static let repeated_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_EnumParseTester.Arbitrary>, ProtobufUnittest_EnumParseTester>(
+    static let repeated_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_EnumParseTester.Arbitrary>, Proto2Unittest_EnumParseTester>(
       _protobuf_fieldNumber: 2000001,
-      fieldName: "protobuf_unittest.EnumParseTester.repeated_arbitrary_ext"
+      fieldName: "proto2_unittest.EnumParseTester.repeated_arbitrary_ext"
     )
 
-    static let packed_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<ProtobufUnittest_EnumParseTester.Arbitrary>, ProtobufUnittest_EnumParseTester>(
+    static let packed_arbitrary_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<Proto2Unittest_EnumParseTester.Arbitrary>, Proto2Unittest_EnumParseTester>(
       _protobuf_fieldNumber: 2000002,
-      fieldName: "protobuf_unittest.EnumParseTester.packed_arbitrary_ext"
+      fieldName: "proto2_unittest.EnumParseTester.packed_arbitrary_ext"
     )
   }
 }
 
-extension ProtobufUnittest_BoolParseTester {
+extension Proto2Unittest_BoolParseTester {
   enum Extensions {
-    static let optional_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_BoolParseTester>(
+    static let optional_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_BoolParseTester>(
       _protobuf_fieldNumber: 2000000,
-      fieldName: "protobuf_unittest.BoolParseTester.optional_bool_ext"
+      fieldName: "proto2_unittest.BoolParseTester.optional_bool_ext"
     )
 
-    static let repeated_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_BoolParseTester>(
+    static let repeated_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_BoolParseTester>(
       _protobuf_fieldNumber: 2000001,
-      fieldName: "protobuf_unittest.BoolParseTester.repeated_bool_ext"
+      fieldName: "proto2_unittest.BoolParseTester.repeated_bool_ext"
     )
 
-    static let packed_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_BoolParseTester>(
+    static let packed_bool_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_BoolParseTester>(
       _protobuf_fieldNumber: 2000002,
-      fieldName: "protobuf_unittest.BoolParseTester.packed_bool_ext"
+      fieldName: "proto2_unittest.BoolParseTester.packed_bool_ext"
     )
   }
 }
 
-extension ProtobufUnittest_Int32ParseTester {
+extension Proto2Unittest_Int32ParseTester {
   enum Extensions {
-    static let optional_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_Int32ParseTester>(
+    static let optional_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_Int32ParseTester>(
       _protobuf_fieldNumber: 2000000,
-      fieldName: "protobuf_unittest.Int32ParseTester.optional_int32_ext"
+      fieldName: "proto2_unittest.Int32ParseTester.optional_int32_ext"
     )
 
-    static let repeated_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_Int32ParseTester>(
+    static let repeated_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_Int32ParseTester>(
       _protobuf_fieldNumber: 2000001,
-      fieldName: "protobuf_unittest.Int32ParseTester.repeated_int32_ext"
+      fieldName: "proto2_unittest.Int32ParseTester.repeated_int32_ext"
     )
 
-    static let packed_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_Int32ParseTester>(
+    static let packed_int32_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_Int32ParseTester>(
       _protobuf_fieldNumber: 2000002,
-      fieldName: "protobuf_unittest.Int32ParseTester.packed_int32_ext"
+      fieldName: "proto2_unittest.Int32ParseTester.packed_int32_ext"
     )
   }
 }
 
-extension ProtobufUnittest_Int64ParseTester {
+extension Proto2Unittest_Int64ParseTester {
   enum Extensions {
-    static let optional_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_Int64ParseTester>(
+    static let optional_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_Int64ParseTester>(
       _protobuf_fieldNumber: 2000000,
-      fieldName: "protobuf_unittest.Int64ParseTester.optional_int64_ext"
+      fieldName: "proto2_unittest.Int64ParseTester.optional_int64_ext"
     )
 
-    static let repeated_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_Int64ParseTester>(
+    static let repeated_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_Int64ParseTester>(
       _protobuf_fieldNumber: 2000001,
-      fieldName: "protobuf_unittest.Int64ParseTester.repeated_int64_ext"
+      fieldName: "proto2_unittest.Int64ParseTester.repeated_int64_ext"
     )
 
-    static let packed_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_Int64ParseTester>(
+    static let packed_int64_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_Int64ParseTester>(
       _protobuf_fieldNumber: 2000002,
-      fieldName: "protobuf_unittest.Int64ParseTester.packed_int64_ext"
+      fieldName: "proto2_unittest.Int64ParseTester.packed_int64_ext"
     )
   }
 }
 
-extension ProtobufUnittest_StringParseTester {
+extension Proto2Unittest_StringParseTester {
   enum Extensions {
-    static let optional_string_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_StringParseTester>(
+    static let optional_string_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_StringParseTester>(
       _protobuf_fieldNumber: 2000000,
-      fieldName: "protobuf_unittest.StringParseTester.optional_string_ext"
+      fieldName: "proto2_unittest.StringParseTester.optional_string_ext"
     )
 
-    static let repeated_string_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_StringParseTester>(
+    static let repeated_string_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_StringParseTester>(
       _protobuf_fieldNumber: 2000001,
-      fieldName: "protobuf_unittest.StringParseTester.repeated_string_ext"
+      fieldName: "proto2_unittest.StringParseTester.repeated_string_ext"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_ForeignEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     4: .same(proto: "FOREIGN_FOO"),
     5: .same(proto: "FOREIGN_BAR"),
@@ -10272,13 +10304,13 @@ extension ProtobufUnittest_ForeignEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_TestReservedEnumFields: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestReservedEnumFields: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNKNOWN"),
   ]
 }
 
-extension ProtobufUnittest_ForeignOpenEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignOpenEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "FOREIGN_OPEN_UNKNOWN"),
     4: .same(proto: "FOREIGN_OPEN_FOO"),
@@ -10288,7 +10320,7 @@ extension ProtobufUnittest_ForeignOpenEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_TestEnumWithDupValue: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnumWithDupValue: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .aliased(proto: "FOO1", aliases: ["FOO2"]),
     2: .aliased(proto: "BAR1", aliases: ["BAR2"]),
@@ -10296,7 +10328,7 @@ extension ProtobufUnittest_TestEnumWithDupValue: SwiftProtobuf._ProtoNameProvidi
   ]
 }
 
-extension ProtobufUnittest_TestSparseEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestSparseEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -53452: .same(proto: "SPARSE_E"),
     -15: .same(proto: "SPARSE_D"),
@@ -10308,7 +10340,7 @@ extension ProtobufUnittest_TestSparseEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_VeryLargeEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_VeryLargeEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "ENUM_LABEL_DEFAULT"),
     1: .same(proto: "ENUM_LABEL_1"),
@@ -10414,7 +10446,7 @@ extension ProtobufUnittest_VeryLargeEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32"),
@@ -10517,19 +10549,19 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
     var _optionalBool: Bool? = nil
     var _optionalString: String? = nil
     var _optionalBytes: Data? = nil
-    var _optionalGroup: ProtobufUnittest_TestAllTypes.OptionalGroup? = nil
-    var _optionalNestedMessage: ProtobufUnittest_TestAllTypes.NestedMessage? = nil
-    var _optionalForeignMessage: ProtobufUnittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
-    var _optionalNestedEnum: ProtobufUnittest_TestAllTypes.NestedEnum? = nil
-    var _optionalForeignEnum: ProtobufUnittest_ForeignEnum? = nil
-    var _optionalImportEnum: ProtobufUnittestImport_ImportEnum? = nil
+    var _optionalGroup: Proto2Unittest_TestAllTypes.OptionalGroup? = nil
+    var _optionalNestedMessage: Proto2Unittest_TestAllTypes.NestedMessage? = nil
+    var _optionalForeignMessage: Proto2Unittest_ForeignMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
+    var _optionalNestedEnum: Proto2Unittest_TestAllTypes.NestedEnum? = nil
+    var _optionalForeignEnum: Proto2Unittest_ForeignEnum? = nil
+    var _optionalImportEnum: Proto2UnittestImport_ImportEnum? = nil
     var _optionalStringPiece: String? = nil
     var _optionalCord: String? = nil
     var _optionalBytesCord: Data? = nil
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
-    var _optionalLazyMessage: ProtobufUnittest_TestAllTypes.NestedMessage? = nil
-    var _optionalUnverifiedLazyMessage: ProtobufUnittest_TestAllTypes.NestedMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
+    var _optionalLazyMessage: Proto2Unittest_TestAllTypes.NestedMessage? = nil
+    var _optionalUnverifiedLazyMessage: Proto2Unittest_TestAllTypes.NestedMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
     var _repeatedUint32: [UInt32] = []
@@ -10545,16 +10577,16 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
     var _repeatedBool: [Bool] = []
     var _repeatedString: [String] = []
     var _repeatedBytes: [Data] = []
-    var _repeatedGroup: [ProtobufUnittest_TestAllTypes.RepeatedGroup] = []
-    var _repeatedNestedMessage: [ProtobufUnittest_TestAllTypes.NestedMessage] = []
-    var _repeatedForeignMessage: [ProtobufUnittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
-    var _repeatedNestedEnum: [ProtobufUnittest_TestAllTypes.NestedEnum] = []
-    var _repeatedForeignEnum: [ProtobufUnittest_ForeignEnum] = []
-    var _repeatedImportEnum: [ProtobufUnittestImport_ImportEnum] = []
+    var _repeatedGroup: [Proto2Unittest_TestAllTypes.RepeatedGroup] = []
+    var _repeatedNestedMessage: [Proto2Unittest_TestAllTypes.NestedMessage] = []
+    var _repeatedForeignMessage: [Proto2Unittest_ForeignMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
+    var _repeatedNestedEnum: [Proto2Unittest_TestAllTypes.NestedEnum] = []
+    var _repeatedForeignEnum: [Proto2Unittest_ForeignEnum] = []
+    var _repeatedImportEnum: [Proto2UnittestImport_ImportEnum] = []
     var _repeatedStringPiece: [String] = []
     var _repeatedCord: [String] = []
-    var _repeatedLazyMessage: [ProtobufUnittest_TestAllTypes.NestedMessage] = []
+    var _repeatedLazyMessage: [Proto2Unittest_TestAllTypes.NestedMessage] = []
     var _defaultInt32: Int32? = nil
     var _defaultInt64: Int64? = nil
     var _defaultUint32: UInt32? = nil
@@ -10570,12 +10602,12 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
     var _defaultBool: Bool? = nil
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
-    var _defaultNestedEnum: ProtobufUnittest_TestAllTypes.NestedEnum? = nil
-    var _defaultForeignEnum: ProtobufUnittest_ForeignEnum? = nil
-    var _defaultImportEnum: ProtobufUnittestImport_ImportEnum? = nil
+    var _defaultNestedEnum: Proto2Unittest_TestAllTypes.NestedEnum? = nil
+    var _defaultForeignEnum: Proto2Unittest_ForeignEnum? = nil
+    var _defaultImportEnum: Proto2UnittestImport_ImportEnum? = nil
     var _defaultStringPiece: String? = nil
     var _defaultCord: String? = nil
-    var _oneofField: ProtobufUnittest_TestAllTypes.OneOf_OneofField?
+    var _oneofField: Proto2Unittest_TestAllTypes.OneOf_OneofField?
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -10764,7 +10796,7 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
           }
         }()
         case 112: try {
-          var v: ProtobufUnittest_TestAllTypes.NestedMessage?
+          var v: Proto2Unittest_TestAllTypes.NestedMessage?
           var hadOneofValue = false
           if let current = _storage._oneofField {
             hadOneofValue = true
@@ -10809,7 +10841,7 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
           }
         }()
         case 117: try {
-          var v: ProtobufUnittest_TestAllTypes.NestedMessage?
+          var v: Proto2Unittest_TestAllTypes.NestedMessage?
           var hadOneofValue = false
           if let current = _storage._oneofField {
             hadOneofValue = true
@@ -11087,7 +11119,7 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypes, rhs: ProtobufUnittest_TestAllTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypes, rhs: Proto2Unittest_TestAllTypes) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -11175,7 +11207,7 @@ extension ProtobufUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._M
   }
 }
 
-extension ProtobufUnittest_TestAllTypes.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllTypes.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1: .same(proto: "NEG"),
     1: .same(proto: "FOO"),
@@ -11184,8 +11216,8 @@ extension ProtobufUnittest_TestAllTypes.NestedEnum: SwiftProtobuf._ProtoNameProv
   ]
 }
 
-extension ProtobufUnittest_TestAllTypes.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypes.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestAllTypes.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypes.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bb"),
   ]
@@ -11213,15 +11245,15 @@ extension ProtobufUnittest_TestAllTypes.NestedMessage: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypes.NestedMessage, rhs: ProtobufUnittest_TestAllTypes.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypes.NestedMessage, rhs: Proto2Unittest_TestAllTypes.NestedMessage) -> Bool {
     if lhs._bb != rhs._bb {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestAllTypes.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypes.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestAllTypes.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypes.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
   ]
@@ -11249,15 +11281,15 @@ extension ProtobufUnittest_TestAllTypes.OptionalGroup: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypes.OptionalGroup, rhs: ProtobufUnittest_TestAllTypes.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypes.OptionalGroup, rhs: Proto2Unittest_TestAllTypes.OptionalGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestAllTypes.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypes.protoMessageName + ".RepeatedGroup"
+extension Proto2Unittest_TestAllTypes.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypes.protoMessageName + ".RepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     47: .same(proto: "a"),
   ]
@@ -11285,14 +11317,14 @@ extension ProtobufUnittest_TestAllTypes.RepeatedGroup: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypes.RepeatedGroup, rhs: ProtobufUnittest_TestAllTypes.RepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypes.RepeatedGroup, rhs: Proto2Unittest_TestAllTypes.RepeatedGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NestedTestAllTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "child"),
@@ -11303,11 +11335,11 @@ extension ProtobufUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProto
   ]
 
   fileprivate class _StorageClass {
-    var _child: ProtobufUnittest_NestedTestAllTypes? = nil
-    var _payload: ProtobufUnittest_TestAllTypes? = nil
-    var _repeatedChild: [ProtobufUnittest_NestedTestAllTypes] = []
-    var _lazyChild: ProtobufUnittest_NestedTestAllTypes? = nil
-    var _eagerChild: ProtobufUnittest_TestAllTypes? = nil
+    var _child: Proto2Unittest_NestedTestAllTypes? = nil
+    var _payload: Proto2Unittest_TestAllTypes? = nil
+    var _repeatedChild: [Proto2Unittest_NestedTestAllTypes] = []
+    var _lazyChild: Proto2Unittest_NestedTestAllTypes? = nil
+    var _eagerChild: Proto2Unittest_TestAllTypes? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -11381,7 +11413,7 @@ extension ProtobufUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NestedTestAllTypes, rhs: ProtobufUnittest_NestedTestAllTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_NestedTestAllTypes, rhs: Proto2Unittest_NestedTestAllTypes) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -11400,7 +11432,7 @@ extension ProtobufUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestDeprecatedFields"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "deprecated_int32"),
@@ -11413,9 +11445,9 @@ extension ProtobufUnittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftPro
   fileprivate class _StorageClass {
     var _deprecatedInt32: Int32? = nil
     var _deprecatedRepeatedString: [String] = []
-    var _deprecatedMessage: ProtobufUnittest_TestAllTypes.NestedMessage? = nil
-    var _oneofFields: ProtobufUnittest_TestDeprecatedFields.OneOf_OneofFields?
-    var _nested: ProtobufUnittest_TestDeprecatedFields? = nil
+    var _deprecatedMessage: Proto2Unittest_TestAllTypes.NestedMessage? = nil
+    var _oneofFields: Proto2Unittest_TestDeprecatedFields.OneOf_OneofFields?
+    var _nested: Proto2Unittest_TestDeprecatedFields? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -11496,7 +11528,7 @@ extension ProtobufUnittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDeprecatedFields, rhs: ProtobufUnittest_TestDeprecatedFields) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDeprecatedFields, rhs: Proto2Unittest_TestDeprecatedFields) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -11515,7 +11547,7 @@ extension ProtobufUnittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestDeprecatedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDeprecatedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestDeprecatedMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -11528,13 +11560,13 @@ extension ProtobufUnittest_TestDeprecatedMessage: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDeprecatedMessage, rhs: ProtobufUnittest_TestDeprecatedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDeprecatedMessage, rhs: Proto2Unittest_TestDeprecatedMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "c"),
@@ -11568,7 +11600,7 @@ extension ProtobufUnittest_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ForeignMessage, rhs: ProtobufUnittest_ForeignMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_ForeignMessage, rhs: Proto2Unittest_ForeignMessage) -> Bool {
     if lhs._c != rhs._c {return false}
     if lhs._d != rhs._d {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -11576,7 +11608,7 @@ extension ProtobufUnittest_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_TestReservedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestReservedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestReservedFields"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -11589,13 +11621,13 @@ extension ProtobufUnittest_TestReservedFields: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestReservedFields, rhs: ProtobufUnittest_TestReservedFields) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestReservedFields, rhs: Proto2Unittest_TestReservedFields) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestAllExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllExtensions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -11607,7 +11639,7 @@ extension ProtobufUnittest_TestAllExtensions: SwiftProtobuf.Message, SwiftProtob
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestAllExtensions.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestAllExtensions.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -11617,14 +11649,14 @@ extension ProtobufUnittest_TestAllExtensions: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllExtensions, rhs: ProtobufUnittest_TestAllExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllExtensions, rhs: Proto2Unittest_TestAllExtensions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OptionalGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OptionalGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OptionalGroup_extension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
@@ -11653,14 +11685,14 @@ extension ProtobufUnittest_OptionalGroup_extension: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OptionalGroup_extension, rhs: ProtobufUnittest_OptionalGroup_extension) -> Bool {
+  static func ==(lhs: Proto2Unittest_OptionalGroup_extension, rhs: Proto2Unittest_OptionalGroup_extension) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_RepeatedGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RepeatedGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RepeatedGroup_extension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     47: .same(proto: "a"),
@@ -11689,14 +11721,14 @@ extension ProtobufUnittest_RepeatedGroup_extension: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RepeatedGroup_extension, rhs: ProtobufUnittest_RepeatedGroup_extension) -> Bool {
+  static func ==(lhs: Proto2Unittest_RepeatedGroup_extension, rhs: Proto2Unittest_RepeatedGroup_extension) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMixedFieldsAndExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMixedFieldsAndExtensions"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -11717,7 +11749,7 @@ extension ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.Message,
       case 1: try { try decoder.decodeSingularInt32Field(value: &self._a) }()
       case 3: try { try decoder.decodeRepeatedFixed32Field(value: &self.b) }()
       case 2, 4:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestMixedFieldsAndExtensions.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestMixedFieldsAndExtensions.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -11739,7 +11771,7 @@ extension ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMixedFieldsAndExtensions, rhs: ProtobufUnittest_TestMixedFieldsAndExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMixedFieldsAndExtensions, rhs: Proto2Unittest_TestMixedFieldsAndExtensions) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.b != rhs.b {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -11748,7 +11780,7 @@ extension ProtobufUnittest_TestMixedFieldsAndExtensions: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     16: .same(proto: "optionalgroup"),
@@ -11783,7 +11815,7 @@ extension ProtobufUnittest_TestGroup: SwiftProtobuf.Message, SwiftProtobuf._Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestGroup, rhs: ProtobufUnittest_TestGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestGroup, rhs: Proto2Unittest_TestGroup) -> Bool {
     if lhs._optionalGroup != rhs._optionalGroup {return false}
     if lhs._optionalForeignEnum != rhs._optionalForeignEnum {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -11791,8 +11823,8 @@ extension ProtobufUnittest_TestGroup: SwiftProtobuf.Message, SwiftProtobuf._Mess
   }
 }
 
-extension ProtobufUnittest_TestGroup.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestGroup.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestGroup.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestGroup.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
     89: .same(proto: "zz"),
@@ -11825,7 +11857,7 @@ extension ProtobufUnittest_TestGroup.OptionalGroup: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestGroup.OptionalGroup, rhs: ProtobufUnittest_TestGroup.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestGroup.OptionalGroup, rhs: Proto2Unittest_TestGroup.OptionalGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._zz != rhs._zz {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -11833,7 +11865,7 @@ extension ProtobufUnittest_TestGroup.OptionalGroup: SwiftProtobuf.Message, Swift
   }
 }
 
-extension ProtobufUnittest_TestGroupExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestGroupExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestGroupExtension"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -11845,7 +11877,7 @@ extension ProtobufUnittest_TestGroupExtension: SwiftProtobuf.Message, SwiftProto
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestGroupExtension.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestGroupExtension.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -11855,14 +11887,14 @@ extension ProtobufUnittest_TestGroupExtension: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestGroupExtension, rhs: ProtobufUnittest_TestGroupExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestGroupExtension, rhs: Proto2Unittest_TestGroupExtension) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedExtension"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -11875,14 +11907,14 @@ extension ProtobufUnittest_TestNestedExtension: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedExtension, rhs: ProtobufUnittest_TestNestedExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedExtension, rhs: Proto2Unittest_TestNestedExtension) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedExtension.OptionalGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestNestedExtension.protoMessageName + ".OptionalGroup_extension"
+extension Proto2Unittest_TestNestedExtension.OptionalGroup_extension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestNestedExtension.protoMessageName + ".OptionalGroup_extension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
   ]
@@ -11910,14 +11942,14 @@ extension ProtobufUnittest_TestNestedExtension.OptionalGroup_extension: SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedExtension.OptionalGroup_extension, rhs: ProtobufUnittest_TestNestedExtension.OptionalGroup_extension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedExtension.OptionalGroup_extension, rhs: Proto2Unittest_TestNestedExtension.OptionalGroup_extension) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestChildExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestChildExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestChildExtension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -11961,7 +11993,7 @@ extension ProtobufUnittest_TestChildExtension: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestChildExtension, rhs: ProtobufUnittest_TestChildExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestChildExtension, rhs: Proto2Unittest_TestChildExtension) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs._optionalExtension != rhs._optionalExtension {return false}
@@ -11970,7 +12002,7 @@ extension ProtobufUnittest_TestChildExtension: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestChildExtensionData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestChildExtensionData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestChildExtensionData"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -12009,7 +12041,7 @@ extension ProtobufUnittest_TestChildExtensionData: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestChildExtensionData, rhs: ProtobufUnittest_TestChildExtensionData) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestChildExtensionData, rhs: Proto2Unittest_TestChildExtensionData) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs._optionalExtension != rhs._optionalExtension {return false}
@@ -12018,8 +12050,8 @@ extension ProtobufUnittest_TestChildExtensionData: SwiftProtobuf.Message, SwiftP
   }
 }
 
-extension ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestChildExtensionData.protoMessageName + ".NestedTestAllExtensionsData"
+extension Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestChildExtensionData.protoMessageName + ".NestedTestAllExtensionsData"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     409707008: .same(proto: "dynamic"),
   ]
@@ -12047,15 +12079,15 @@ extension ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData: S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData, rhs: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData, rhs: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData) -> Bool {
     if lhs._dynamic != rhs._dynamic {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.protoMessageName + ".NestedDynamicExtensions"
+extension Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.protoMessageName + ".NestedDynamicExtensions"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
     2: .same(proto: "b"),
@@ -12088,7 +12120,7 @@ extension ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.Ne
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions, rhs: ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions, rhs: Proto2Unittest_TestChildExtensionData.NestedTestAllExtensionsData.NestedDynamicExtensions) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12096,7 +12128,7 @@ extension ProtobufUnittest_TestChildExtensionData.NestedTestAllExtensionsData.Ne
   }
 }
 
-extension ProtobufUnittest_TestNestedChildExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedChildExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedChildExtension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -12135,7 +12167,7 @@ extension ProtobufUnittest_TestNestedChildExtension: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedChildExtension, rhs: ProtobufUnittest_TestNestedChildExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedChildExtension, rhs: Proto2Unittest_TestNestedChildExtension) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._child != rhs._child {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12143,7 +12175,7 @@ extension ProtobufUnittest_TestNestedChildExtension: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestNestedChildExtensionData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedChildExtensionData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedChildExtensionData"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -12177,7 +12209,7 @@ extension ProtobufUnittest_TestNestedChildExtensionData: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedChildExtensionData, rhs: ProtobufUnittest_TestNestedChildExtensionData) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedChildExtensionData, rhs: Proto2Unittest_TestNestedChildExtensionData) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._child != rhs._child {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12185,7 +12217,7 @@ extension ProtobufUnittest_TestNestedChildExtensionData: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestRequiredEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredEnum"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_enum"),
@@ -12224,7 +12256,7 @@ extension ProtobufUnittest_TestRequiredEnum: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredEnum, rhs: ProtobufUnittest_TestRequiredEnum) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredEnum, rhs: Proto2Unittest_TestRequiredEnum) -> Bool {
     if lhs._requiredEnum != rhs._requiredEnum {return false}
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12232,7 +12264,7 @@ extension ProtobufUnittest_TestRequiredEnum: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_TestRequiredOpenEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredOpenEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredOpenEnum"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_enum"),
@@ -12271,7 +12303,7 @@ extension ProtobufUnittest_TestRequiredOpenEnum: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredOpenEnum, rhs: ProtobufUnittest_TestRequiredOpenEnum) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredOpenEnum, rhs: Proto2Unittest_TestRequiredOpenEnum) -> Bool {
     if lhs._requiredEnum != rhs._requiredEnum {return false}
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12279,7 +12311,7 @@ extension ProtobufUnittest_TestRequiredOpenEnum: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestRequiredEnumNoMask: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredEnumNoMask: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredEnumNoMask"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_enum"),
@@ -12318,7 +12350,7 @@ extension ProtobufUnittest_TestRequiredEnumNoMask: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredEnumNoMask, rhs: ProtobufUnittest_TestRequiredEnumNoMask) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredEnumNoMask, rhs: Proto2Unittest_TestRequiredEnumNoMask) -> Bool {
     if lhs._requiredEnum != rhs._requiredEnum {return false}
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -12326,7 +12358,7 @@ extension ProtobufUnittest_TestRequiredEnumNoMask: SwiftProtobuf.Message, SwiftP
   }
 }
 
-extension ProtobufUnittest_TestRequiredEnumNoMask.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredEnumNoMask.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1: .same(proto: "BAZ"),
     0: .same(proto: "UNSPECIFIED"),
@@ -12335,7 +12367,7 @@ extension ProtobufUnittest_TestRequiredEnumNoMask.NestedEnum: SwiftProtobuf._Pro
   ]
 }
 
-extension ProtobufUnittest_TestRequiredEnumMulti: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredEnumMulti: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredEnumMulti"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     4: .standard(proto: "required_enum_4"),
@@ -12386,7 +12418,7 @@ extension ProtobufUnittest_TestRequiredEnumMulti: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredEnumMulti, rhs: ProtobufUnittest_TestRequiredEnumMulti) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredEnumMulti, rhs: Proto2Unittest_TestRequiredEnumMulti) -> Bool {
     if lhs._requiredEnum4 != rhs._requiredEnum4 {return false}
     if lhs._a3 != rhs._a3 {return false}
     if lhs._requiredEnum2 != rhs._requiredEnum2 {return false}
@@ -12396,7 +12428,7 @@ extension ProtobufUnittest_TestRequiredEnumMulti: SwiftProtobuf.Message, SwiftPr
   }
 }
 
-extension ProtobufUnittest_TestRequiredEnumMulti.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredEnumMulti.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNSPECIFIED"),
     1: .same(proto: "FOO"),
@@ -12405,7 +12437,7 @@ extension ProtobufUnittest_TestRequiredEnumMulti.NestedEnum: SwiftProtobuf._Prot
   ]
 }
 
-extension ProtobufUnittest_TestRequiredNoMaskMulti: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredNoMaskMulti: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredNoMaskMulti"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     80: .standard(proto: "required_fixed32_80"),
@@ -12474,7 +12506,7 @@ extension ProtobufUnittest_TestRequiredNoMaskMulti: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredNoMaskMulti, rhs: ProtobufUnittest_TestRequiredNoMaskMulti) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredNoMaskMulti, rhs: Proto2Unittest_TestRequiredNoMaskMulti) -> Bool {
     if lhs._requiredFixed3280 != rhs._requiredFixed3280 {return false}
     if lhs._requiredFixed3270 != rhs._requiredFixed3270 {return false}
     if lhs._requiredEnum64 != rhs._requiredEnum64 {return false}
@@ -12487,7 +12519,7 @@ extension ProtobufUnittest_TestRequiredNoMaskMulti: SwiftProtobuf.Message, Swift
   }
 }
 
-extension ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredNoMaskMulti.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNSPECIFIED"),
     1: .same(proto: "FOO"),
@@ -12496,7 +12528,7 @@ extension ProtobufUnittest_TestRequiredNoMaskMulti.NestedEnum: SwiftProtobuf._Pr
   ]
 }
 
-extension ProtobufUnittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequired"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -12569,7 +12601,7 @@ extension ProtobufUnittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._M
     var _dummy31: Int32? = nil
     var _dummy32: Int32? = nil
     var _c: Int32? = nil
-    var _optionalForeign: ProtobufUnittest_ForeignMessage? = nil
+    var _optionalForeign: Proto2Unittest_ForeignMessage? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -12797,7 +12829,7 @@ extension ProtobufUnittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequired, rhs: ProtobufUnittest_TestRequired) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequired, rhs: Proto2Unittest_TestRequired) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -12845,7 +12877,7 @@ extension ProtobufUnittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._M
   }
 }
 
-extension ProtobufUnittest_TestRequiredForeign: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredForeign: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredForeign"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_message"),
@@ -12895,7 +12927,7 @@ extension ProtobufUnittest_TestRequiredForeign: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredForeign, rhs: ProtobufUnittest_TestRequiredForeign) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredForeign, rhs: Proto2Unittest_TestRequiredForeign) -> Bool {
     if lhs._optionalMessage != rhs._optionalMessage {return false}
     if lhs.repeatedMessage != rhs.repeatedMessage {return false}
     if lhs._dummy != rhs._dummy {return false}
@@ -12905,7 +12937,7 @@ extension ProtobufUnittest_TestRequiredForeign: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestRequiredMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_message"),
@@ -12952,7 +12984,7 @@ extension ProtobufUnittest_TestRequiredMessage: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredMessage, rhs: ProtobufUnittest_TestRequiredMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredMessage, rhs: Proto2Unittest_TestRequiredMessage) -> Bool {
     if lhs._optionalMessage != rhs._optionalMessage {return false}
     if lhs.repeatedMessage != rhs.repeatedMessage {return false}
     if lhs._requiredMessage != rhs._requiredMessage {return false}
@@ -12961,7 +12993,7 @@ extension ProtobufUnittest_TestRequiredMessage: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestNestedRequiredForeign: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedRequiredForeign: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedRequiredForeign"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "child"),
@@ -12974,13 +13006,13 @@ extension ProtobufUnittest_TestNestedRequiredForeign: SwiftProtobuf.Message, Swi
   ]
 
   fileprivate class _StorageClass {
-    var _child: ProtobufUnittest_TestNestedRequiredForeign? = nil
-    var _payload: ProtobufUnittest_TestRequiredForeign? = nil
+    var _child: Proto2Unittest_TestNestedRequiredForeign? = nil
+    var _payload: Proto2Unittest_TestRequiredForeign? = nil
     var _dummy: Int32? = nil
-    var _requiredEnum: ProtobufUnittest_TestRequiredEnum? = nil
-    var _requiredEnumNoMask: ProtobufUnittest_TestRequiredEnumNoMask? = nil
-    var _requiredEnumMulti: ProtobufUnittest_TestRequiredEnumMulti? = nil
-    var _requiredNoMask: ProtobufUnittest_TestRequiredNoMaskMulti? = nil
+    var _requiredEnum: Proto2Unittest_TestRequiredEnum? = nil
+    var _requiredEnumNoMask: Proto2Unittest_TestRequiredEnumNoMask? = nil
+    var _requiredEnumMulti: Proto2Unittest_TestRequiredEnumMulti? = nil
+    var _requiredNoMask: Proto2Unittest_TestRequiredNoMaskMulti? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -13076,7 +13108,7 @@ extension ProtobufUnittest_TestNestedRequiredForeign: SwiftProtobuf.Message, Swi
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedRequiredForeign, rhs: ProtobufUnittest_TestNestedRequiredForeign) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedRequiredForeign, rhs: Proto2Unittest_TestNestedRequiredForeign) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13097,7 +13129,7 @@ extension ProtobufUnittest_TestNestedRequiredForeign: SwiftProtobuf.Message, Swi
   }
 }
 
-extension ProtobufUnittest_TestForeignNested: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestForeignNested: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestForeignNested"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foreign_nested"),
@@ -13126,14 +13158,14 @@ extension ProtobufUnittest_TestForeignNested: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestForeignNested, rhs: ProtobufUnittest_TestForeignNested) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestForeignNested, rhs: Proto2Unittest_TestForeignNested) -> Bool {
     if lhs._foreignNested != rhs._foreignNested {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEmptyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEmptyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEmptyMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -13146,13 +13178,13 @@ extension ProtobufUnittest_TestEmptyMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEmptyMessage, rhs: ProtobufUnittest_TestEmptyMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEmptyMessage, rhs: Proto2Unittest_TestEmptyMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEmptyMessageWithExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEmptyMessageWithExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEmptyMessageWithExtensions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -13164,7 +13196,7 @@ extension ProtobufUnittest_TestEmptyMessageWithExtensions: SwiftProtobuf.Message
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestEmptyMessageWithExtensions.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestEmptyMessageWithExtensions.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -13174,14 +13206,14 @@ extension ProtobufUnittest_TestEmptyMessageWithExtensions: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEmptyMessageWithExtensions, rhs: ProtobufUnittest_TestEmptyMessageWithExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEmptyMessageWithExtensions, rhs: Proto2Unittest_TestEmptyMessageWithExtensions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPickleNestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPickleNestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPickleNestedMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -13194,14 +13226,14 @@ extension ProtobufUnittest_TestPickleNestedMessage: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPickleNestedMessage, rhs: ProtobufUnittest_TestPickleNestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPickleNestedMessage, rhs: Proto2Unittest_TestPickleNestedMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPickleNestedMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestPickleNestedMessage.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestPickleNestedMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestPickleNestedMessage.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bb"),
   ]
@@ -13229,15 +13261,15 @@ extension ProtobufUnittest_TestPickleNestedMessage.NestedMessage: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPickleNestedMessage.NestedMessage, rhs: ProtobufUnittest_TestPickleNestedMessage.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPickleNestedMessage.NestedMessage, rhs: Proto2Unittest_TestPickleNestedMessage.NestedMessage) -> Bool {
     if lhs._bb != rhs._bb {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestPickleNestedMessage.NestedMessage.protoMessageName + ".NestedNestedMessage"
+extension Proto2Unittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestPickleNestedMessage.NestedMessage.protoMessageName + ".NestedNestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "cc"),
   ]
@@ -13265,14 +13297,14 @@ extension ProtobufUnittest_TestPickleNestedMessage.NestedMessage.NestedNestedMes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage, rhs: ProtobufUnittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage, rhs: Proto2Unittest_TestPickleNestedMessage.NestedMessage.NestedNestedMessage) -> Bool {
     if lhs._cc != rhs._cc {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMultipleExtensionRanges: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMultipleExtensionRanges: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMultipleExtensionRanges"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -13284,7 +13316,7 @@ extension ProtobufUnittest_TestMultipleExtensionRanges: SwiftProtobuf.Message, S
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (42 == fieldNumber) || (4143 <= fieldNumber && fieldNumber < 4244) || (65536 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestMultipleExtensionRanges.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestMultipleExtensionRanges.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -13294,14 +13326,14 @@ extension ProtobufUnittest_TestMultipleExtensionRanges: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMultipleExtensionRanges, rhs: ProtobufUnittest_TestMultipleExtensionRanges) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMultipleExtensionRanges, rhs: Proto2Unittest_TestMultipleExtensionRanges) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestReallyLargeTagNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestReallyLargeTagNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestReallyLargeTagNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -13335,7 +13367,7 @@ extension ProtobufUnittest_TestReallyLargeTagNumber: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestReallyLargeTagNumber, rhs: ProtobufUnittest_TestReallyLargeTagNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestReallyLargeTagNumber, rhs: Proto2Unittest_TestReallyLargeTagNumber) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._bb != rhs._bb {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -13343,7 +13375,7 @@ extension ProtobufUnittest_TestReallyLargeTagNumber: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRecursiveMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -13351,7 +13383,7 @@ extension ProtobufUnittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPro
   ]
 
   fileprivate class _StorageClass {
-    var _a: ProtobufUnittest_TestRecursiveMessage? = nil
+    var _a: Proto2Unittest_TestRecursiveMessage? = nil
     var _i: Int32? = nil
 
     #if swift(>=5.10)
@@ -13411,7 +13443,7 @@ extension ProtobufUnittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRecursiveMessage, rhs: ProtobufUnittest_TestRecursiveMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRecursiveMessage, rhs: Proto2Unittest_TestRecursiveMessage) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13427,7 +13459,7 @@ extension ProtobufUnittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMutualRecursionA"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bb"),
@@ -13438,9 +13470,9 @@ extension ProtobufUnittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftPro
   ]
 
   fileprivate class _StorageClass {
-    var _bb: ProtobufUnittest_TestMutualRecursionB? = nil
-    var _subGroup: ProtobufUnittest_TestMutualRecursionA.SubGroup? = nil
-    var _subGroupR: [ProtobufUnittest_TestMutualRecursionA.SubGroupR] = []
+    var _bb: Proto2Unittest_TestMutualRecursionB? = nil
+    var _subGroup: Proto2Unittest_TestMutualRecursionA.SubGroup? = nil
+    var _subGroupR: [Proto2Unittest_TestMutualRecursionA.SubGroupR] = []
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -13504,7 +13536,7 @@ extension ProtobufUnittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMutualRecursionA, rhs: ProtobufUnittest_TestMutualRecursionA) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMutualRecursionA, rhs: Proto2Unittest_TestMutualRecursionA) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13521,14 +13553,14 @@ extension ProtobufUnittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestMutualRecursionA.protoMessageName + ".SubMessage"
+extension Proto2Unittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestMutualRecursionA.protoMessageName + ".SubMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "b"),
   ]
 
   fileprivate class _StorageClass {
-    var _b: ProtobufUnittest_TestMutualRecursionB? = nil
+    var _b: Proto2Unittest_TestMutualRecursionB? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -13582,7 +13614,7 @@ extension ProtobufUnittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMutualRecursionA.SubMessage, rhs: ProtobufUnittest_TestMutualRecursionA.SubMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMutualRecursionA.SubMessage, rhs: Proto2Unittest_TestMutualRecursionA.SubMessage) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13597,16 +13629,16 @@ extension ProtobufUnittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Messag
   }
 }
 
-extension ProtobufUnittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestMutualRecursionA.protoMessageName + ".SubGroup"
+extension Proto2Unittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestMutualRecursionA.protoMessageName + ".SubGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     3: .standard(proto: "sub_message"),
     4: .standard(proto: "not_in_this_scc"),
   ]
 
   fileprivate class _StorageClass {
-    var _subMessage: ProtobufUnittest_TestMutualRecursionA.SubMessage? = nil
-    var _notInThisScc: ProtobufUnittest_TestAllTypes? = nil
+    var _subMessage: Proto2Unittest_TestMutualRecursionA.SubMessage? = nil
+    var _notInThisScc: Proto2Unittest_TestAllTypes? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -13665,7 +13697,7 @@ extension ProtobufUnittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMutualRecursionA.SubGroup, rhs: ProtobufUnittest_TestMutualRecursionA.SubGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMutualRecursionA.SubGroup, rhs: Proto2Unittest_TestMutualRecursionA.SubGroup) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13681,8 +13713,8 @@ extension ProtobufUnittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestMutualRecursionA.SubGroupR: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestMutualRecursionA.protoMessageName + ".SubGroupR"
+extension Proto2Unittest_TestMutualRecursionA.SubGroupR: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestMutualRecursionA.protoMessageName + ".SubGroupR"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     6: .same(proto: "payload"),
   ]
@@ -13710,14 +13742,14 @@ extension ProtobufUnittest_TestMutualRecursionA.SubGroupR: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMutualRecursionA.SubGroupR, rhs: ProtobufUnittest_TestMutualRecursionA.SubGroupR) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMutualRecursionA.SubGroupR, rhs: Proto2Unittest_TestMutualRecursionA.SubGroupR) -> Bool {
     if lhs._payload != rhs._payload {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMutualRecursionB"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -13725,7 +13757,7 @@ extension ProtobufUnittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftPro
   ]
 
   fileprivate class _StorageClass {
-    var _a: ProtobufUnittest_TestMutualRecursionA? = nil
+    var _a: Proto2Unittest_TestMutualRecursionA? = nil
     var _optionalInt32: Int32? = nil
 
     #if swift(>=5.10)
@@ -13785,7 +13817,7 @@ extension ProtobufUnittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMutualRecursionB, rhs: ProtobufUnittest_TestMutualRecursionB) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMutualRecursionB, rhs: Proto2Unittest_TestMutualRecursionB) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -13801,7 +13833,7 @@ extension ProtobufUnittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestIsInitialized: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestIsInitialized: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestIsInitialized"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "sub_message"),
@@ -13835,15 +13867,15 @@ extension ProtobufUnittest_TestIsInitialized: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestIsInitialized, rhs: ProtobufUnittest_TestIsInitialized) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestIsInitialized, rhs: Proto2Unittest_TestIsInitialized) -> Bool {
     if lhs._subMessage != rhs._subMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestIsInitialized.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestIsInitialized.protoMessageName + ".SubMessage"
+extension Proto2Unittest_TestIsInitialized.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestIsInitialized.protoMessageName + ".SubMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "subgroup"),
     1: .unique(proto: "SubGroup", json: "subgroup"),
@@ -13877,15 +13909,15 @@ extension ProtobufUnittest_TestIsInitialized.SubMessage: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestIsInitialized.SubMessage, rhs: ProtobufUnittest_TestIsInitialized.SubMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestIsInitialized.SubMessage, rhs: Proto2Unittest_TestIsInitialized.SubMessage) -> Bool {
     if lhs._subGroup != rhs._subGroup {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestIsInitialized.SubMessage.protoMessageName + ".SubGroup"
+extension Proto2Unittest_TestIsInitialized.SubMessage.SubGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestIsInitialized.SubMessage.protoMessageName + ".SubGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2: .same(proto: "i"),
   ]
@@ -13918,14 +13950,14 @@ extension ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup, rhs: ProtobufUnittest_TestIsInitialized.SubMessage.SubGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestIsInitialized.SubMessage.SubGroup, rhs: Proto2Unittest_TestIsInitialized.SubMessage.SubGroup) -> Bool {
     if lhs._i != rhs._i {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestDupFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDupFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestDupFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -13966,7 +13998,7 @@ extension ProtobufUnittest_TestDupFieldNumber: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDupFieldNumber, rhs: ProtobufUnittest_TestDupFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDupFieldNumber, rhs: Proto2Unittest_TestDupFieldNumber) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._foo != rhs._foo {return false}
     if lhs._bar != rhs._bar {return false}
@@ -13975,8 +14007,8 @@ extension ProtobufUnittest_TestDupFieldNumber: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestDupFieldNumber.Foo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestDupFieldNumber.protoMessageName + ".Foo"
+extension Proto2Unittest_TestDupFieldNumber.Foo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestDupFieldNumber.protoMessageName + ".Foo"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
   ]
@@ -14004,15 +14036,15 @@ extension ProtobufUnittest_TestDupFieldNumber.Foo: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDupFieldNumber.Foo, rhs: ProtobufUnittest_TestDupFieldNumber.Foo) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDupFieldNumber.Foo, rhs: Proto2Unittest_TestDupFieldNumber.Foo) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestDupFieldNumber.Bar: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestDupFieldNumber.protoMessageName + ".Bar"
+extension Proto2Unittest_TestDupFieldNumber.Bar: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestDupFieldNumber.protoMessageName + ".Bar"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
   ]
@@ -14040,14 +14072,14 @@ extension ProtobufUnittest_TestDupFieldNumber.Bar: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDupFieldNumber.Bar, rhs: ProtobufUnittest_TestDupFieldNumber.Bar) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDupFieldNumber.Bar, rhs: Proto2Unittest_TestDupFieldNumber.Bar) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEagerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEagerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEagerMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "sub_message"),
@@ -14076,14 +14108,14 @@ extension ProtobufUnittest_TestEagerMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEagerMessage, rhs: ProtobufUnittest_TestEagerMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEagerMessage, rhs: Proto2Unittest_TestEagerMessage) -> Bool {
     if lhs._subMessage != rhs._subMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestLazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestLazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestLazyMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "sub_message"),
@@ -14112,14 +14144,14 @@ extension ProtobufUnittest_TestLazyMessage: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestLazyMessage, rhs: ProtobufUnittest_TestLazyMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestLazyMessage, rhs: Proto2Unittest_TestLazyMessage) -> Bool {
     if lhs._subMessage != rhs._subMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestLazyMessageRepeated: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestLazyMessageRepeated: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestLazyMessageRepeated"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "repeated_message"),
@@ -14144,14 +14176,14 @@ extension ProtobufUnittest_TestLazyMessageRepeated: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestLazyMessageRepeated, rhs: ProtobufUnittest_TestLazyMessageRepeated) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestLazyMessageRepeated, rhs: Proto2Unittest_TestLazyMessageRepeated) -> Bool {
     if lhs.repeatedMessage != rhs.repeatedMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEagerMaybeLazy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEagerMaybeLazy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEagerMaybeLazy"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "message_foo"),
@@ -14190,7 +14222,7 @@ extension ProtobufUnittest_TestEagerMaybeLazy: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEagerMaybeLazy, rhs: ProtobufUnittest_TestEagerMaybeLazy) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEagerMaybeLazy, rhs: Proto2Unittest_TestEagerMaybeLazy) -> Bool {
     if lhs._messageFoo != rhs._messageFoo {return false}
     if lhs._messageBar != rhs._messageBar {return false}
     if lhs._messageBaz != rhs._messageBaz {return false}
@@ -14199,8 +14231,8 @@ extension ProtobufUnittest_TestEagerMaybeLazy: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestEagerMaybeLazy.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestEagerMaybeLazy.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestEagerMaybeLazy.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestEagerMaybeLazy.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "packed"),
   ]
@@ -14228,14 +14260,14 @@ extension ProtobufUnittest_TestEagerMaybeLazy.NestedMessage: SwiftProtobuf.Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEagerMaybeLazy.NestedMessage, rhs: ProtobufUnittest_TestEagerMaybeLazy.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEagerMaybeLazy.NestedMessage, rhs: Proto2Unittest_TestEagerMaybeLazy.NestedMessage) -> Bool {
     if lhs._packed != rhs._packed {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedMessageHasBits: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedMessageHasBits: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedMessageHasBits"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_nested_message"),
@@ -14264,15 +14296,15 @@ extension ProtobufUnittest_TestNestedMessageHasBits: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedMessageHasBits, rhs: ProtobufUnittest_TestNestedMessageHasBits) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedMessageHasBits, rhs: Proto2Unittest_TestNestedMessageHasBits) -> Bool {
     if lhs._optionalNestedMessage != rhs._optionalNestedMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedMessageHasBits.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestNestedMessageHasBits.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestNestedMessageHasBits.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestNestedMessageHasBits.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "nestedmessage_repeated_int32"),
     2: .standard(proto: "nestedmessage_repeated_foreignmessage"),
@@ -14301,7 +14333,7 @@ extension ProtobufUnittest_TestNestedMessageHasBits.NestedMessage: SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedMessageHasBits.NestedMessage, rhs: ProtobufUnittest_TestNestedMessageHasBits.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedMessageHasBits.NestedMessage, rhs: Proto2Unittest_TestNestedMessageHasBits.NestedMessage) -> Bool {
     if lhs.nestedmessageRepeatedInt32 != rhs.nestedmessageRepeatedInt32 {return false}
     if lhs.nestedmessageRepeatedForeignmessage != rhs.nestedmessageRepeatedForeignmessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -14309,7 +14341,7 @@ extension ProtobufUnittest_TestNestedMessageHasBits.NestedMessage: SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TestCamelCaseFieldNames: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestCamelCaseFieldNames: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestCamelCaseFieldNames"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "PrimitiveField"),
@@ -14393,7 +14425,7 @@ extension ProtobufUnittest_TestCamelCaseFieldNames: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestCamelCaseFieldNames, rhs: ProtobufUnittest_TestCamelCaseFieldNames) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestCamelCaseFieldNames, rhs: Proto2Unittest_TestCamelCaseFieldNames) -> Bool {
     if lhs._primitiveField != rhs._primitiveField {return false}
     if lhs._stringField != rhs._stringField {return false}
     if lhs._enumField != rhs._enumField {return false}
@@ -14411,7 +14443,7 @@ extension ProtobufUnittest_TestCamelCaseFieldNames: SwiftProtobuf.Message, Swift
   }
 }
 
-extension ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestFieldOrderings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestFieldOrderings"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     11: .standard(proto: "my_string"),
@@ -14436,7 +14468,7 @@ extension ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.Message, SwiftProto
       case 101: try { try decoder.decodeSingularFloatField(value: &self._myFloat) }()
       case 200: try { try decoder.decodeSingularMessageField(value: &self._optionalNestedMessage) }()
       case 2..<11, 12..<101:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestFieldOrderings.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestFieldOrderings.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -14464,7 +14496,7 @@ extension ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestFieldOrderings, rhs: ProtobufUnittest_TestFieldOrderings) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestFieldOrderings, rhs: Proto2Unittest_TestFieldOrderings) -> Bool {
     if lhs._myString != rhs._myString {return false}
     if lhs._myInt != rhs._myInt {return false}
     if lhs._myFloat != rhs._myFloat {return false}
@@ -14475,8 +14507,8 @@ extension ProtobufUnittest_TestFieldOrderings: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestFieldOrderings.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestFieldOrderings.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestFieldOrderings.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestFieldOrderings.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2: .same(proto: "oo"),
     1: .same(proto: "bb"),
@@ -14509,7 +14541,7 @@ extension ProtobufUnittest_TestFieldOrderings.NestedMessage: SwiftProtobuf.Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestFieldOrderings.NestedMessage, rhs: ProtobufUnittest_TestFieldOrderings.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestFieldOrderings.NestedMessage, rhs: Proto2Unittest_TestFieldOrderings.NestedMessage) -> Bool {
     if lhs._oo != rhs._oo {return false}
     if lhs._bb != rhs._bb {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -14517,7 +14549,7 @@ extension ProtobufUnittest_TestFieldOrderings.NestedMessage: SwiftProtobuf.Messa
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionOrderings1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionOrderings1"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "my_string"),
@@ -14546,14 +14578,14 @@ extension ProtobufUnittest_TestExtensionOrderings1: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionOrderings1, rhs: ProtobufUnittest_TestExtensionOrderings1) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionOrderings1, rhs: Proto2Unittest_TestExtensionOrderings1) -> Bool {
     if lhs._myString != rhs._myString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionOrderings2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionOrderings2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "my_string"),
@@ -14582,15 +14614,15 @@ extension ProtobufUnittest_TestExtensionOrderings2: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionOrderings2, rhs: ProtobufUnittest_TestExtensionOrderings2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionOrderings2, rhs: Proto2Unittest_TestExtensionOrderings2) -> Bool {
     if lhs._myString != rhs._myString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestExtensionOrderings2.protoMessageName + ".TestExtensionOrderings3"
+extension Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestExtensionOrderings2.protoMessageName + ".TestExtensionOrderings3"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "my_string"),
   ]
@@ -14618,14 +14650,14 @@ extension ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3: Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3, rhs: ProtobufUnittest_TestExtensionOrderings2.TestExtensionOrderings3) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3, rhs: Proto2Unittest_TestExtensionOrderings2.TestExtensionOrderings3) -> Bool {
     if lhs._myString != rhs._myString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtremeDefaultValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtremeDefaultValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtremeDefaultValues"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "escaped_bytes"),
@@ -14868,7 +14900,7 @@ extension ProtobufUnittest_TestExtremeDefaultValues: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtremeDefaultValues, rhs: ProtobufUnittest_TestExtremeDefaultValues) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtremeDefaultValues, rhs: Proto2Unittest_TestExtremeDefaultValues) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -14909,7 +14941,7 @@ extension ProtobufUnittest_TestExtremeDefaultValues: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_SparseEnumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SparseEnumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SparseEnumMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "sparse_enum"),
@@ -14938,14 +14970,14 @@ extension ProtobufUnittest_SparseEnumMessage: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SparseEnumMessage, rhs: ProtobufUnittest_SparseEnumMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_SparseEnumMessage, rhs: Proto2Unittest_SparseEnumMessage) -> Bool {
     if lhs._sparseEnum != rhs._sparseEnum {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OneString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OneString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OneString"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -14974,14 +15006,14 @@ extension ProtobufUnittest_OneString: SwiftProtobuf.Message, SwiftProtobuf._Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OneString, rhs: ProtobufUnittest_OneString) -> Bool {
+  static func ==(lhs: Proto2Unittest_OneString, rhs: Proto2Unittest_OneString) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_MoreString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MoreString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MoreString"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15006,14 +15038,14 @@ extension ProtobufUnittest_MoreString: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MoreString, rhs: ProtobufUnittest_MoreString) -> Bool {
+  static func ==(lhs: Proto2Unittest_MoreString, rhs: Proto2Unittest_MoreString) -> Bool {
     if lhs.data != rhs.data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OneBytes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OneBytes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OneBytes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15042,14 +15074,14 @@ extension ProtobufUnittest_OneBytes: SwiftProtobuf.Message, SwiftProtobuf._Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OneBytes, rhs: ProtobufUnittest_OneBytes) -> Bool {
+  static func ==(lhs: Proto2Unittest_OneBytes, rhs: Proto2Unittest_OneBytes) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_MoreBytes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MoreBytes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MoreBytes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15074,14 +15106,14 @@ extension ProtobufUnittest_MoreBytes: SwiftProtobuf.Message, SwiftProtobuf._Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MoreBytes, rhs: ProtobufUnittest_MoreBytes) -> Bool {
+  static func ==(lhs: Proto2Unittest_MoreBytes, rhs: Proto2Unittest_MoreBytes) -> Bool {
     if lhs.data != rhs.data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ManyOptionalString"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "str1"),
@@ -15359,7 +15391,7 @@ extension ProtobufUnittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ManyOptionalString, rhs: ProtobufUnittest_ManyOptionalString) -> Bool {
+  static func ==(lhs: Proto2Unittest_ManyOptionalString, rhs: Proto2Unittest_ManyOptionalString) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -15405,7 +15437,7 @@ extension ProtobufUnittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_Int32Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Int32Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Int32Message"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15434,14 +15466,14 @@ extension ProtobufUnittest_Int32Message: SwiftProtobuf.Message, SwiftProtobuf._M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Int32Message, rhs: ProtobufUnittest_Int32Message) -> Bool {
+  static func ==(lhs: Proto2Unittest_Int32Message, rhs: Proto2Unittest_Int32Message) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_Uint32Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Uint32Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Uint32Message"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15470,14 +15502,14 @@ extension ProtobufUnittest_Uint32Message: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Uint32Message, rhs: ProtobufUnittest_Uint32Message) -> Bool {
+  static func ==(lhs: Proto2Unittest_Uint32Message, rhs: Proto2Unittest_Uint32Message) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_Int64Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Int64Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Int64Message"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15506,14 +15538,14 @@ extension ProtobufUnittest_Int64Message: SwiftProtobuf.Message, SwiftProtobuf._M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Int64Message, rhs: ProtobufUnittest_Int64Message) -> Bool {
+  static func ==(lhs: Proto2Unittest_Int64Message, rhs: Proto2Unittest_Int64Message) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_Uint64Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Uint64Message: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Uint64Message"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15542,14 +15574,14 @@ extension ProtobufUnittest_Uint64Message: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Uint64Message, rhs: ProtobufUnittest_Uint64Message) -> Bool {
+  static func ==(lhs: Proto2Unittest_Uint64Message, rhs: Proto2Unittest_Uint64Message) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_BoolMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_BoolMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BoolMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "data"),
@@ -15578,14 +15610,14 @@ extension ProtobufUnittest_BoolMessage: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_BoolMessage, rhs: ProtobufUnittest_BoolMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_BoolMessage, rhs: Proto2Unittest_BoolMessage) -> Bool {
     if lhs._data != rhs._data {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOneof"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foo_int"),
@@ -15618,7 +15650,7 @@ extension ProtobufUnittest_TestOneof: SwiftProtobuf.Message, SwiftProtobuf._Mess
         }
       }()
       case 3: try {
-        var v: ProtobufUnittest_TestAllTypes?
+        var v: Proto2Unittest_TestAllTypes?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -15631,7 +15663,7 @@ extension ProtobufUnittest_TestOneof: SwiftProtobuf.Message, SwiftProtobuf._Mess
         }
       }()
       case 4: try {
-        var v: ProtobufUnittest_TestOneof.FooGroup?
+        var v: Proto2Unittest_TestOneof.FooGroup?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -15675,15 +15707,15 @@ extension ProtobufUnittest_TestOneof: SwiftProtobuf.Message, SwiftProtobuf._Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneof, rhs: ProtobufUnittest_TestOneof) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneof, rhs: Proto2Unittest_TestOneof) -> Bool {
     if lhs.foo != rhs.foo {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestOneof.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestOneof.protoMessageName + ".FooGroup"
+extension Proto2Unittest_TestOneof.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestOneof.protoMessageName + ".FooGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     5: .same(proto: "a"),
     6: .same(proto: "b"),
@@ -15716,7 +15748,7 @@ extension ProtobufUnittest_TestOneof.FooGroup: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneof.FooGroup, rhs: ProtobufUnittest_TestOneof.FooGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneof.FooGroup, rhs: Proto2Unittest_TestOneof.FooGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -15724,7 +15756,7 @@ extension ProtobufUnittest_TestOneof.FooGroup: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestOneofBackwardsCompatible: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOneofBackwardsCompatible: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOneofBackwardsCompatible"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foo_int"),
@@ -15769,7 +15801,7 @@ extension ProtobufUnittest_TestOneofBackwardsCompatible: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneofBackwardsCompatible, rhs: ProtobufUnittest_TestOneofBackwardsCompatible) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneofBackwardsCompatible, rhs: Proto2Unittest_TestOneofBackwardsCompatible) -> Bool {
     if lhs._fooInt != rhs._fooInt {return false}
     if lhs._fooString != rhs._fooString {return false}
     if lhs._fooMessage != rhs._fooMessage {return false}
@@ -15779,8 +15811,8 @@ extension ProtobufUnittest_TestOneofBackwardsCompatible: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestOneofBackwardsCompatible.protoMessageName + ".FooGroup"
+extension Proto2Unittest_TestOneofBackwardsCompatible.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestOneofBackwardsCompatible.protoMessageName + ".FooGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     5: .same(proto: "a"),
     6: .same(proto: "b"),
@@ -15813,7 +15845,7 @@ extension ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup, rhs: ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneofBackwardsCompatible.FooGroup, rhs: Proto2Unittest_TestOneofBackwardsCompatible.FooGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -15821,7 +15853,7 @@ extension ProtobufUnittest_TestOneofBackwardsCompatible.FooGroup: SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOneof2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foo_int"),
@@ -15896,7 +15928,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
         }
       }()
       case 6: try {
-        var v: ProtobufUnittest_TestOneof2.NestedEnum?
+        var v: Proto2Unittest_TestOneof2.NestedEnum?
         try decoder.decodeSingularEnumField(value: &v)
         if let v = v {
           if self.foo != nil {try decoder.handleConflictingOneOf()}
@@ -15904,7 +15936,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
         }
       }()
       case 7: try {
-        var v: ProtobufUnittest_TestOneof2.NestedMessage?
+        var v: Proto2Unittest_TestOneof2.NestedMessage?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -15917,7 +15949,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
         }
       }()
       case 8: try {
-        var v: ProtobufUnittest_TestOneof2.FooGroup?
+        var v: Proto2Unittest_TestOneof2.FooGroup?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -15930,7 +15962,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
         }
       }()
       case 11: try {
-        var v: ProtobufUnittest_TestOneof2.NestedMessage?
+        var v: Proto2Unittest_TestOneof2.NestedMessage?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -15983,7 +16015,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
         }
       }()
       case 17: try {
-        var v: ProtobufUnittest_TestOneof2.NestedEnum?
+        var v: Proto2Unittest_TestOneof2.NestedEnum?
         try decoder.decodeSingularEnumField(value: &v)
         if let v = v {
           if self.bar != nil {try decoder.handleConflictingOneOf()}
@@ -16139,7 +16171,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneof2, rhs: ProtobufUnittest_TestOneof2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneof2, rhs: Proto2Unittest_TestOneof2) -> Bool {
     if lhs.foo != rhs.foo {return false}
     if lhs.bar != rhs.bar {return false}
     if lhs._bazInt != rhs._bazInt {return false}
@@ -16149,7 +16181,7 @@ extension ProtobufUnittest_TestOneof2: SwiftProtobuf.Message, SwiftProtobuf._Mes
   }
 }
 
-extension ProtobufUnittest_TestOneof2.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOneof2.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "FOO"),
     2: .same(proto: "BAR"),
@@ -16157,8 +16189,8 @@ extension ProtobufUnittest_TestOneof2.NestedEnum: SwiftProtobuf._ProtoNameProvid
   ]
 }
 
-extension ProtobufUnittest_TestOneof2.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestOneof2.protoMessageName + ".FooGroup"
+extension Proto2Unittest_TestOneof2.FooGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestOneof2.protoMessageName + ".FooGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     9: .same(proto: "a"),
     10: .same(proto: "b"),
@@ -16191,7 +16223,7 @@ extension ProtobufUnittest_TestOneof2.FooGroup: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneof2.FooGroup, rhs: ProtobufUnittest_TestOneof2.FooGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneof2.FooGroup, rhs: Proto2Unittest_TestOneof2.FooGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs._b != rhs._b {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -16199,8 +16231,8 @@ extension ProtobufUnittest_TestOneof2.FooGroup: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestOneof2.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestOneof2.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "moo_int"),
     2: .standard(proto: "corge_int"),
@@ -16210,7 +16242,7 @@ extension ProtobufUnittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, Swif
   fileprivate class _StorageClass {
     var _mooInt: Int64? = nil
     var _corgeInt: [Int32] = []
-    var _child: ProtobufUnittest_TestOneof2.NestedMessage? = nil
+    var _child: Proto2Unittest_TestOneof2.NestedMessage? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -16274,7 +16306,7 @@ extension ProtobufUnittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneof2.NestedMessage, rhs: ProtobufUnittest_TestOneof2.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneof2.NestedMessage, rhs: Proto2Unittest_TestOneof2.NestedMessage) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -16291,7 +16323,7 @@ extension ProtobufUnittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestRequiredOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredOneof"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foo_int"),
@@ -16328,7 +16360,7 @@ extension ProtobufUnittest_TestRequiredOneof: SwiftProtobuf.Message, SwiftProtob
         }
       }()
       case 3: try {
-        var v: ProtobufUnittest_TestRequiredOneof.NestedMessage?
+        var v: Proto2Unittest_TestRequiredOneof.NestedMessage?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -16341,7 +16373,7 @@ extension ProtobufUnittest_TestRequiredOneof: SwiftProtobuf.Message, SwiftProtob
         }
       }()
       case 4: try {
-        var v: ProtobufUnittest_TestRequiredOneof.NestedMessage?
+        var v: Proto2Unittest_TestRequiredOneof.NestedMessage?
         var hadOneofValue = false
         if let current = self.foo {
           hadOneofValue = true
@@ -16385,15 +16417,15 @@ extension ProtobufUnittest_TestRequiredOneof: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredOneof, rhs: ProtobufUnittest_TestRequiredOneof) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredOneof, rhs: Proto2Unittest_TestRequiredOneof) -> Bool {
     if lhs.foo != rhs.foo {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestRequiredOneof.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestRequiredOneof.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestRequiredOneof.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestRequiredOneof.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_double"),
   ]
@@ -16426,14 +16458,14 @@ extension ProtobufUnittest_TestRequiredOneof.NestedMessage: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredOneof.NestedMessage, rhs: ProtobufUnittest_TestRequiredOneof.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredOneof.NestedMessage, rhs: Proto2Unittest_TestRequiredOneof.NestedMessage) -> Bool {
     if lhs._requiredDouble != rhs._requiredDouble {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPackedTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPackedTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     90: .standard(proto: "packed_int32"),
@@ -16523,7 +16555,7 @@ extension ProtobufUnittest_TestPackedTypes: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPackedTypes, rhs: ProtobufUnittest_TestPackedTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPackedTypes, rhs: Proto2Unittest_TestPackedTypes) -> Bool {
     if lhs.packedInt32 != rhs.packedInt32 {return false}
     if lhs.packedInt64 != rhs.packedInt64 {return false}
     if lhs.packedUint32 != rhs.packedUint32 {return false}
@@ -16543,7 +16575,7 @@ extension ProtobufUnittest_TestPackedTypes: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TestUnpackedTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestUnpackedTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestUnpackedTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     90: .standard(proto: "unpacked_int32"),
@@ -16633,7 +16665,7 @@ extension ProtobufUnittest_TestUnpackedTypes: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestUnpackedTypes, rhs: ProtobufUnittest_TestUnpackedTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestUnpackedTypes, rhs: Proto2Unittest_TestUnpackedTypes) -> Bool {
     if lhs.unpackedInt32 != rhs.unpackedInt32 {return false}
     if lhs.unpackedInt64 != rhs.unpackedInt64 {return false}
     if lhs.unpackedUint32 != rhs.unpackedUint32 {return false}
@@ -16653,7 +16685,7 @@ extension ProtobufUnittest_TestUnpackedTypes: SwiftProtobuf.Message, SwiftProtob
   }
 }
 
-extension ProtobufUnittest_TestPackedExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPackedExtensions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -16665,7 +16697,7 @@ extension ProtobufUnittest_TestPackedExtensions: SwiftProtobuf.Message, SwiftPro
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestPackedExtensions.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestPackedExtensions.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -16675,14 +16707,14 @@ extension ProtobufUnittest_TestPackedExtensions: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPackedExtensions, rhs: ProtobufUnittest_TestPackedExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPackedExtensions, rhs: Proto2Unittest_TestPackedExtensions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestUnpackedExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestUnpackedExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestUnpackedExtensions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -16694,7 +16726,7 @@ extension ProtobufUnittest_TestUnpackedExtensions: SwiftProtobuf.Message, SwiftP
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestUnpackedExtensions.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestUnpackedExtensions.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -16704,14 +16736,14 @@ extension ProtobufUnittest_TestUnpackedExtensions: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestUnpackedExtensions, rhs: ProtobufUnittest_TestUnpackedExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestUnpackedExtensions, rhs: Proto2Unittest_TestUnpackedExtensions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestDynamicExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDynamicExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestDynamicExtensions"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2000: .standard(proto: "scalar_extension"),
@@ -16770,7 +16802,7 @@ extension ProtobufUnittest_TestDynamicExtensions: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDynamicExtensions, rhs: ProtobufUnittest_TestDynamicExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDynamicExtensions, rhs: Proto2Unittest_TestDynamicExtensions) -> Bool {
     if lhs._scalarExtension != rhs._scalarExtension {return false}
     if lhs._enumExtension != rhs._enumExtension {return false}
     if lhs._dynamicEnumExtension != rhs._dynamicEnumExtension {return false}
@@ -16783,7 +16815,7 @@ extension ProtobufUnittest_TestDynamicExtensions: SwiftProtobuf.Message, SwiftPr
   }
 }
 
-extension ProtobufUnittest_TestDynamicExtensions.DynamicEnumType: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDynamicExtensions.DynamicEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2200: .same(proto: "DYNAMIC_FOO"),
     2201: .same(proto: "DYNAMIC_BAR"),
@@ -16791,8 +16823,8 @@ extension ProtobufUnittest_TestDynamicExtensions.DynamicEnumType: SwiftProtobuf.
   ]
 }
 
-extension ProtobufUnittest_TestDynamicExtensions.DynamicMessageType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestDynamicExtensions.protoMessageName + ".DynamicMessageType"
+extension Proto2Unittest_TestDynamicExtensions.DynamicMessageType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestDynamicExtensions.protoMessageName + ".DynamicMessageType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2100: .standard(proto: "dynamic_field"),
   ]
@@ -16820,14 +16852,14 @@ extension ProtobufUnittest_TestDynamicExtensions.DynamicMessageType: SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDynamicExtensions.DynamicMessageType, rhs: ProtobufUnittest_TestDynamicExtensions.DynamicMessageType) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDynamicExtensions.DynamicMessageType, rhs: Proto2Unittest_TestDynamicExtensions.DynamicMessageType) -> Bool {
     if lhs._dynamicField != rhs._dynamicField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestRepeatedString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRepeatedString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRepeatedString"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "repeated_string1"),
@@ -16867,7 +16899,7 @@ extension ProtobufUnittest_TestRepeatedString: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRepeatedString, rhs: ProtobufUnittest_TestRepeatedString) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRepeatedString, rhs: Proto2Unittest_TestRepeatedString) -> Bool {
     if lhs.repeatedString1 != rhs.repeatedString1 {return false}
     if lhs.repeatedString2 != rhs.repeatedString2 {return false}
     if lhs.repeatedBytes11 != rhs.repeatedBytes11 {return false}
@@ -16877,7 +16909,7 @@ extension ProtobufUnittest_TestRepeatedString: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestRepeatedScalarDifferentTagSizes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRepeatedScalarDifferentTagSizes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRepeatedScalarDifferentTagSizes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     12: .standard(proto: "repeated_fixed32"),
@@ -16927,7 +16959,7 @@ extension ProtobufUnittest_TestRepeatedScalarDifferentTagSizes: SwiftProtobuf.Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRepeatedScalarDifferentTagSizes, rhs: ProtobufUnittest_TestRepeatedScalarDifferentTagSizes) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRepeatedScalarDifferentTagSizes, rhs: Proto2Unittest_TestRepeatedScalarDifferentTagSizes) -> Bool {
     if lhs.repeatedFixed32 != rhs.repeatedFixed32 {return false}
     if lhs.repeatedInt32 != rhs.repeatedInt32 {return false}
     if lhs.repeatedFixed64 != rhs.repeatedFixed64 {return false}
@@ -16939,7 +16971,7 @@ extension ProtobufUnittest_TestRepeatedScalarDifferentTagSizes: SwiftProtobuf.Me
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestParsingMerge: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestParsingMerge"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_all_types"),
@@ -16969,7 +17001,7 @@ extension ProtobufUnittest_TestParsingMerge: SwiftProtobuf.Message, SwiftProtobu
       case 10: try { try decoder.decodeSingularGroupField(value: &self._optionalGroup) }()
       case 20: try { try decoder.decodeRepeatedGroupField(value: &self.repeatedGroup) }()
       case 1000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestParsingMerge.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestParsingMerge.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -16999,7 +17031,7 @@ extension ProtobufUnittest_TestParsingMerge: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge, rhs: ProtobufUnittest_TestParsingMerge) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge, rhs: Proto2Unittest_TestParsingMerge) -> Bool {
     if lhs._requiredAllTypes != rhs._requiredAllTypes {return false}
     if lhs._optionalAllTypes != rhs._optionalAllTypes {return false}
     if lhs.repeatedAllTypes != rhs.repeatedAllTypes {return false}
@@ -17011,8 +17043,8 @@ extension ProtobufUnittest_TestParsingMerge: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMerge.protoMessageName + ".RepeatedFieldsGenerator"
+extension Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMerge.protoMessageName + ".RepeatedFieldsGenerator"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "field1"),
     2: .same(proto: "field2"),
@@ -17068,7 +17100,7 @@ extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator: SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator, rhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator, rhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator) -> Bool {
     if lhs.field1 != rhs.field1 {return false}
     if lhs.field2 != rhs.field2 {return false}
     if lhs.field3 != rhs.field3 {return false}
@@ -17081,8 +17113,8 @@ extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator: SwiftProtob
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.protoMessageName + ".Group1"
+extension Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.protoMessageName + ".Group1"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     11: .same(proto: "field1"),
   ]
@@ -17110,15 +17142,15 @@ extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group1: Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group1, rhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group1) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group1, rhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group1) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.protoMessageName + ".Group2"
+extension Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.protoMessageName + ".Group2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     21: .same(proto: "field1"),
   ]
@@ -17146,15 +17178,15 @@ extension ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group2: Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group2, rhs: ProtobufUnittest_TestParsingMerge.RepeatedFieldsGenerator.Group2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group2, rhs: Proto2Unittest_TestParsingMerge.RepeatedFieldsGenerator.Group2) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMerge.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestParsingMerge.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMerge.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     11: .standard(proto: "optional_group_all_types"),
   ]
@@ -17182,15 +17214,15 @@ extension ProtobufUnittest_TestParsingMerge.OptionalGroup: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge.OptionalGroup, rhs: ProtobufUnittest_TestParsingMerge.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge.OptionalGroup, rhs: Proto2Unittest_TestParsingMerge.OptionalGroup) -> Bool {
     if lhs._optionalGroupAllTypes != rhs._optionalGroupAllTypes {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMerge.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMerge.protoMessageName + ".RepeatedGroup"
+extension Proto2Unittest_TestParsingMerge.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMerge.protoMessageName + ".RepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     21: .standard(proto: "repeated_group_all_types"),
   ]
@@ -17218,14 +17250,14 @@ extension ProtobufUnittest_TestParsingMerge.RepeatedGroup: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMerge.RepeatedGroup, rhs: ProtobufUnittest_TestParsingMerge.RepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMerge.RepeatedGroup, rhs: Proto2Unittest_TestParsingMerge.RepeatedGroup) -> Bool {
     if lhs._repeatedGroupAllTypes != rhs._repeatedGroupAllTypes {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMergeException: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMergeException: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMergeException"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "all_extensions"),
@@ -17259,14 +17291,14 @@ extension ProtobufUnittest_TestMergeException: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMergeException, rhs: ProtobufUnittest_TestMergeException) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMergeException, rhs: Proto2Unittest_TestMergeException) -> Bool {
     if lhs._allExtensions != rhs._allExtensions {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestCommentInjectionMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestCommentInjectionMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestCommentInjectionMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -17295,14 +17327,14 @@ extension ProtobufUnittest_TestCommentInjectionMessage: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestCommentInjectionMessage, rhs: ProtobufUnittest_TestCommentInjectionMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestCommentInjectionMessage, rhs: Proto2Unittest_TestCommentInjectionMessage) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMessageSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "m1"),
@@ -17356,7 +17388,7 @@ extension ProtobufUnittest_TestMessageSize: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSize, rhs: ProtobufUnittest_TestMessageSize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSize, rhs: Proto2Unittest_TestMessageSize) -> Bool {
     if lhs._m1 != rhs._m1 {return false}
     if lhs._m2 != rhs._m2 {return false}
     if lhs._m3 != rhs._m3 {return false}
@@ -17368,7 +17400,7 @@ extension ProtobufUnittest_TestMessageSize: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_OpenEnumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OpenEnumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OpenEnumMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "opt_open"),
@@ -17412,7 +17444,7 @@ extension ProtobufUnittest_OpenEnumMessage: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OpenEnumMessage, rhs: ProtobufUnittest_OpenEnumMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_OpenEnumMessage, rhs: Proto2Unittest_OpenEnumMessage) -> Bool {
     if lhs._optOpen != rhs._optOpen {return false}
     if lhs._optClosed != rhs._optClosed {return false}
     if lhs.repeatedOpen != rhs.repeatedOpen {return false}
@@ -17422,7 +17454,7 @@ extension ProtobufUnittest_OpenEnumMessage: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_OpenEnumMessage.TestEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OpenEnumMessage.TestEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNKNOWN"),
     1: .same(proto: "FOO"),
@@ -17431,7 +17463,7 @@ extension ProtobufUnittest_OpenEnumMessage.TestEnum: SwiftProtobuf._ProtoNamePro
   ]
 }
 
-extension ProtobufUnittest_TestEagerlyVerifiedLazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEagerlyVerifiedLazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEagerlyVerifiedLazyMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "lazy_message"),
@@ -17460,15 +17492,15 @@ extension ProtobufUnittest_TestEagerlyVerifiedLazyMessage: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEagerlyVerifiedLazyMessage, rhs: ProtobufUnittest_TestEagerlyVerifiedLazyMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEagerlyVerifiedLazyMessage, rhs: Proto2Unittest_TestEagerlyVerifiedLazyMessage) -> Bool {
     if lhs._lazyMessage != rhs._lazyMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestEagerlyVerifiedLazyMessage.protoMessageName + ".LazyMessage"
+extension Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestEagerlyVerifiedLazyMessage.protoMessageName + ".LazyMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "bytes_field"),
   ]
@@ -17496,14 +17528,14 @@ extension ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage: SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage, rhs: ProtobufUnittest_TestEagerlyVerifiedLazyMessage.LazyMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage, rhs: Proto2Unittest_TestEagerlyVerifiedLazyMessage.LazyMessage) -> Bool {
     if lhs._bytesField != rhs._bytesField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_FooRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_FooRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FooRequest"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17516,13 +17548,13 @@ extension ProtobufUnittest_FooRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_FooRequest, rhs: ProtobufUnittest_FooRequest) -> Bool {
+  static func ==(lhs: Proto2Unittest_FooRequest, rhs: Proto2Unittest_FooRequest) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_FooResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_FooResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FooResponse"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17535,13 +17567,13 @@ extension ProtobufUnittest_FooResponse: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_FooResponse, rhs: ProtobufUnittest_FooResponse) -> Bool {
+  static func ==(lhs: Proto2Unittest_FooResponse, rhs: Proto2Unittest_FooResponse) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_FooClientMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_FooClientMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FooClientMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17554,13 +17586,13 @@ extension ProtobufUnittest_FooClientMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_FooClientMessage, rhs: ProtobufUnittest_FooClientMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_FooClientMessage, rhs: Proto2Unittest_FooClientMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_FooServerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_FooServerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FooServerMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17573,13 +17605,13 @@ extension ProtobufUnittest_FooServerMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_FooServerMessage, rhs: ProtobufUnittest_FooServerMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_FooServerMessage, rhs: Proto2Unittest_FooServerMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_BarRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_BarRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BarRequest"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17592,13 +17624,13 @@ extension ProtobufUnittest_BarRequest: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_BarRequest, rhs: ProtobufUnittest_BarRequest) -> Bool {
+  static func ==(lhs: Proto2Unittest_BarRequest, rhs: Proto2Unittest_BarRequest) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_BarResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_BarResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BarResponse"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -17611,13 +17643,13 @@ extension ProtobufUnittest_BarResponse: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_BarResponse, rhs: ProtobufUnittest_BarResponse) -> Bool {
+  static func ==(lhs: Proto2Unittest_BarResponse, rhs: Proto2Unittest_BarResponse) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestJsonName: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestJsonName: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestJsonName"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "field_name1"),
@@ -17676,7 +17708,7 @@ extension ProtobufUnittest_TestJsonName: SwiftProtobuf.Message, SwiftProtobuf._M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestJsonName, rhs: ProtobufUnittest_TestJsonName) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestJsonName, rhs: Proto2Unittest_TestJsonName) -> Bool {
     if lhs._fieldName1 != rhs._fieldName1 {return false}
     if lhs._fieldName2 != rhs._fieldName2 {return false}
     if lhs._fieldName3 != rhs._fieldName3 {return false}
@@ -17689,7 +17721,7 @@ extension ProtobufUnittest_TestJsonName: SwiftProtobuf.Message, SwiftProtobuf._M
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestHugeFieldNumbers"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     536870000: .standard(proto: "optional_int32"),
@@ -17739,7 +17771,7 @@ extension ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftPro
         }
       }()
       case 536870012: try {
-        var v: ProtobufUnittest_TestAllTypes?
+        var v: Proto2Unittest_TestAllTypes?
         var hadOneofValue = false
         if let current = self.oneofField {
           hadOneofValue = true
@@ -17768,7 +17800,7 @@ extension ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftPro
         }
       }()
       case 536860000..<536870000:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestHugeFieldNumbers.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestHugeFieldNumbers.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -17832,7 +17864,7 @@ extension ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbers, rhs: ProtobufUnittest_TestHugeFieldNumbers) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestHugeFieldNumbers, rhs: Proto2Unittest_TestHugeFieldNumbers) -> Bool {
     if lhs._optionalInt32 != rhs._optionalInt32 {return false}
     if lhs._fixed32 != rhs._fixed32 {return false}
     if lhs.repeatedInt32 != rhs.repeatedInt32 {return false}
@@ -17850,8 +17882,8 @@ extension ProtobufUnittest_TestHugeFieldNumbers: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestHugeFieldNumbers.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestHugeFieldNumbers.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestHugeFieldNumbers.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     536870009: .standard(proto: "group_a"),
   ]
@@ -17879,14 +17911,14 @@ extension ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup: SwiftProtobuf.Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup, rhs: ProtobufUnittest_TestHugeFieldNumbers.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestHugeFieldNumbers.OptionalGroup, rhs: Proto2Unittest_TestHugeFieldNumbers.OptionalGroup) -> Bool {
     if lhs._groupA != rhs._groupA {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionInsideTable: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionInsideTable"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "field1"),
@@ -17921,7 +17953,7 @@ extension ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.Message, Swif
       case 9: try { try decoder.decodeSingularInt32Field(value: &self._field9) }()
       case 10: try { try decoder.decodeSingularInt32Field(value: &self._field10) }()
       case 5:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestExtensionInsideTable.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestExtensionInsideTable.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -17963,7 +17995,7 @@ extension ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionInsideTable, rhs: ProtobufUnittest_TestExtensionInsideTable) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionInsideTable, rhs: Proto2Unittest_TestExtensionInsideTable) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs._field2 != rhs._field2 {return false}
     if lhs._field3 != rhs._field3 {return false}
@@ -17979,7 +18011,7 @@ extension ProtobufUnittest_TestExtensionInsideTable: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionOuter: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedGroupExtensionOuter: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedGroupExtensionOuter"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "layer1optionalgroup"),
@@ -18014,15 +18046,15 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedGroupExtensionOuter, rhs: ProtobufUnittest_TestNestedGroupExtensionOuter) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedGroupExtensionOuter, rhs: Proto2Unittest_TestNestedGroupExtensionOuter) -> Bool {
     if lhs._layer1OptionalGroup != rhs._layer1OptionalGroup {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestNestedGroupExtensionOuter.protoMessageName + ".Layer1OptionalGroup"
+extension Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestNestedGroupExtensionOuter.protoMessageName + ".Layer1OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2: .same(proto: "layer2repeatedgroup"),
     2: .unique(proto: "Layer2RepeatedGroup", json: "layer2repeatedgroup"),
@@ -18058,7 +18090,7 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup: Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup, rhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup, rhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup) -> Bool {
     if lhs.layer2RepeatedGroup != rhs.layer2RepeatedGroup {return false}
     if lhs.layer2AnotherOptionalRepeatedGroup != rhs.layer2AnotherOptionalRepeatedGroup {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -18066,8 +18098,8 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup: Sw
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.protoMessageName + ".Layer2RepeatedGroup"
+extension Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.protoMessageName + ".Layer2RepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     6: .standard(proto: "another_field"),
   ]
@@ -18085,7 +18117,7 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Lay
       switch fieldNumber {
       case 6: try { try decoder.decodeSingularStringField(value: &self._anotherField) }()
       case 3:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -18103,7 +18135,7 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Lay
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup, rhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup, rhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup) -> Bool {
     if lhs._anotherField != rhs._anotherField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
@@ -18111,8 +18143,8 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Lay
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.protoMessageName + ".Layer2AnotherOptionalRepeatedGroup"
+extension Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.protoMessageName + ".Layer2AnotherOptionalRepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     5: .standard(proto: "but_why_tho"),
   ]
@@ -18140,14 +18172,14 @@ extension ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Lay
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup, rhs: ProtobufUnittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup, rhs: Proto2Unittest_TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2AnotherOptionalRepeatedGroup) -> Bool {
     if lhs._butWhyTho != rhs._butWhyTho {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedGroupExtensionInnerExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedGroupExtensionInnerExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedGroupExtensionInnerExtension"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "inner_name"),
@@ -18176,14 +18208,14 @@ extension ProtobufUnittest_TestNestedGroupExtensionInnerExtension: SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedGroupExtensionInnerExtension, rhs: ProtobufUnittest_TestNestedGroupExtensionInnerExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedGroupExtensionInnerExtension, rhs: Proto2Unittest_TestNestedGroupExtensionInnerExtension) -> Bool {
     if lhs._innerName != rhs._innerName {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionRangeSerialize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionRangeSerialize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "foo_one"),
@@ -18208,7 +18240,7 @@ extension ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.Message, S
       case 7: try { try decoder.decodeSingularInt32Field(value: &self._fooThree) }()
       case 13: try { try decoder.decodeSingularInt32Field(value: &self._fooFour) }()
       case 2..<5, 9..<11, 15, 17, 19:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestExtensionRangeSerialize.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestExtensionRangeSerialize.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -18237,7 +18269,7 @@ extension ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionRangeSerialize, rhs: ProtobufUnittest_TestExtensionRangeSerialize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionRangeSerialize, rhs: Proto2Unittest_TestExtensionRangeSerialize) -> Bool {
     if lhs._fooOne != rhs._fooOne {return false}
     if lhs._fooTwo != rhs._fooTwo {return false}
     if lhs._fooThree != rhs._fooThree {return false}
@@ -18248,7 +18280,7 @@ extension ProtobufUnittest_TestExtensionRangeSerialize: SwiftProtobuf.Message, S
   }
 }
 
-extension ProtobufUnittest_TestVerifyInt32Simple: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyInt32Simple: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyInt32Simple"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32_1"),
@@ -18292,7 +18324,7 @@ extension ProtobufUnittest_TestVerifyInt32Simple: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyInt32Simple, rhs: ProtobufUnittest_TestVerifyInt32Simple) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyInt32Simple, rhs: Proto2Unittest_TestVerifyInt32Simple) -> Bool {
     if lhs._optionalInt321 != rhs._optionalInt321 {return false}
     if lhs._optionalInt322 != rhs._optionalInt322 {return false}
     if lhs._optionalInt3263 != rhs._optionalInt3263 {return false}
@@ -18302,7 +18334,7 @@ extension ProtobufUnittest_TestVerifyInt32Simple: SwiftProtobuf.Message, SwiftPr
   }
 }
 
-extension ProtobufUnittest_TestVerifyInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyInt32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32_1"),
@@ -18356,7 +18388,7 @@ extension ProtobufUnittest_TestVerifyInt32: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyInt32, rhs: ProtobufUnittest_TestVerifyInt32) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyInt32, rhs: Proto2Unittest_TestVerifyInt32) -> Bool {
     if lhs._optionalInt321 != rhs._optionalInt321 {return false}
     if lhs._optionalInt322 != rhs._optionalInt322 {return false}
     if lhs._optionalInt3263 != rhs._optionalInt3263 {return false}
@@ -18368,7 +18400,7 @@ extension ProtobufUnittest_TestVerifyInt32: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TestVerifyMostlyInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyMostlyInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyMostlyInt32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     30: .standard(proto: "optional_int64_30"),
@@ -18437,7 +18469,7 @@ extension ProtobufUnittest_TestVerifyMostlyInt32: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyMostlyInt32, rhs: ProtobufUnittest_TestVerifyMostlyInt32) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyMostlyInt32, rhs: Proto2Unittest_TestVerifyMostlyInt32) -> Bool {
     if lhs._optionalInt6430 != rhs._optionalInt6430 {return false}
     if lhs._optionalInt321 != rhs._optionalInt321 {return false}
     if lhs._optionalInt322 != rhs._optionalInt322 {return false}
@@ -18452,7 +18484,7 @@ extension ProtobufUnittest_TestVerifyMostlyInt32: SwiftProtobuf.Message, SwiftPr
   }
 }
 
-extension ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyMostlyInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyMostlyInt32BigFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     30: .standard(proto: "optional_int64_30"),
@@ -18526,7 +18558,7 @@ extension ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: SwiftProtobuf.Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber, rhs: ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyMostlyInt32BigFieldNumber, rhs: Proto2Unittest_TestVerifyMostlyInt32BigFieldNumber) -> Bool {
     if lhs._optionalInt6430 != rhs._optionalInt6430 {return false}
     if lhs._optionalInt32300 != rhs._optionalInt32300 {return false}
     if lhs._optionalInt321 != rhs._optionalInt321 {return false}
@@ -18542,7 +18574,7 @@ extension ProtobufUnittest_TestVerifyMostlyInt32BigFieldNumber: SwiftProtobuf.Me
   }
 }
 
-extension ProtobufUnittest_TestVerifyUint32Simple: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyUint32Simple: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyUint32Simple"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_uint32_1"),
@@ -18586,7 +18618,7 @@ extension ProtobufUnittest_TestVerifyUint32Simple: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyUint32Simple, rhs: ProtobufUnittest_TestVerifyUint32Simple) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyUint32Simple, rhs: Proto2Unittest_TestVerifyUint32Simple) -> Bool {
     if lhs._optionalUint321 != rhs._optionalUint321 {return false}
     if lhs._optionalUint322 != rhs._optionalUint322 {return false}
     if lhs._optionalUint3263 != rhs._optionalUint3263 {return false}
@@ -18596,7 +18628,7 @@ extension ProtobufUnittest_TestVerifyUint32Simple: SwiftProtobuf.Message, SwiftP
   }
 }
 
-extension ProtobufUnittest_TestVerifyUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyUint32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_uint32_1"),
@@ -18650,7 +18682,7 @@ extension ProtobufUnittest_TestVerifyUint32: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyUint32, rhs: ProtobufUnittest_TestVerifyUint32) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyUint32, rhs: Proto2Unittest_TestVerifyUint32) -> Bool {
     if lhs._optionalUint321 != rhs._optionalUint321 {return false}
     if lhs._optionalUint322 != rhs._optionalUint322 {return false}
     if lhs._optionalUint3263 != rhs._optionalUint3263 {return false}
@@ -18662,7 +18694,7 @@ extension ProtobufUnittest_TestVerifyUint32: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_TestVerifyOneUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyOneUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyOneUint32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_uint32_1"),
@@ -18716,7 +18748,7 @@ extension ProtobufUnittest_TestVerifyOneUint32: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyOneUint32, rhs: ProtobufUnittest_TestVerifyOneUint32) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyOneUint32, rhs: Proto2Unittest_TestVerifyOneUint32) -> Bool {
     if lhs._optionalUint321 != rhs._optionalUint321 {return false}
     if lhs._optionalInt322 != rhs._optionalInt322 {return false}
     if lhs._optionalInt3263 != rhs._optionalInt3263 {return false}
@@ -18728,7 +18760,7 @@ extension ProtobufUnittest_TestVerifyOneUint32: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyOneInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyOneInt32BigFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     65: .standard(proto: "optional_int32_65"),
@@ -18787,7 +18819,7 @@ extension ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: SwiftProtobuf.Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyOneInt32BigFieldNumber, rhs: ProtobufUnittest_TestVerifyOneInt32BigFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyOneInt32BigFieldNumber, rhs: Proto2Unittest_TestVerifyOneInt32BigFieldNumber) -> Bool {
     if lhs._optionalInt3265 != rhs._optionalInt3265 {return false}
     if lhs._optionalInt641 != rhs._optionalInt641 {return false}
     if lhs._optionalInt642 != rhs._optionalInt642 {return false}
@@ -18800,7 +18832,7 @@ extension ProtobufUnittest_TestVerifyOneInt32BigFieldNumber: SwiftProtobuf.Messa
   }
 }
 
-extension ProtobufUnittest_TestVerifyInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyInt32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyInt32BigFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1000: .standard(proto: "optional_int32_1000"),
@@ -18864,7 +18896,7 @@ extension ProtobufUnittest_TestVerifyInt32BigFieldNumber: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyInt32BigFieldNumber, rhs: ProtobufUnittest_TestVerifyInt32BigFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyInt32BigFieldNumber, rhs: Proto2Unittest_TestVerifyInt32BigFieldNumber) -> Bool {
     if lhs._optionalInt321000 != rhs._optionalInt321000 {return false}
     if lhs._optionalInt3265 != rhs._optionalInt3265 {return false}
     if lhs._optionalInt321 != rhs._optionalInt321 {return false}
@@ -18878,7 +18910,7 @@ extension ProtobufUnittest_TestVerifyInt32BigFieldNumber: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestVerifyUint32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyUint32BigFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyUint32BigFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1000: .standard(proto: "optional_uint32_1000"),
@@ -18942,7 +18974,7 @@ extension ProtobufUnittest_TestVerifyUint32BigFieldNumber: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyUint32BigFieldNumber, rhs: ProtobufUnittest_TestVerifyUint32BigFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyUint32BigFieldNumber, rhs: Proto2Unittest_TestVerifyUint32BigFieldNumber) -> Bool {
     if lhs._optionalUint321000 != rhs._optionalUint321000 {return false}
     if lhs._optionalUint3265 != rhs._optionalUint3265 {return false}
     if lhs._optionalUint321 != rhs._optionalUint321 {return false}
@@ -18956,7 +18988,7 @@ extension ProtobufUnittest_TestVerifyUint32BigFieldNumber: SwiftProtobuf.Message
   }
 }
 
-extension ProtobufUnittest_TestVerifyBigFieldNumberUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestVerifyBigFieldNumberUint32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestVerifyBigFieldNumberUint32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_nested"),
@@ -18985,15 +19017,15 @@ extension ProtobufUnittest_TestVerifyBigFieldNumberUint32: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyBigFieldNumberUint32, rhs: ProtobufUnittest_TestVerifyBigFieldNumberUint32) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyBigFieldNumberUint32, rhs: Proto2Unittest_TestVerifyBigFieldNumberUint32) -> Bool {
     if lhs._optionalNested != rhs._optionalNested {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestVerifyBigFieldNumberUint32.protoMessageName + ".Nested"
+extension Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestVerifyBigFieldNumberUint32.protoMessageName + ".Nested"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     5000: .standard(proto: "optional_uint32_5000"),
     1000: .standard(proto: "optional_uint32_1000"),
@@ -19016,8 +19048,8 @@ extension ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.
     var _optionalUint322: UInt32? = nil
     var _optionalUint3263: UInt32? = nil
     var _optionalUint3264: UInt32? = nil
-    var _optionalNested: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested? = nil
-    var _repeatedNested: [ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested] = []
+    var _optionalNested: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested? = nil
+    var _repeatedNested: [Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested] = []
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -19116,7 +19148,7 @@ extension ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested, rhs: ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested, rhs: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -19140,7 +19172,7 @@ extension ProtobufUnittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".EnumParseTester"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_seq_small_0_lowfield"),
@@ -19183,42 +19215,42 @@ extension ProtobufUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf
   ]
 
   fileprivate class _StorageClass {
-    var _optionalSeqSmall0Lowfield: ProtobufUnittest_EnumParseTester.SeqSmall0? = nil
-    var _optionalSeqSmall0Midfield: ProtobufUnittest_EnumParseTester.SeqSmall0? = nil
-    var _optionalSeqSmall0Hifield: ProtobufUnittest_EnumParseTester.SeqSmall0? = nil
-    var _repeatedSeqSmall0Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _repeatedSeqSmall0Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _repeatedSeqSmall0Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _packedSeqSmall0Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _packedSeqSmall0Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _packedSeqSmall0Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall0] = []
-    var _optionalSeqSmall1Lowfield: ProtobufUnittest_EnumParseTester.SeqSmall1? = nil
-    var _optionalSeqSmall1Midfield: ProtobufUnittest_EnumParseTester.SeqSmall1? = nil
-    var _optionalSeqSmall1Hifield: ProtobufUnittest_EnumParseTester.SeqSmall1? = nil
-    var _repeatedSeqSmall1Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _repeatedSeqSmall1Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _repeatedSeqSmall1Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _packedSeqSmall1Lowfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _packedSeqSmall1Midfield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _packedSeqSmall1Hifield: [ProtobufUnittest_EnumParseTester.SeqSmall1] = []
-    var _optionalSeqLargeLowfield: ProtobufUnittest_EnumParseTester.SeqLarge? = nil
-    var _optionalSeqLargeMidfield: ProtobufUnittest_EnumParseTester.SeqLarge? = nil
-    var _optionalSeqLargeHifield: ProtobufUnittest_EnumParseTester.SeqLarge? = nil
-    var _repeatedSeqLargeLowfield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _repeatedSeqLargeMidfield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _repeatedSeqLargeHifield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _packedSeqLargeLowfield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _packedSeqLargeMidfield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _packedSeqLargeHifield: [ProtobufUnittest_EnumParseTester.SeqLarge] = []
-    var _optionalArbitraryLowfield: ProtobufUnittest_EnumParseTester.Arbitrary? = nil
-    var _optionalArbitraryMidfield: ProtobufUnittest_EnumParseTester.Arbitrary? = nil
-    var _optionalArbitraryHifield: ProtobufUnittest_EnumParseTester.Arbitrary? = nil
-    var _repeatedArbitraryLowfield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
-    var _repeatedArbitraryMidfield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
-    var _repeatedArbitraryHifield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
-    var _packedArbitraryLowfield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
-    var _packedArbitraryMidfield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
-    var _packedArbitraryHifield: [ProtobufUnittest_EnumParseTester.Arbitrary] = []
+    var _optionalSeqSmall0Lowfield: Proto2Unittest_EnumParseTester.SeqSmall0? = nil
+    var _optionalSeqSmall0Midfield: Proto2Unittest_EnumParseTester.SeqSmall0? = nil
+    var _optionalSeqSmall0Hifield: Proto2Unittest_EnumParseTester.SeqSmall0? = nil
+    var _repeatedSeqSmall0Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _repeatedSeqSmall0Midfield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _repeatedSeqSmall0Hifield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _packedSeqSmall0Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _packedSeqSmall0Midfield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _packedSeqSmall0Hifield: [Proto2Unittest_EnumParseTester.SeqSmall0] = []
+    var _optionalSeqSmall1Lowfield: Proto2Unittest_EnumParseTester.SeqSmall1? = nil
+    var _optionalSeqSmall1Midfield: Proto2Unittest_EnumParseTester.SeqSmall1? = nil
+    var _optionalSeqSmall1Hifield: Proto2Unittest_EnumParseTester.SeqSmall1? = nil
+    var _repeatedSeqSmall1Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _repeatedSeqSmall1Midfield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _repeatedSeqSmall1Hifield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _packedSeqSmall1Lowfield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _packedSeqSmall1Midfield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _packedSeqSmall1Hifield: [Proto2Unittest_EnumParseTester.SeqSmall1] = []
+    var _optionalSeqLargeLowfield: Proto2Unittest_EnumParseTester.SeqLarge? = nil
+    var _optionalSeqLargeMidfield: Proto2Unittest_EnumParseTester.SeqLarge? = nil
+    var _optionalSeqLargeHifield: Proto2Unittest_EnumParseTester.SeqLarge? = nil
+    var _repeatedSeqLargeLowfield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _repeatedSeqLargeMidfield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _repeatedSeqLargeHifield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _packedSeqLargeLowfield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _packedSeqLargeMidfield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _packedSeqLargeHifield: [Proto2Unittest_EnumParseTester.SeqLarge] = []
+    var _optionalArbitraryLowfield: Proto2Unittest_EnumParseTester.Arbitrary? = nil
+    var _optionalArbitraryMidfield: Proto2Unittest_EnumParseTester.Arbitrary? = nil
+    var _optionalArbitraryHifield: Proto2Unittest_EnumParseTester.Arbitrary? = nil
+    var _repeatedArbitraryLowfield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
+    var _repeatedArbitraryMidfield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
+    var _repeatedArbitraryHifield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
+    var _packedArbitraryLowfield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
+    var _packedArbitraryMidfield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
+    var _packedArbitraryHifield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
     var _otherField: Int32? = nil
 
     #if swift(>=5.10)
@@ -19332,7 +19364,7 @@ extension ProtobufUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf
         case 1000011: try { try decoder.decodeRepeatedEnumField(value: &_storage._repeatedArbitraryHifield) }()
         case 1000012: try { try decoder.decodeRepeatedEnumField(value: &_storage._packedArbitraryHifield) }()
         case 2000000..<536870912:
-          try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_EnumParseTester.self, fieldNumber: fieldNumber) }()
+          try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_EnumParseTester.self, fieldNumber: fieldNumber) }()
         default: break
         }
       }
@@ -19461,7 +19493,7 @@ extension ProtobufUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_EnumParseTester, rhs: ProtobufUnittest_EnumParseTester) -> Bool {
+  static func ==(lhs: Proto2Unittest_EnumParseTester, rhs: Proto2Unittest_EnumParseTester) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -19513,7 +19545,7 @@ extension ProtobufUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_EnumParseTester.SeqSmall0: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumParseTester.SeqSmall0: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "SEQ_SMALL_0_DEFAULT"),
     1: .same(proto: "SEQ_SMALL_0_1"),
@@ -19521,7 +19553,7 @@ extension ProtobufUnittest_EnumParseTester.SeqSmall0: SwiftProtobuf._ProtoNamePr
   ]
 }
 
-extension ProtobufUnittest_EnumParseTester.SeqSmall1: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumParseTester.SeqSmall1: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "SEQ_SMALL_1_DEFAULT"),
     2: .same(proto: "SEQ_SMALL_1_2"),
@@ -19529,7 +19561,7 @@ extension ProtobufUnittest_EnumParseTester.SeqSmall1: SwiftProtobuf._ProtoNamePr
   ]
 }
 
-extension ProtobufUnittest_EnumParseTester.SeqLarge: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumParseTester.SeqLarge: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1: .same(proto: "SEQ_LARGE_DEFAULT"),
     0: .same(proto: "SEQ_LARGE_0"),
@@ -19569,7 +19601,7 @@ extension ProtobufUnittest_EnumParseTester.SeqLarge: SwiftProtobuf._ProtoNamePro
   ]
 }
 
-extension ProtobufUnittest_EnumParseTester.Arbitrary: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumParseTester.Arbitrary: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -2147483648: .same(proto: "ARBITRARY_MIN"),
     -123123: .same(proto: "ARBITRARY_DEFAULT"),
@@ -19580,7 +19612,7 @@ extension ProtobufUnittest_EnumParseTester.Arbitrary: SwiftProtobuf._ProtoNamePr
   ]
 }
 
-extension ProtobufUnittest_BoolParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_BoolParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BoolParseTester"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_bool_lowfield"),
@@ -19617,7 +19649,7 @@ extension ProtobufUnittest_BoolParseTester: SwiftProtobuf.Message, SwiftProtobuf
       case 1000002: try { try decoder.decodeRepeatedBoolField(value: &self.repeatedBoolHifield) }()
       case 1000003: try { try decoder.decodeRepeatedBoolField(value: &self.packedBoolHifield) }()
       case 2000000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_BoolParseTester.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_BoolParseTester.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -19662,7 +19694,7 @@ extension ProtobufUnittest_BoolParseTester: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_BoolParseTester, rhs: ProtobufUnittest_BoolParseTester) -> Bool {
+  static func ==(lhs: Proto2Unittest_BoolParseTester, rhs: Proto2Unittest_BoolParseTester) -> Bool {
     if lhs._optionalBoolLowfield != rhs._optionalBoolLowfield {return false}
     if lhs._optionalBoolMidfield != rhs._optionalBoolMidfield {return false}
     if lhs._optionalBoolHifield != rhs._optionalBoolHifield {return false}
@@ -19679,7 +19711,7 @@ extension ProtobufUnittest_BoolParseTester: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_Int32ParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Int32ParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Int32ParseTester"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32_lowfield"),
@@ -19716,7 +19748,7 @@ extension ProtobufUnittest_Int32ParseTester: SwiftProtobuf.Message, SwiftProtobu
       case 1000002: try { try decoder.decodeRepeatedInt32Field(value: &self.repeatedInt32Hifield) }()
       case 1000003: try { try decoder.decodeRepeatedInt32Field(value: &self.packedInt32Hifield) }()
       case 2000000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_Int32ParseTester.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_Int32ParseTester.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -19761,7 +19793,7 @@ extension ProtobufUnittest_Int32ParseTester: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Int32ParseTester, rhs: ProtobufUnittest_Int32ParseTester) -> Bool {
+  static func ==(lhs: Proto2Unittest_Int32ParseTester, rhs: Proto2Unittest_Int32ParseTester) -> Bool {
     if lhs._optionalInt32Lowfield != rhs._optionalInt32Lowfield {return false}
     if lhs._optionalInt32Midfield != rhs._optionalInt32Midfield {return false}
     if lhs._optionalInt32Hifield != rhs._optionalInt32Hifield {return false}
@@ -19778,7 +19810,7 @@ extension ProtobufUnittest_Int32ParseTester: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_Int64ParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Int64ParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Int64ParseTester"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int64_lowfield"),
@@ -19815,7 +19847,7 @@ extension ProtobufUnittest_Int64ParseTester: SwiftProtobuf.Message, SwiftProtobu
       case 1000002: try { try decoder.decodeRepeatedInt64Field(value: &self.repeatedInt64Hifield) }()
       case 1000003: try { try decoder.decodeRepeatedInt64Field(value: &self.packedInt64Hifield) }()
       case 2000000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_Int64ParseTester.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_Int64ParseTester.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -19860,7 +19892,7 @@ extension ProtobufUnittest_Int64ParseTester: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Int64ParseTester, rhs: ProtobufUnittest_Int64ParseTester) -> Bool {
+  static func ==(lhs: Proto2Unittest_Int64ParseTester, rhs: Proto2Unittest_Int64ParseTester) -> Bool {
     if lhs._optionalInt64Lowfield != rhs._optionalInt64Lowfield {return false}
     if lhs._optionalInt64Midfield != rhs._optionalInt64Midfield {return false}
     if lhs._optionalInt64Hifield != rhs._optionalInt64Hifield {return false}
@@ -19877,7 +19909,7 @@ extension ProtobufUnittest_Int64ParseTester: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".InlinedStringIdxRegressionProto"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "str1"),
@@ -19888,7 +19920,7 @@ extension ProtobufUnittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Messag
 
   fileprivate class _StorageClass {
     var _str1: String? = nil
-    var _sub: ProtobufUnittest_InlinedStringIdxRegressionProto? = nil
+    var _sub: Proto2Unittest_InlinedStringIdxRegressionProto? = nil
     var _str2: String? = nil
     var _str3: Data? = nil
 
@@ -19959,7 +19991,7 @@ extension ProtobufUnittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_InlinedStringIdxRegressionProto, rhs: ProtobufUnittest_InlinedStringIdxRegressionProto) -> Bool {
+  static func ==(lhs: Proto2Unittest_InlinedStringIdxRegressionProto, rhs: Proto2Unittest_InlinedStringIdxRegressionProto) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -19977,7 +20009,7 @@ extension ProtobufUnittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Messag
   }
 }
 
-extension ProtobufUnittest_StringParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_StringParseTester: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".StringParseTester"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_string_lowfield"),
@@ -20006,7 +20038,7 @@ extension ProtobufUnittest_StringParseTester: SwiftProtobuf.Message, SwiftProtob
       case 1000001: try { try decoder.decodeSingularStringField(value: &self._optionalStringHifield) }()
       case 1000002: try { try decoder.decodeRepeatedStringField(value: &self.repeatedStringHifield) }()
       case 2000000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_StringParseTester.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_StringParseTester.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -20039,7 +20071,7 @@ extension ProtobufUnittest_StringParseTester: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_StringParseTester, rhs: ProtobufUnittest_StringParseTester) -> Bool {
+  static func ==(lhs: Proto2Unittest_StringParseTester, rhs: Proto2Unittest_StringParseTester) -> Bool {
     if lhs._optionalStringLowfield != rhs._optionalStringLowfield {return false}
     if lhs._optionalStringMidfield != rhs._optionalStringMidfield {return false}
     if lhs._optionalStringHifield != rhs._optionalStringHifield {return false}
@@ -20052,7 +20084,7 @@ extension ProtobufUnittest_StringParseTester: SwiftProtobuf.Message, SwiftProtob
   }
 }
 
-extension ProtobufUnittest_BadFieldNames: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_BadFieldNames: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".BadFieldNames"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "OptionalInt32"),
@@ -20086,7 +20118,7 @@ extension ProtobufUnittest_BadFieldNames: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_BadFieldNames, rhs: ProtobufUnittest_BadFieldNames) -> Bool {
+  static func ==(lhs: Proto2Unittest_BadFieldNames, rhs: Proto2Unittest_BadFieldNames) -> Bool {
     if lhs._optionalInt32 != rhs._optionalInt32 {return false}
     if lhs._for != rhs._for {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -20094,7 +20126,7 @@ extension ProtobufUnittest_BadFieldNames: SwiftProtobuf.Message, SwiftProtobuf._
   }
 }
 
-extension ProtobufUnittest_TestNestedMessageRedaction: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedMessageRedaction: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedMessageRedaction"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_unredacted_nested_string"),
@@ -20128,7 +20160,7 @@ extension ProtobufUnittest_TestNestedMessageRedaction: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedMessageRedaction, rhs: ProtobufUnittest_TestNestedMessageRedaction) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedMessageRedaction, rhs: Proto2Unittest_TestNestedMessageRedaction) -> Bool {
     if lhs._optionalUnredactedNestedString != rhs._optionalUnredactedNestedString {return false}
     if lhs._optionalRedactedNestedString != rhs._optionalRedactedNestedString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -20136,7 +20168,7 @@ extension ProtobufUnittest_TestNestedMessageRedaction: SwiftProtobuf.Message, Sw
   }
 }
 
-extension ProtobufUnittest_RedactedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RedactedFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RedactedFields"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_redacted_string"),
@@ -20175,7 +20207,7 @@ extension ProtobufUnittest_RedactedFields: SwiftProtobuf.Message, SwiftProtobuf.
       case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &self.mapUnredactedString) }()
       case 11: try { try decoder.decodeSingularStringField(value: &self._optionalRedactedFalseString) }()
       case 20..<31:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_RedactedFields.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_RedactedFields.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -20223,7 +20255,7 @@ extension ProtobufUnittest_RedactedFields: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RedactedFields, rhs: ProtobufUnittest_RedactedFields) -> Bool {
+  static func ==(lhs: Proto2Unittest_RedactedFields, rhs: Proto2Unittest_RedactedFields) -> Bool {
     if lhs._optionalRedactedString != rhs._optionalRedactedString {return false}
     if lhs._optionalUnredactedString != rhs._optionalUnredactedString {return false}
     if lhs.repeatedRedactedString != rhs.repeatedRedactedString {return false}
@@ -20241,7 +20273,7 @@ extension ProtobufUnittest_RedactedFields: SwiftProtobuf.Message, SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_TestString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestString: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestString"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_string"),
@@ -20270,14 +20302,14 @@ extension ProtobufUnittest_TestString: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestString, rhs: ProtobufUnittest_TestString) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestString, rhs: Proto2Unittest_TestString) -> Bool {
     if lhs._optionalString != rhs._optionalString {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestCord: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestCord: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestCord"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_bytes_cord"),
@@ -20311,7 +20343,7 @@ extension ProtobufUnittest_TestCord: SwiftProtobuf.Message, SwiftProtobuf._Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestCord, rhs: ProtobufUnittest_TestCord) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestCord, rhs: Proto2Unittest_TestCord) -> Bool {
     if lhs._optionalBytesCord != rhs._optionalBytesCord {return false}
     if lhs._optionalBytesCordDefault != rhs._optionalBytesCordDefault {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -20319,7 +20351,7 @@ extension ProtobufUnittest_TestCord: SwiftProtobuf.Message, SwiftProtobuf._Messa
   }
 }
 
-extension ProtobufUnittest_TestPackedEnumSmallRange: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedEnumSmallRange: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPackedEnumSmallRange"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "vals"),
@@ -20344,14 +20376,14 @@ extension ProtobufUnittest_TestPackedEnumSmallRange: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPackedEnumSmallRange, rhs: ProtobufUnittest_TestPackedEnumSmallRange) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPackedEnumSmallRange, rhs: Proto2Unittest_TestPackedEnumSmallRange) -> Bool {
     if lhs.vals != rhs.vals {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPackedEnumSmallRange.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedEnumSmallRange.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNSPECIFIED"),
     1: .same(proto: "FOO"),
@@ -20360,7 +20392,7 @@ extension ProtobufUnittest_TestPackedEnumSmallRange.NestedEnum: SwiftProtobuf._P
   ]
 }
 
-extension ProtobufUnittest_EnumsForBenchmark: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumsForBenchmark: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".EnumsForBenchmark"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -20373,13 +20405,13 @@ extension ProtobufUnittest_EnumsForBenchmark: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_EnumsForBenchmark, rhs: ProtobufUnittest_EnumsForBenchmark) -> Bool {
+  static func ==(lhs: Proto2Unittest_EnumsForBenchmark, rhs: Proto2Unittest_EnumsForBenchmark) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_EnumsForBenchmark.Flat: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumsForBenchmark.Flat: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "A0"),
     1: .same(proto: "A1"),
@@ -20400,7 +20432,7 @@ extension ProtobufUnittest_EnumsForBenchmark.Flat: SwiftProtobuf._ProtoNameProvi
   ]
 }
 
-extension ProtobufUnittest_EnumsForBenchmark.AlmostFlat: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumsForBenchmark.AlmostFlat: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "B0"),
     1: .same(proto: "B1"),
@@ -20421,7 +20453,7 @@ extension ProtobufUnittest_EnumsForBenchmark.AlmostFlat: SwiftProtobuf._ProtoNam
   ]
 }
 
-extension ProtobufUnittest_EnumsForBenchmark.Sparse: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EnumsForBenchmark.Sparse: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     536: .same(proto: "C536"),
     8387: .same(proto: "C8387"),
@@ -20442,7 +20474,7 @@ extension ProtobufUnittest_EnumsForBenchmark.Sparse: SwiftProtobuf._ProtoNamePro
   ]
 }
 
-extension ProtobufUnittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageWithManyRepeatedPtrFields"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "repeated_string_1"),
@@ -20716,7 +20748,7 @@ extension ProtobufUnittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.M
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageWithManyRepeatedPtrFields, rhs: ProtobufUnittest_TestMessageWithManyRepeatedPtrFields) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageWithManyRepeatedPtrFields, rhs: Proto2Unittest_TestMessageWithManyRepeatedPtrFields) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -20762,7 +20794,7 @@ extension ProtobufUnittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.M
   }
 }
 
-extension ProtobufUnittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageCreatorZeroInit"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "i"),
@@ -20777,8 +20809,8 @@ extension ProtobufUnittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftP
   fileprivate class _StorageClass {
     var _i: Int32? = nil
     var _d: Double? = nil
-    var _m: ProtobufUnittest_MessageCreatorZeroInit? = nil
-    var _one: ProtobufUnittest_MessageCreatorZeroInit.OneOf_One?
+    var _m: Proto2Unittest_MessageCreatorZeroInit? = nil
+    var _one: Proto2Unittest_MessageCreatorZeroInit.OneOf_One?
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -20843,7 +20875,7 @@ extension ProtobufUnittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftP
           }
         }()
         case 13: try {
-          var v: ProtobufUnittest_MessageCreatorZeroInit?
+          var v: Proto2Unittest_MessageCreatorZeroInit?
           var hadOneofValue = false
           if let current = _storage._one {
             hadOneofValue = true
@@ -20899,7 +20931,7 @@ extension ProtobufUnittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MessageCreatorZeroInit, rhs: ProtobufUnittest_MessageCreatorZeroInit) -> Bool {
+  static func ==(lhs: Proto2Unittest_MessageCreatorZeroInit, rhs: Proto2Unittest_MessageCreatorZeroInit) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -20917,7 +20949,7 @@ extension ProtobufUnittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftP
   }
 }
 
-extension ProtobufUnittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageCreatorMemcpy"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "s"),
@@ -20929,7 +20961,7 @@ extension ProtobufUnittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftPro
   fileprivate class _StorageClass {
     var _s: String? = nil
     var _i: [Int32] = []
-    var _m: ProtobufUnittest_MessageCreatorMemcpy? = nil
+    var _m: Proto2Unittest_MessageCreatorMemcpy? = nil
     var _m2: Dictionary<Int32,Int32> = [:]
 
     #if swift(>=5.10)
@@ -20999,7 +21031,7 @@ extension ProtobufUnittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MessageCreatorMemcpy, rhs: ProtobufUnittest_MessageCreatorMemcpy) -> Bool {
+  static func ==(lhs: Proto2Unittest_MessageCreatorMemcpy, rhs: Proto2Unittest_MessageCreatorMemcpy) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -21017,7 +21049,7 @@ extension ProtobufUnittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_MessageCreatorFunc: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MessageCreatorFunc: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageCreatorFunc"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     3: .same(proto: "c"),
@@ -21046,7 +21078,7 @@ extension ProtobufUnittest_MessageCreatorFunc: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MessageCreatorFunc, rhs: ProtobufUnittest_MessageCreatorFunc) -> Bool {
+  static func ==(lhs: Proto2Unittest_MessageCreatorFunc, rhs: Proto2Unittest_MessageCreatorFunc) -> Bool {
     if lhs._c != rhs._c {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_custom_options.pb.swift b/Reference/upstream/google/protobuf/unittest_custom_options.pb.swift
index 3fbcf9f86..4884deedf 100644
--- a/Reference/upstream/google/protobuf/unittest_custom_options.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_custom_options.pb.swift
@@ -34,7 +34,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_MethodOpt1: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_MethodOpt1: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case val1 = 1
   case val2 = 2
 
@@ -44,7 +44,7 @@ enum ProtobufUnittest_MethodOpt1: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
 
 }
 
-enum ProtobufUnittest_AggregateEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_AggregateEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case value = 1
 
   init() {
@@ -55,7 +55,7 @@ enum ProtobufUnittest_AggregateEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable
 
 /// A test message with custom options at all possible locations (and also some
 /// regular options, to make sure they interact nicely).
-struct ProtobufUnittest_TestMessageWithCustomOptions: Sendable {
+struct Proto2Unittest_TestMessageWithCustomOptions: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -69,7 +69,7 @@ struct ProtobufUnittest_TestMessageWithCustomOptions: Sendable {
   /// Clears the value of `field1`. Subsequent reads from it will return its default value.
   mutating func clearField1() {self._field1 = nil}
 
-  var anOneof: ProtobufUnittest_TestMessageWithCustomOptions.OneOf_AnOneof? = nil
+  var anOneof: Proto2Unittest_TestMessageWithCustomOptions.OneOf_AnOneof? = nil
 
   var oneofField: Int32 {
     get {
@@ -105,7 +105,7 @@ struct ProtobufUnittest_TestMessageWithCustomOptions: Sendable {
 
 /// A test RPC service with custom options at all possible locations (and also
 /// some regular options, to make sure they interact nicely).
-struct ProtobufUnittest_CustomOptionFooRequest: Sendable {
+struct Proto2Unittest_CustomOptionFooRequest: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -115,7 +115,7 @@ struct ProtobufUnittest_CustomOptionFooRequest: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionFooResponse: Sendable {
+struct Proto2Unittest_CustomOptionFooResponse: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -125,7 +125,7 @@ struct ProtobufUnittest_CustomOptionFooResponse: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionFooClientMessage: Sendable {
+struct Proto2Unittest_CustomOptionFooClientMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -135,7 +135,7 @@ struct ProtobufUnittest_CustomOptionFooClientMessage: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionFooServerMessage: Sendable {
+struct Proto2Unittest_CustomOptionFooServerMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -145,7 +145,7 @@ struct ProtobufUnittest_CustomOptionFooServerMessage: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_DummyMessageContainingEnum: Sendable {
+struct Proto2Unittest_DummyMessageContainingEnum: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -165,7 +165,7 @@ struct ProtobufUnittest_DummyMessageContainingEnum: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_DummyMessageInvalidAsOptionType: Sendable {
+struct Proto2Unittest_DummyMessageInvalidAsOptionType: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -175,7 +175,7 @@ struct ProtobufUnittest_DummyMessageInvalidAsOptionType: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionMinIntegerValues: Sendable {
+struct Proto2Unittest_CustomOptionMinIntegerValues: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -185,7 +185,7 @@ struct ProtobufUnittest_CustomOptionMinIntegerValues: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionMaxIntegerValues: Sendable {
+struct Proto2Unittest_CustomOptionMaxIntegerValues: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -195,7 +195,7 @@ struct ProtobufUnittest_CustomOptionMaxIntegerValues: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_CustomOptionOtherValues: Sendable {
+struct Proto2Unittest_CustomOptionOtherValues: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -205,7 +205,7 @@ struct ProtobufUnittest_CustomOptionOtherValues: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromPositiveInts: Sendable {
+struct Proto2Unittest_SettingRealsFromPositiveInts: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -215,7 +215,7 @@ struct ProtobufUnittest_SettingRealsFromPositiveInts: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromNegativeInts: Sendable {
+struct Proto2Unittest_SettingRealsFromNegativeInts: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -225,7 +225,7 @@ struct ProtobufUnittest_SettingRealsFromNegativeInts: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromInf: Sendable {
+struct Proto2Unittest_SettingRealsFromInf: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -235,7 +235,7 @@ struct ProtobufUnittest_SettingRealsFromInf: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromNegativeInf: Sendable {
+struct Proto2Unittest_SettingRealsFromNegativeInf: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -245,7 +245,7 @@ struct ProtobufUnittest_SettingRealsFromNegativeInf: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromNan: Sendable {
+struct Proto2Unittest_SettingRealsFromNan: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -255,7 +255,7 @@ struct ProtobufUnittest_SettingRealsFromNan: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_SettingRealsFromNegativeNan: Sendable {
+struct Proto2Unittest_SettingRealsFromNegativeNan: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -265,7 +265,7 @@ struct ProtobufUnittest_SettingRealsFromNegativeNan: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_ComplexOptionType1: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -309,13 +309,13 @@ struct ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.ExtensibleMessage, Sen
   fileprivate var _foo3: Int32? = nil
 }
 
-struct ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_ComplexOptionType2: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var bar: ProtobufUnittest_ComplexOptionType1 {
-    get {return _bar ?? ProtobufUnittest_ComplexOptionType1()}
+  var bar: Proto2Unittest_ComplexOptionType1 {
+    get {return _bar ?? Proto2Unittest_ComplexOptionType1()}
     set {_bar = newValue}
   }
   /// Returns true if `bar` has been explicitly set.
@@ -332,8 +332,8 @@ struct ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.ExtensibleMessage, Sen
   /// Clears the value of `baz`. Subsequent reads from it will return its default value.
   mutating func clearBaz() {self._baz = nil}
 
-  var fred: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4 {
-    get {return _fred ?? ProtobufUnittest_ComplexOptionType2.ComplexOptionType4()}
+  var fred: Proto2Unittest_ComplexOptionType2.ComplexOptionType4 {
+    get {return _fred ?? Proto2Unittest_ComplexOptionType2.ComplexOptionType4()}
     set {_fred = newValue}
   }
   /// Returns true if `fred` has been explicitly set.
@@ -341,7 +341,7 @@ struct ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.ExtensibleMessage, Sen
   /// Clears the value of `fred`. Subsequent reads from it will return its default value.
   mutating func clearFred() {self._fred = nil}
 
-  var barney: [ProtobufUnittest_ComplexOptionType2.ComplexOptionType4] = []
+  var barney: [Proto2Unittest_ComplexOptionType2.ComplexOptionType4] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -369,12 +369,12 @@ struct ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.ExtensibleMessage, Sen
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
-  fileprivate var _bar: ProtobufUnittest_ComplexOptionType1? = nil
+  fileprivate var _bar: Proto2Unittest_ComplexOptionType1? = nil
   fileprivate var _baz: Int32? = nil
-  fileprivate var _fred: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4? = nil
+  fileprivate var _fred: Proto2Unittest_ComplexOptionType2.ComplexOptionType4? = nil
 }
 
-struct ProtobufUnittest_ComplexOptionType3: Sendable {
+struct Proto2Unittest_ComplexOptionType3: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -388,8 +388,8 @@ struct ProtobufUnittest_ComplexOptionType3: Sendable {
   /// Clears the value of `moo`. Subsequent reads from it will return its default value.
   mutating func clearMoo() {self._moo = nil}
 
-  var complexOptionType5: ProtobufUnittest_ComplexOptionType3.ComplexOptionType5 {
-    get {return _complexOptionType5 ?? ProtobufUnittest_ComplexOptionType3.ComplexOptionType5()}
+  var complexOptionType5: Proto2Unittest_ComplexOptionType3.ComplexOptionType5 {
+    get {return _complexOptionType5 ?? Proto2Unittest_ComplexOptionType3.ComplexOptionType5()}
     set {_complexOptionType5 = newValue}
   }
   /// Returns true if `complexOptionType5` has been explicitly set.
@@ -423,10 +423,10 @@ struct ProtobufUnittest_ComplexOptionType3: Sendable {
   init() {}
 
   fileprivate var _moo: Int32? = nil
-  fileprivate var _complexOptionType5: ProtobufUnittest_ComplexOptionType3.ComplexOptionType5? = nil
+  fileprivate var _complexOptionType5: Proto2Unittest_ComplexOptionType3.ComplexOptionType5? = nil
 }
 
-struct ProtobufUnittest_ComplexOpt6: Sendable {
+struct Proto2Unittest_ComplexOpt6: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -448,7 +448,7 @@ struct ProtobufUnittest_ComplexOpt6: Sendable {
 }
 
 /// Note that we try various different ways of naming the same extension.
-struct ProtobufUnittest_VariousComplexOptions: Sendable {
+struct Proto2Unittest_VariousComplexOptions: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -458,7 +458,7 @@ struct ProtobufUnittest_VariousComplexOptions: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_AggregateMessageSet: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_AggregateMessageSet: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -470,7 +470,7 @@ struct ProtobufUnittest_AggregateMessageSet: SwiftProtobuf.ExtensibleMessage, Se
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_AggregateMessageSetElement: Sendable {
+struct Proto2Unittest_AggregateMessageSetElement: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -492,7 +492,7 @@ struct ProtobufUnittest_AggregateMessageSetElement: Sendable {
 }
 
 /// A helper type used to test aggregate option parsing
-struct ProtobufUnittest_Aggregate: @unchecked Sendable {
+struct Proto2Unittest_Aggregate: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -516,8 +516,8 @@ struct ProtobufUnittest_Aggregate: @unchecked Sendable {
   mutating func clearS() {_uniqueStorage()._s = nil}
 
   /// A nested object
-  var sub: ProtobufUnittest_Aggregate {
-    get {return _storage._sub ?? ProtobufUnittest_Aggregate()}
+  var sub: Proto2Unittest_Aggregate {
+    get {return _storage._sub ?? Proto2Unittest_Aggregate()}
     set {_uniqueStorage()._sub = newValue}
   }
   /// Returns true if `sub` has been explicitly set.
@@ -536,8 +536,8 @@ struct ProtobufUnittest_Aggregate: @unchecked Sendable {
   mutating func clearFile() {_uniqueStorage()._file = nil}
 
   /// An embedded message set
-  var mset: ProtobufUnittest_AggregateMessageSet {
-    get {return _storage._mset ?? ProtobufUnittest_AggregateMessageSet()}
+  var mset: Proto2Unittest_AggregateMessageSet {
+    get {return _storage._mset ?? Proto2Unittest_AggregateMessageSet()}
     set {_uniqueStorage()._mset = newValue}
   }
   /// Returns true if `mset` has been explicitly set.
@@ -562,7 +562,7 @@ struct ProtobufUnittest_Aggregate: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_AggregateMessage: Sendable {
+struct Proto2Unittest_AggregateMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -584,7 +584,7 @@ struct ProtobufUnittest_AggregateMessage: Sendable {
 }
 
 /// Test custom options for nested type.
-struct ProtobufUnittest_NestedOptionType: Sendable {
+struct Proto2Unittest_NestedOptionType: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -626,12 +626,12 @@ struct ProtobufUnittest_NestedOptionType: Sendable {
 
 /// Custom message option that has a required enum field.
 /// WARNING: this is strongly discouraged!
-struct ProtobufUnittest_OldOptionType: Sendable {
+struct Proto2Unittest_OldOptionType: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var value: ProtobufUnittest_OldOptionType.TestEnum {
+  var value: Proto2Unittest_OldOptionType.TestEnum {
     get {return _value ?? .oldValue}
     set {_value = newValue}
   }
@@ -653,16 +653,16 @@ struct ProtobufUnittest_OldOptionType: Sendable {
 
   init() {}
 
-  fileprivate var _value: ProtobufUnittest_OldOptionType.TestEnum? = nil
+  fileprivate var _value: Proto2Unittest_OldOptionType.TestEnum? = nil
 }
 
 /// Updated version of the custom option above.
-struct ProtobufUnittest_NewOptionType: Sendable {
+struct Proto2Unittest_NewOptionType: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var value: ProtobufUnittest_NewOptionType.TestEnum {
+  var value: Proto2Unittest_NewOptionType.TestEnum {
     get {return _value ?? .oldValue}
     set {_value = newValue}
   }
@@ -685,11 +685,11 @@ struct ProtobufUnittest_NewOptionType: Sendable {
 
   init() {}
 
-  fileprivate var _value: ProtobufUnittest_NewOptionType.TestEnum? = nil
+  fileprivate var _value: Proto2Unittest_NewOptionType.TestEnum? = nil
 }
 
 /// Test message using the "required_enum_opt" option defined above.
-struct ProtobufUnittest_TestMessageWithRequiredEnumOption: Sendable {
+struct Proto2Unittest_TestMessageWithRequiredEnumOption: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -708,1057 +708,1057 @@ struct ProtobufUnittest_TestMessageWithRequiredEnumOption: Sendable {
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_AggregateMessageSet {
+extension Proto2Unittest_AggregateMessageSet {
 
-  var ProtobufUnittest_AggregateMessageSetElement_messageSetExtension: ProtobufUnittest_AggregateMessageSetElement {
-    get {return getExtensionValue(ext: ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension) ?? ProtobufUnittest_AggregateMessageSetElement()}
-    set {setExtensionValue(ext: ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension, value: newValue)}
+  var Proto2Unittest_AggregateMessageSetElement_messageSetExtension: Proto2Unittest_AggregateMessageSetElement {
+    get {return getExtensionValue(ext: Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension) ?? Proto2Unittest_AggregateMessageSetElement()}
+    set {setExtensionValue(ext: Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension`
+  /// Returns true if extension `Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_AggregateMessageSetElement_messageSetExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension)
+  var hasProto2Unittest_AggregateMessageSetElement_messageSetExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension`.
+  /// Clears the value of extension `Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_AggregateMessageSetElement_messageSetExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension)
+  mutating func clearProto2Unittest_AggregateMessageSetElement_messageSetExtension() {
+    clearExtensionValue(ext: Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension)
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType1 {
+extension Proto2Unittest_ComplexOptionType1 {
 
-  var ProtobufUnittest_mooo: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_mooo) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_mooo, value: newValue)}
+  var Proto2Unittest_mooo: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_mooo) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_mooo, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_mooo`
+  /// Returns true if extension `Proto2Unittest_Extensions_mooo`
   /// has been explicitly set.
-  var hasProtobufUnittest_mooo: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_mooo)
+  var hasProto2Unittest_mooo: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_mooo)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_mooo`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_mooo`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_mooo() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_mooo)
+  mutating func clearProto2Unittest_mooo() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_mooo)
   }
 
-  var ProtobufUnittest_corge: ProtobufUnittest_ComplexOptionType3 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_corge) ?? ProtobufUnittest_ComplexOptionType3()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_corge, value: newValue)}
+  var Proto2Unittest_corge: Proto2Unittest_ComplexOptionType3 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_corge) ?? Proto2Unittest_ComplexOptionType3()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_corge, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_corge`
+  /// Returns true if extension `Proto2Unittest_Extensions_corge`
   /// has been explicitly set.
-  var hasProtobufUnittest_corge: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_corge)
+  var hasProto2Unittest_corge: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_corge)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_corge`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_corge`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_corge() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_corge)
+  mutating func clearProto2Unittest_corge() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_corge)
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType2 {
+extension Proto2Unittest_ComplexOptionType2 {
 
-  var ProtobufUnittest_grault: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_grault) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_grault, value: newValue)}
+  var Proto2Unittest_grault: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_grault) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_grault, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_grault`
+  /// Returns true if extension `Proto2Unittest_Extensions_grault`
   /// has been explicitly set.
-  var hasProtobufUnittest_grault: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_grault)
+  var hasProto2Unittest_grault: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_grault)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_grault`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_grault`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_grault() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_grault)
+  mutating func clearProto2Unittest_grault() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_grault)
   }
 
-  var ProtobufUnittest_garply: ProtobufUnittest_ComplexOptionType1 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_garply) ?? ProtobufUnittest_ComplexOptionType1()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_garply, value: newValue)}
+  var Proto2Unittest_garply: Proto2Unittest_ComplexOptionType1 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_garply) ?? Proto2Unittest_ComplexOptionType1()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_garply, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_garply`
+  /// Returns true if extension `Proto2Unittest_Extensions_garply`
   /// has been explicitly set.
-  var hasProtobufUnittest_garply: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_garply)
+  var hasProto2Unittest_garply: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_garply)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_garply`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_garply`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_garply() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_garply)
+  mutating func clearProto2Unittest_garply() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_garply)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_EnumOptions {
 
-  var ProtobufUnittest_enumOpt1: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt1, value: newValue)}
+  var Proto2Unittest_enumOpt1: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enum_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enum_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enum_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_enum_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt1)
+  var hasProto2Unittest_enumOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enum_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enum_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enum_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt1)
+  mutating func clearProto2Unittest_enumOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enum_opt1)
   }
 
-  var ProtobufUnittest_enumopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enumopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enumopt, value: newValue)}
+  var Proto2Unittest_enumopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enumopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enumopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enumopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_enumopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enumopt)
+  var hasProto2Unittest_enumopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enumopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enumopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enumopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enumopt)
+  mutating func clearProto2Unittest_enumopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enumopt)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_EnumValueOptions {
 
-  var ProtobufUnittest_enumValueOpt1: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enum_value_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enum_value_opt1, value: newValue)}
+  var Proto2Unittest_enumValueOpt1: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enum_value_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enum_value_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enum_value_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_enum_value_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumValueOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enum_value_opt1)
+  var hasProto2Unittest_enumValueOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enum_value_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enum_value_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enum_value_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumValueOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enum_value_opt1)
+  mutating func clearProto2Unittest_enumValueOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enum_value_opt1)
   }
 
-  var ProtobufUnittest_enumvalopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enumvalopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enumvalopt, value: newValue)}
+  var Proto2Unittest_enumvalopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enumvalopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enumvalopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enumvalopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_enumvalopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumvalopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enumvalopt)
+  var hasProto2Unittest_enumvalopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enumvalopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enumvalopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enumvalopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumvalopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enumvalopt)
+  mutating func clearProto2Unittest_enumvalopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enumvalopt)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_FieldOptions {
 
-  var ProtobufUnittest_fieldOpt1: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_field_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_field_opt1, value: newValue)}
+  var Proto2Unittest_fieldOpt1: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_field_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_field_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_field_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_field_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_fieldOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_field_opt1)
+  var hasProto2Unittest_fieldOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_field_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_field_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_field_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fieldOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_field_opt1)
+  mutating func clearProto2Unittest_fieldOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_field_opt1)
   }
 
   /// This is useful for testing that we correctly register default values for
   /// extension options.
-  var ProtobufUnittest_fieldOpt2: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_field_opt2) ?? 42}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_field_opt2, value: newValue)}
+  var Proto2Unittest_fieldOpt2: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_field_opt2) ?? 42}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_field_opt2, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_field_opt2`
+  /// Returns true if extension `Proto2Unittest_Extensions_field_opt2`
   /// has been explicitly set.
-  var hasProtobufUnittest_fieldOpt2: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_field_opt2)
+  var hasProto2Unittest_fieldOpt2: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_field_opt2)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_field_opt2`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_field_opt2`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fieldOpt2() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_field_opt2)
+  mutating func clearProto2Unittest_fieldOpt2() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_field_opt2)
   }
 
-  var ProtobufUnittest_fieldopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_fieldopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_fieldopt, value: newValue)}
+  var Proto2Unittest_fieldopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_fieldopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_fieldopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_fieldopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_fieldopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_fieldopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_fieldopt)
+  var hasProto2Unittest_fieldopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_fieldopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_fieldopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_fieldopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fieldopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_fieldopt)
+  mutating func clearProto2Unittest_fieldopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_fieldopt)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_FileOptions {
 
-  var ProtobufUnittest_fileOpt1: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_file_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_file_opt1, value: newValue)}
+  var Proto2Unittest_fileOpt1: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_file_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_file_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_file_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_file_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_fileOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_file_opt1)
+  var hasProto2Unittest_fileOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_file_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_file_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_file_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fileOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_file_opt1)
+  mutating func clearProto2Unittest_fileOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_file_opt1)
   }
 
-  var ProtobufUnittest_fileopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_fileopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_fileopt, value: newValue)}
+  var Proto2Unittest_fileopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_fileopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_fileopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_fileopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_fileopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_fileopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_fileopt)
+  var hasProto2Unittest_fileopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_fileopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_fileopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_fileopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fileopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_fileopt)
+  mutating func clearProto2Unittest_fileopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_fileopt)
   }
 
-  var ProtobufUnittest_Aggregate_nested: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Aggregate.Extensions.nested) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Aggregate.Extensions.nested, value: newValue)}
+  var Proto2Unittest_Aggregate_nested: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Aggregate.Extensions.nested) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Aggregate.Extensions.nested, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Aggregate.Extensions.nested`
+  /// Returns true if extension `Proto2Unittest_Aggregate.Extensions.nested`
   /// has been explicitly set.
-  var hasProtobufUnittest_Aggregate_nested: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Aggregate.Extensions.nested)
+  var hasProto2Unittest_Aggregate_nested: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Aggregate.Extensions.nested)
   }
-  /// Clears the value of extension `ProtobufUnittest_Aggregate.Extensions.nested`.
+  /// Clears the value of extension `Proto2Unittest_Aggregate.Extensions.nested`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_Aggregate_nested() {
-    clearExtensionValue(ext: ProtobufUnittest_Aggregate.Extensions.nested)
+  mutating func clearProto2Unittest_Aggregate_nested() {
+    clearExtensionValue(ext: Proto2Unittest_Aggregate.Extensions.nested)
   }
 
-  var ProtobufUnittest_NestedOptionType_nestedExtension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_NestedOptionType.Extensions.nested_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_NestedOptionType.Extensions.nested_extension, value: newValue)}
+  var Proto2Unittest_NestedOptionType_nestedExtension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_NestedOptionType.Extensions.nested_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_NestedOptionType.Extensions.nested_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_NestedOptionType.Extensions.nested_extension`
+  /// Returns true if extension `Proto2Unittest_NestedOptionType.Extensions.nested_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_NestedOptionType_nestedExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_NestedOptionType.Extensions.nested_extension)
+  var hasProto2Unittest_NestedOptionType_nestedExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_NestedOptionType.Extensions.nested_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_NestedOptionType.Extensions.nested_extension`.
+  /// Clears the value of extension `Proto2Unittest_NestedOptionType.Extensions.nested_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_NestedOptionType_nestedExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_NestedOptionType.Extensions.nested_extension)
+  mutating func clearProto2Unittest_NestedOptionType_nestedExtension() {
+    clearExtensionValue(ext: Proto2Unittest_NestedOptionType.Extensions.nested_extension)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_MessageOptions {
 
-  var ProtobufUnittest_messageOpt1: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_message_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_message_opt1, value: newValue)}
+  var Proto2Unittest_messageOpt1: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_message_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_message_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_message_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_message_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_messageOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_message_opt1)
+  var hasProto2Unittest_messageOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_message_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_message_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_message_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_messageOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_message_opt1)
+  mutating func clearProto2Unittest_messageOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_message_opt1)
   }
 
-  var ProtobufUnittest_boolOpt: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_bool_opt) ?? false}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_bool_opt, value: newValue)}
+  var Proto2Unittest_boolOpt: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_bool_opt) ?? false}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_bool_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_bool_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_bool_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_boolOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_bool_opt)
+  var hasProto2Unittest_boolOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_bool_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_bool_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_bool_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_boolOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_bool_opt)
+  mutating func clearProto2Unittest_boolOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_bool_opt)
   }
 
-  var ProtobufUnittest_int32Opt: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_int32_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_int32_opt, value: newValue)}
+  var Proto2Unittest_int32Opt: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_int32_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_int32_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_int32_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_int32_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_int32Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_int32_opt)
+  var hasProto2Unittest_int32Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_int32_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_int32_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_int32_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_int32Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_int32_opt)
+  mutating func clearProto2Unittest_int32Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_int32_opt)
   }
 
-  var ProtobufUnittest_int64Opt: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_int64_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_int64_opt, value: newValue)}
+  var Proto2Unittest_int64Opt: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_int64_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_int64_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_int64_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_int64_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_int64Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_int64_opt)
+  var hasProto2Unittest_int64Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_int64_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_int64_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_int64_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_int64Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_int64_opt)
+  mutating func clearProto2Unittest_int64Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_int64_opt)
   }
 
-  var ProtobufUnittest_uint32Opt: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_uint32_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_uint32_opt, value: newValue)}
+  var Proto2Unittest_uint32Opt: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_uint32_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_uint32_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_uint32_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_uint32_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_uint32Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_uint32_opt)
+  var hasProto2Unittest_uint32Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_uint32_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_uint32_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_uint32_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_uint32Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_uint32_opt)
+  mutating func clearProto2Unittest_uint32Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_uint32_opt)
   }
 
-  var ProtobufUnittest_uint64Opt: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_uint64_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_uint64_opt, value: newValue)}
+  var Proto2Unittest_uint64Opt: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_uint64_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_uint64_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_uint64_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_uint64_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_uint64Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_uint64_opt)
+  var hasProto2Unittest_uint64Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_uint64_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_uint64_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_uint64_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_uint64Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_uint64_opt)
+  mutating func clearProto2Unittest_uint64Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_uint64_opt)
   }
 
-  var ProtobufUnittest_sint32Opt: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_sint32_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_sint32_opt, value: newValue)}
+  var Proto2Unittest_sint32Opt: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_sint32_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_sint32_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_sint32_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_sint32_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_sint32Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_sint32_opt)
+  var hasProto2Unittest_sint32Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_sint32_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_sint32_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_sint32_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_sint32Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_sint32_opt)
+  mutating func clearProto2Unittest_sint32Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_sint32_opt)
   }
 
-  var ProtobufUnittest_sint64Opt: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_sint64_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_sint64_opt, value: newValue)}
+  var Proto2Unittest_sint64Opt: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_sint64_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_sint64_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_sint64_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_sint64_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_sint64Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_sint64_opt)
+  var hasProto2Unittest_sint64Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_sint64_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_sint64_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_sint64_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_sint64Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_sint64_opt)
+  mutating func clearProto2Unittest_sint64Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_sint64_opt)
   }
 
-  var ProtobufUnittest_fixed32Opt: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_fixed32_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_fixed32_opt, value: newValue)}
+  var Proto2Unittest_fixed32Opt: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_fixed32_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_fixed32_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_fixed32_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_fixed32_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_fixed32Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_fixed32_opt)
+  var hasProto2Unittest_fixed32Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_fixed32_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_fixed32_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_fixed32_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fixed32Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_fixed32_opt)
+  mutating func clearProto2Unittest_fixed32Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_fixed32_opt)
   }
 
-  var ProtobufUnittest_fixed64Opt: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_fixed64_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_fixed64_opt, value: newValue)}
+  var Proto2Unittest_fixed64Opt: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_fixed64_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_fixed64_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_fixed64_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_fixed64_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_fixed64Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_fixed64_opt)
+  var hasProto2Unittest_fixed64Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_fixed64_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_fixed64_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_fixed64_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fixed64Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_fixed64_opt)
+  mutating func clearProto2Unittest_fixed64Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_fixed64_opt)
   }
 
-  var ProtobufUnittest_sfixed32Opt: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_sfixed32_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_sfixed32_opt, value: newValue)}
+  var Proto2Unittest_sfixed32Opt: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_sfixed32_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_sfixed32_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_sfixed32_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_sfixed32_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_sfixed32Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_sfixed32_opt)
+  var hasProto2Unittest_sfixed32Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_sfixed32_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_sfixed32_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_sfixed32_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_sfixed32Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_sfixed32_opt)
+  mutating func clearProto2Unittest_sfixed32Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_sfixed32_opt)
   }
 
-  var ProtobufUnittest_sfixed64Opt: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_sfixed64_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_sfixed64_opt, value: newValue)}
+  var Proto2Unittest_sfixed64Opt: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_sfixed64_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_sfixed64_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_sfixed64_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_sfixed64_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_sfixed64Opt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_sfixed64_opt)
+  var hasProto2Unittest_sfixed64Opt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_sfixed64_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_sfixed64_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_sfixed64_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_sfixed64Opt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_sfixed64_opt)
+  mutating func clearProto2Unittest_sfixed64Opt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_sfixed64_opt)
   }
 
-  var ProtobufUnittest_floatOpt: Float {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_float_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_float_opt, value: newValue)}
+  var Proto2Unittest_floatOpt: Float {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_float_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_float_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_float_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_float_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_floatOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_float_opt)
+  var hasProto2Unittest_floatOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_float_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_float_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_float_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_floatOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_float_opt)
+  mutating func clearProto2Unittest_floatOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_float_opt)
   }
 
-  var ProtobufUnittest_doubleOpt: Double {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_double_opt) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_double_opt, value: newValue)}
+  var Proto2Unittest_doubleOpt: Double {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_double_opt) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_double_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_double_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_double_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_doubleOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_double_opt)
+  var hasProto2Unittest_doubleOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_double_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_double_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_double_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_doubleOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_double_opt)
+  mutating func clearProto2Unittest_doubleOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_double_opt)
   }
 
-  var ProtobufUnittest_stringOpt: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_string_opt) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_string_opt, value: newValue)}
+  var Proto2Unittest_stringOpt: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_string_opt) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_string_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_string_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_string_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_stringOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_string_opt)
+  var hasProto2Unittest_stringOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_string_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_string_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_string_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_stringOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_string_opt)
+  mutating func clearProto2Unittest_stringOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_string_opt)
   }
 
-  var ProtobufUnittest_bytesOpt: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_bytes_opt) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_bytes_opt, value: newValue)}
+  var Proto2Unittest_bytesOpt: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_bytes_opt) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_bytes_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_bytes_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_bytes_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_bytesOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_bytes_opt)
+  var hasProto2Unittest_bytesOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_bytes_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_bytes_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_bytes_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_bytesOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_bytes_opt)
+  mutating func clearProto2Unittest_bytesOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_bytes_opt)
   }
 
-  var ProtobufUnittest_enumOpt: ProtobufUnittest_DummyMessageContainingEnum.TestEnumType {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt) ?? .testOptionEnumType1}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt, value: newValue)}
+  var Proto2Unittest_enumOpt: Proto2Unittest_DummyMessageContainingEnum.TestEnumType {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enum_opt) ?? .testOptionEnumType1}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enum_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enum_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_enum_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt)
+  var hasProto2Unittest_enumOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enum_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enum_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enum_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enum_opt)
+  mutating func clearProto2Unittest_enumOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enum_opt)
   }
 
-  var ProtobufUnittest_messageTypeOpt: ProtobufUnittest_DummyMessageInvalidAsOptionType {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_message_type_opt) ?? ProtobufUnittest_DummyMessageInvalidAsOptionType()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_message_type_opt, value: newValue)}
+  var Proto2Unittest_messageTypeOpt: Proto2Unittest_DummyMessageInvalidAsOptionType {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_message_type_opt) ?? Proto2Unittest_DummyMessageInvalidAsOptionType()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_message_type_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_message_type_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_message_type_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_messageTypeOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_message_type_opt)
+  var hasProto2Unittest_messageTypeOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_message_type_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_message_type_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_message_type_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_messageTypeOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_message_type_opt)
+  mutating func clearProto2Unittest_messageTypeOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_message_type_opt)
   }
 
-  var ProtobufUnittest_complexOpt1: ProtobufUnittest_ComplexOptionType1 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt1) ?? ProtobufUnittest_ComplexOptionType1()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt1, value: newValue)}
+  var Proto2Unittest_complexOpt1: Proto2Unittest_ComplexOptionType1 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_complex_opt1) ?? Proto2Unittest_ComplexOptionType1()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_complex_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_complex_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_complex_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_complexOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt1)
+  var hasProto2Unittest_complexOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_complex_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_complex_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_complex_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_complexOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt1)
+  mutating func clearProto2Unittest_complexOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_complex_opt1)
   }
 
-  var ProtobufUnittest_complexOpt2: ProtobufUnittest_ComplexOptionType2 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt2) ?? ProtobufUnittest_ComplexOptionType2()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt2, value: newValue)}
+  var Proto2Unittest_complexOpt2: Proto2Unittest_ComplexOptionType2 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_complex_opt2) ?? Proto2Unittest_ComplexOptionType2()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_complex_opt2, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_complex_opt2`
+  /// Returns true if extension `Proto2Unittest_Extensions_complex_opt2`
   /// has been explicitly set.
-  var hasProtobufUnittest_complexOpt2: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt2)
+  var hasProto2Unittest_complexOpt2: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_complex_opt2)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_complex_opt2`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_complex_opt2`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_complexOpt2() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt2)
+  mutating func clearProto2Unittest_complexOpt2() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_complex_opt2)
   }
 
-  var ProtobufUnittest_complexOpt3: ProtobufUnittest_ComplexOptionType3 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt3) ?? ProtobufUnittest_ComplexOptionType3()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt3, value: newValue)}
+  var Proto2Unittest_complexOpt3: Proto2Unittest_ComplexOptionType3 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_complex_opt3) ?? Proto2Unittest_ComplexOptionType3()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_complex_opt3, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_complex_opt3`
+  /// Returns true if extension `Proto2Unittest_Extensions_complex_opt3`
   /// has been explicitly set.
-  var hasProtobufUnittest_complexOpt3: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt3)
+  var hasProto2Unittest_complexOpt3: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_complex_opt3)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_complex_opt3`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_complex_opt3`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_complexOpt3() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_complex_opt3)
+  mutating func clearProto2Unittest_complexOpt3() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_complex_opt3)
   }
 
-  var ProtobufUnittest_complexOpt6: ProtobufUnittest_ComplexOpt6 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_ComplexOpt6) ?? ProtobufUnittest_ComplexOpt6()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_ComplexOpt6, value: newValue)}
+  var Proto2Unittest_complexOpt6: Proto2Unittest_ComplexOpt6 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_ComplexOpt6) ?? Proto2Unittest_ComplexOpt6()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_ComplexOpt6, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_ComplexOpt6`
+  /// Returns true if extension `Proto2Unittest_Extensions_ComplexOpt6`
   /// has been explicitly set.
-  var hasProtobufUnittest_complexOpt6: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_ComplexOpt6)
+  var hasProto2Unittest_complexOpt6: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_ComplexOpt6)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_ComplexOpt6`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_ComplexOpt6`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_complexOpt6() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_ComplexOpt6)
+  mutating func clearProto2Unittest_complexOpt6() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_ComplexOpt6)
   }
 
-  var ProtobufUnittest_msgopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_msgopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_msgopt, value: newValue)}
+  var Proto2Unittest_msgopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_msgopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_msgopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_msgopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_msgopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_msgopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_msgopt)
+  var hasProto2Unittest_msgopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_msgopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_msgopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_msgopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_msgopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_msgopt)
+  mutating func clearProto2Unittest_msgopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_msgopt)
   }
 
-  var ProtobufUnittest_requiredEnumOpt: ProtobufUnittest_OldOptionType {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_required_enum_opt) ?? ProtobufUnittest_OldOptionType()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_required_enum_opt, value: newValue)}
+  var Proto2Unittest_requiredEnumOpt: Proto2Unittest_OldOptionType {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_required_enum_opt) ?? Proto2Unittest_OldOptionType()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_required_enum_opt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_required_enum_opt`
+  /// Returns true if extension `Proto2Unittest_Extensions_required_enum_opt`
   /// has been explicitly set.
-  var hasProtobufUnittest_requiredEnumOpt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_required_enum_opt)
+  var hasProto2Unittest_requiredEnumOpt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_required_enum_opt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_required_enum_opt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_required_enum_opt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_requiredEnumOpt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_required_enum_opt)
+  mutating func clearProto2Unittest_requiredEnumOpt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_required_enum_opt)
   }
 
-  var ProtobufUnittest_ComplexOptionType2_ComplexOptionType4_complexOpt4: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4 {
-    get {return getExtensionValue(ext: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4) ?? ProtobufUnittest_ComplexOptionType2.ComplexOptionType4()}
-    set {setExtensionValue(ext: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4, value: newValue)}
+  var Proto2Unittest_ComplexOptionType2_ComplexOptionType4_complexOpt4: Proto2Unittest_ComplexOptionType2.ComplexOptionType4 {
+    get {return getExtensionValue(ext: Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4) ?? Proto2Unittest_ComplexOptionType2.ComplexOptionType4()}
+    set {setExtensionValue(ext: Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4`
+  /// Returns true if extension `Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4`
   /// has been explicitly set.
-  var hasProtobufUnittest_ComplexOptionType2_ComplexOptionType4_complexOpt4: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4)
+  var hasProto2Unittest_ComplexOptionType2_ComplexOptionType4_complexOpt4: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4)
   }
-  /// Clears the value of extension `ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4`.
+  /// Clears the value of extension `Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_ComplexOptionType2_ComplexOptionType4_complexOpt4() {
-    clearExtensionValue(ext: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4)
+  mutating func clearProto2Unittest_ComplexOptionType2_ComplexOptionType4_complexOpt4() {
+    clearExtensionValue(ext: Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_MethodOptions {
 
-  var ProtobufUnittest_methodOpt1: ProtobufUnittest_MethodOpt1 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_method_opt1) ?? .val1}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_method_opt1, value: newValue)}
+  var Proto2Unittest_methodOpt1: Proto2Unittest_MethodOpt1 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_method_opt1) ?? .val1}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_method_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_method_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_method_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_methodOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_method_opt1)
+  var hasProto2Unittest_methodOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_method_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_method_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_method_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_methodOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_method_opt1)
+  mutating func clearProto2Unittest_methodOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_method_opt1)
   }
 
-  var ProtobufUnittest_methodopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_methodopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_methodopt, value: newValue)}
+  var Proto2Unittest_methodopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_methodopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_methodopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_methodopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_methodopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_methodopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_methodopt)
+  var hasProto2Unittest_methodopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_methodopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_methodopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_methodopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_methodopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_methodopt)
+  mutating func clearProto2Unittest_methodopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_methodopt)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_OneofOptions {
 
-  var ProtobufUnittest_oneofOpt1: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_opt1, value: newValue)}
+  var Proto2Unittest_oneofOpt1: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_opt1)
+  var hasProto2Unittest_oneofOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_opt1)
+  mutating func clearProto2Unittest_oneofOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_opt1)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_ServiceOptions {
 
-  var ProtobufUnittest_serviceOpt1: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_service_opt1) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_service_opt1, value: newValue)}
+  var Proto2Unittest_serviceOpt1: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_service_opt1) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_service_opt1, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_service_opt1`
+  /// Returns true if extension `Proto2Unittest_Extensions_service_opt1`
   /// has been explicitly set.
-  var hasProtobufUnittest_serviceOpt1: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_service_opt1)
+  var hasProto2Unittest_serviceOpt1: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_service_opt1)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_service_opt1`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_service_opt1`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_serviceOpt1() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_service_opt1)
+  mutating func clearProto2Unittest_serviceOpt1() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_service_opt1)
   }
 
-  var ProtobufUnittest_serviceopt: ProtobufUnittest_Aggregate {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_serviceopt) ?? ProtobufUnittest_Aggregate()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_serviceopt, value: newValue)}
+  var Proto2Unittest_serviceopt: Proto2Unittest_Aggregate {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_serviceopt) ?? Proto2Unittest_Aggregate()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_serviceopt, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_serviceopt`
+  /// Returns true if extension `Proto2Unittest_Extensions_serviceopt`
   /// has been explicitly set.
-  var hasProtobufUnittest_serviceopt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_serviceopt)
+  var hasProto2Unittest_serviceopt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_serviceopt)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_serviceopt`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_serviceopt`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_serviceopt() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_serviceopt)
+  mutating func clearProto2Unittest_serviceopt() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_serviceopt)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestCustomOptions_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestCustomOptions_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestCustomOptions_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Extensions_file_opt1,
-  ProtobufUnittest_Extensions_message_opt1,
-  ProtobufUnittest_Extensions_field_opt1,
-  ProtobufUnittest_Extensions_field_opt2,
-  ProtobufUnittest_Extensions_oneof_opt1,
-  ProtobufUnittest_Extensions_enum_opt1,
-  ProtobufUnittest_Extensions_enum_value_opt1,
-  ProtobufUnittest_Extensions_service_opt1,
-  ProtobufUnittest_Extensions_method_opt1,
-  ProtobufUnittest_Extensions_bool_opt,
-  ProtobufUnittest_Extensions_int32_opt,
-  ProtobufUnittest_Extensions_int64_opt,
-  ProtobufUnittest_Extensions_uint32_opt,
-  ProtobufUnittest_Extensions_uint64_opt,
-  ProtobufUnittest_Extensions_sint32_opt,
-  ProtobufUnittest_Extensions_sint64_opt,
-  ProtobufUnittest_Extensions_fixed32_opt,
-  ProtobufUnittest_Extensions_fixed64_opt,
-  ProtobufUnittest_Extensions_sfixed32_opt,
-  ProtobufUnittest_Extensions_sfixed64_opt,
-  ProtobufUnittest_Extensions_float_opt,
-  ProtobufUnittest_Extensions_double_opt,
-  ProtobufUnittest_Extensions_string_opt,
-  ProtobufUnittest_Extensions_bytes_opt,
-  ProtobufUnittest_Extensions_enum_opt,
-  ProtobufUnittest_Extensions_message_type_opt,
-  ProtobufUnittest_Extensions_mooo,
-  ProtobufUnittest_Extensions_corge,
-  ProtobufUnittest_Extensions_grault,
-  ProtobufUnittest_Extensions_garply,
-  ProtobufUnittest_Extensions_complex_opt1,
-  ProtobufUnittest_Extensions_complex_opt2,
-  ProtobufUnittest_Extensions_complex_opt3,
-  ProtobufUnittest_Extensions_ComplexOpt6,
-  ProtobufUnittest_Extensions_fileopt,
-  ProtobufUnittest_Extensions_msgopt,
-  ProtobufUnittest_Extensions_fieldopt,
-  ProtobufUnittest_Extensions_enumopt,
-  ProtobufUnittest_Extensions_enumvalopt,
-  ProtobufUnittest_Extensions_serviceopt,
-  ProtobufUnittest_Extensions_methodopt,
-  ProtobufUnittest_Extensions_required_enum_opt,
-  ProtobufUnittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4,
-  ProtobufUnittest_AggregateMessageSetElement.Extensions.message_set_extension,
-  ProtobufUnittest_Aggregate.Extensions.nested,
-  ProtobufUnittest_NestedOptionType.Extensions.nested_extension
+let Proto2Unittest_UnittestCustomOptions_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_file_opt1,
+  Proto2Unittest_Extensions_message_opt1,
+  Proto2Unittest_Extensions_field_opt1,
+  Proto2Unittest_Extensions_field_opt2,
+  Proto2Unittest_Extensions_oneof_opt1,
+  Proto2Unittest_Extensions_enum_opt1,
+  Proto2Unittest_Extensions_enum_value_opt1,
+  Proto2Unittest_Extensions_service_opt1,
+  Proto2Unittest_Extensions_method_opt1,
+  Proto2Unittest_Extensions_bool_opt,
+  Proto2Unittest_Extensions_int32_opt,
+  Proto2Unittest_Extensions_int64_opt,
+  Proto2Unittest_Extensions_uint32_opt,
+  Proto2Unittest_Extensions_uint64_opt,
+  Proto2Unittest_Extensions_sint32_opt,
+  Proto2Unittest_Extensions_sint64_opt,
+  Proto2Unittest_Extensions_fixed32_opt,
+  Proto2Unittest_Extensions_fixed64_opt,
+  Proto2Unittest_Extensions_sfixed32_opt,
+  Proto2Unittest_Extensions_sfixed64_opt,
+  Proto2Unittest_Extensions_float_opt,
+  Proto2Unittest_Extensions_double_opt,
+  Proto2Unittest_Extensions_string_opt,
+  Proto2Unittest_Extensions_bytes_opt,
+  Proto2Unittest_Extensions_enum_opt,
+  Proto2Unittest_Extensions_message_type_opt,
+  Proto2Unittest_Extensions_mooo,
+  Proto2Unittest_Extensions_corge,
+  Proto2Unittest_Extensions_grault,
+  Proto2Unittest_Extensions_garply,
+  Proto2Unittest_Extensions_complex_opt1,
+  Proto2Unittest_Extensions_complex_opt2,
+  Proto2Unittest_Extensions_complex_opt3,
+  Proto2Unittest_Extensions_ComplexOpt6,
+  Proto2Unittest_Extensions_fileopt,
+  Proto2Unittest_Extensions_msgopt,
+  Proto2Unittest_Extensions_fieldopt,
+  Proto2Unittest_Extensions_enumopt,
+  Proto2Unittest_Extensions_enumvalopt,
+  Proto2Unittest_Extensions_serviceopt,
+  Proto2Unittest_Extensions_methodopt,
+  Proto2Unittest_Extensions_required_enum_opt,
+  Proto2Unittest_ComplexOptionType2.ComplexOptionType4.Extensions.complex_opt4,
+  Proto2Unittest_AggregateMessageSetElement.Extensions.message_set_extension,
+  Proto2Unittest_Aggregate.Extensions.nested,
+  Proto2Unittest_NestedOptionType.Extensions.nested_extension
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufUnittest_Extensions_file_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_file_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 7736974,
-  fieldName: "protobuf_unittest.file_opt1"
+  fieldName: "proto2_unittest.file_opt1"
 )
 
-let ProtobufUnittest_Extensions_message_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_message_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7739036,
-  fieldName: "protobuf_unittest.message_opt1"
+  fieldName: "proto2_unittest.message_opt1"
 )
 
-let ProtobufUnittest_Extensions_field_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+let Proto2Unittest_Extensions_field_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
   _protobuf_fieldNumber: 7740936,
-  fieldName: "protobuf_unittest.field_opt1"
+  fieldName: "proto2_unittest.field_opt1"
 )
 
 /// This is useful for testing that we correctly register default values for
 /// extension options.
-let ProtobufUnittest_Extensions_field_opt2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+let Proto2Unittest_Extensions_field_opt2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
   _protobuf_fieldNumber: 7753913,
-  fieldName: "protobuf_unittest.field_opt2"
+  fieldName: "proto2_unittest.field_opt2"
 )
 
-let ProtobufUnittest_Extensions_oneof_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_OneofOptions>(
+let Proto2Unittest_Extensions_oneof_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_OneofOptions>(
   _protobuf_fieldNumber: 7740111,
-  fieldName: "protobuf_unittest.oneof_opt1"
+  fieldName: "proto2_unittest.oneof_opt1"
 )
 
-let ProtobufUnittest_Extensions_enum_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
+let Proto2Unittest_Extensions_enum_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
   _protobuf_fieldNumber: 7753576,
-  fieldName: "protobuf_unittest.enum_opt1"
+  fieldName: "proto2_unittest.enum_opt1"
 )
 
-let ProtobufUnittest_Extensions_enum_value_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
+let Proto2Unittest_Extensions_enum_value_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
   _protobuf_fieldNumber: 1560678,
-  fieldName: "protobuf_unittest.enum_value_opt1"
+  fieldName: "proto2_unittest.enum_value_opt1"
 )
 
-let ProtobufUnittest_Extensions_service_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
+let Proto2Unittest_Extensions_service_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
   _protobuf_fieldNumber: 7887650,
-  fieldName: "protobuf_unittest.service_opt1"
+  fieldName: "proto2_unittest.service_opt1"
 )
 
-let ProtobufUnittest_Extensions_method_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_MethodOpt1>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
+let Proto2Unittest_Extensions_method_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_MethodOpt1>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
   _protobuf_fieldNumber: 7890860,
-  fieldName: "protobuf_unittest.method_opt1"
+  fieldName: "proto2_unittest.method_opt1"
 )
 
-let ProtobufUnittest_Extensions_bool_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_bool_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7706090,
-  fieldName: "protobuf_unittest.bool_opt"
+  fieldName: "proto2_unittest.bool_opt"
 )
 
-let ProtobufUnittest_Extensions_int32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_int32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7705709,
-  fieldName: "protobuf_unittest.int32_opt"
+  fieldName: "proto2_unittest.int32_opt"
 )
 
-let ProtobufUnittest_Extensions_int64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_int64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7705542,
-  fieldName: "protobuf_unittest.int64_opt"
+  fieldName: "proto2_unittest.int64_opt"
 )
 
-let ProtobufUnittest_Extensions_uint32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_uint32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7704880,
-  fieldName: "protobuf_unittest.uint32_opt"
+  fieldName: "proto2_unittest.uint32_opt"
 )
 
-let ProtobufUnittest_Extensions_uint64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_uint64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7702367,
-  fieldName: "protobuf_unittest.uint64_opt"
+  fieldName: "proto2_unittest.uint64_opt"
 )
 
-let ProtobufUnittest_Extensions_sint32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_sint32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7701568,
-  fieldName: "protobuf_unittest.sint32_opt"
+  fieldName: "proto2_unittest.sint32_opt"
 )
 
-let ProtobufUnittest_Extensions_sint64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_sint64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7700863,
-  fieldName: "protobuf_unittest.sint64_opt"
+  fieldName: "proto2_unittest.sint64_opt"
 )
 
-let ProtobufUnittest_Extensions_fixed32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_fixed32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7700307,
-  fieldName: "protobuf_unittest.fixed32_opt"
+  fieldName: "proto2_unittest.fixed32_opt"
 )
 
-let ProtobufUnittest_Extensions_fixed64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_fixed64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7700194,
-  fieldName: "protobuf_unittest.fixed64_opt"
+  fieldName: "proto2_unittest.fixed64_opt"
 )
 
-let ProtobufUnittest_Extensions_sfixed32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_sfixed32_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7698645,
-  fieldName: "protobuf_unittest.sfixed32_opt"
+  fieldName: "proto2_unittest.sfixed32_opt"
 )
 
-let ProtobufUnittest_Extensions_sfixed64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_sfixed64_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7685475,
-  fieldName: "protobuf_unittest.sfixed64_opt"
+  fieldName: "proto2_unittest.sfixed64_opt"
 )
 
-let ProtobufUnittest_Extensions_float_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_float_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7675390,
-  fieldName: "protobuf_unittest.float_opt"
+  fieldName: "proto2_unittest.float_opt"
 )
 
-let ProtobufUnittest_Extensions_double_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_double_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7673293,
-  fieldName: "protobuf_unittest.double_opt"
+  fieldName: "proto2_unittest.double_opt"
 )
 
-let ProtobufUnittest_Extensions_string_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_string_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7673285,
-  fieldName: "protobuf_unittest.string_opt"
+  fieldName: "proto2_unittest.string_opt"
 )
 
-let ProtobufUnittest_Extensions_bytes_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_bytes_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7673238,
-  fieldName: "protobuf_unittest.bytes_opt"
+  fieldName: "proto2_unittest.bytes_opt"
 )
 
-let ProtobufUnittest_Extensions_enum_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_DummyMessageContainingEnum.TestEnumType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_enum_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_DummyMessageContainingEnum.TestEnumType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7673233,
-  fieldName: "protobuf_unittest.enum_opt"
+  fieldName: "proto2_unittest.enum_opt"
 )
 
-let ProtobufUnittest_Extensions_message_type_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_DummyMessageInvalidAsOptionType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_message_type_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_DummyMessageInvalidAsOptionType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7665967,
-  fieldName: "protobuf_unittest.message_type_opt"
+  fieldName: "proto2_unittest.message_type_opt"
 )
 
-let ProtobufUnittest_Extensions_mooo = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_ComplexOptionType1>(
+let Proto2Unittest_Extensions_mooo = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_ComplexOptionType1>(
   _protobuf_fieldNumber: 7663707,
-  fieldName: "protobuf_unittest.mooo"
+  fieldName: "proto2_unittest.mooo"
 )
 
-let ProtobufUnittest_Extensions_corge = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType3>, ProtobufUnittest_ComplexOptionType1>(
+let Proto2Unittest_Extensions_corge = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType3>, Proto2Unittest_ComplexOptionType1>(
   _protobuf_fieldNumber: 7663442,
-  fieldName: "protobuf_unittest.corge"
+  fieldName: "proto2_unittest.corge"
 )
 
-let ProtobufUnittest_Extensions_grault = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_ComplexOptionType2>(
+let Proto2Unittest_Extensions_grault = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_ComplexOptionType2>(
   _protobuf_fieldNumber: 7650927,
-  fieldName: "protobuf_unittest.grault"
+  fieldName: "proto2_unittest.grault"
 )
 
-let ProtobufUnittest_Extensions_garply = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType1>, ProtobufUnittest_ComplexOptionType2>(
+let Proto2Unittest_Extensions_garply = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType1>, Proto2Unittest_ComplexOptionType2>(
   _protobuf_fieldNumber: 7649992,
-  fieldName: "protobuf_unittest.garply"
+  fieldName: "proto2_unittest.garply"
 )
 
-let ProtobufUnittest_Extensions_complex_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType1>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_complex_opt1 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType1>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7646756,
-  fieldName: "protobuf_unittest.complex_opt1"
+  fieldName: "proto2_unittest.complex_opt1"
 )
 
-let ProtobufUnittest_Extensions_complex_opt2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType2>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_complex_opt2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType2>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7636949,
-  fieldName: "protobuf_unittest.complex_opt2"
+  fieldName: "proto2_unittest.complex_opt2"
 )
 
-let ProtobufUnittest_Extensions_complex_opt3 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType3>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_complex_opt3 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType3>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7636463,
-  fieldName: "protobuf_unittest.complex_opt3"
+  fieldName: "proto2_unittest.complex_opt3"
 )
 
-let ProtobufUnittest_Extensions_ComplexOpt6 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufUnittest_ComplexOpt6>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_ComplexOpt6 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<Proto2Unittest_ComplexOpt6>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 7595468,
-  fieldName: "protobuf_unittest.complexopt6"
+  fieldName: "proto2_unittest.complexopt6"
 )
 
-let ProtobufUnittest_Extensions_fileopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_fileopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 15478479,
-  fieldName: "protobuf_unittest.fileopt"
+  fieldName: "proto2_unittest.fileopt"
 )
 
-let ProtobufUnittest_Extensions_msgopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_msgopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 15480088,
-  fieldName: "protobuf_unittest.msgopt"
+  fieldName: "proto2_unittest.msgopt"
 )
 
-let ProtobufUnittest_Extensions_fieldopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+let Proto2Unittest_Extensions_fieldopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
   _protobuf_fieldNumber: 15481374,
-  fieldName: "protobuf_unittest.fieldopt"
+  fieldName: "proto2_unittest.fieldopt"
 )
 
-let ProtobufUnittest_Extensions_enumopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
+let Proto2Unittest_Extensions_enumopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
   _protobuf_fieldNumber: 15483218,
-  fieldName: "protobuf_unittest.enumopt"
+  fieldName: "proto2_unittest.enumopt"
 )
 
-let ProtobufUnittest_Extensions_enumvalopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
+let Proto2Unittest_Extensions_enumvalopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
   _protobuf_fieldNumber: 15486921,
-  fieldName: "protobuf_unittest.enumvalopt"
+  fieldName: "proto2_unittest.enumvalopt"
 )
 
-let ProtobufUnittest_Extensions_serviceopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
+let Proto2Unittest_Extensions_serviceopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
   _protobuf_fieldNumber: 15497145,
-  fieldName: "protobuf_unittest.serviceopt"
+  fieldName: "proto2_unittest.serviceopt"
 )
 
-let ProtobufUnittest_Extensions_methodopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
+let Proto2Unittest_Extensions_methodopt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
   _protobuf_fieldNumber: 15512713,
-  fieldName: "protobuf_unittest.methodopt"
+  fieldName: "proto2_unittest.methodopt"
 )
 
-let ProtobufUnittest_Extensions_required_enum_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OldOptionType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_required_enum_opt = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OldOptionType>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 106161807,
-  fieldName: "protobuf_unittest.required_enum_opt"
+  fieldName: "proto2_unittest.required_enum_opt"
 )
 
-extension ProtobufUnittest_ComplexOptionType2.ComplexOptionType4 {
+extension Proto2Unittest_ComplexOptionType2.ComplexOptionType4 {
   enum Extensions {
-    static let complex_opt4 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ComplexOptionType2.ComplexOptionType4>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+    static let complex_opt4 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ComplexOptionType2.ComplexOptionType4>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
       _protobuf_fieldNumber: 7633546,
-      fieldName: "protobuf_unittest.ComplexOptionType2.ComplexOptionType4.complex_opt4"
+      fieldName: "proto2_unittest.ComplexOptionType2.ComplexOptionType4.complex_opt4"
     )
   }
 }
 
-extension ProtobufUnittest_AggregateMessageSetElement {
+extension Proto2Unittest_AggregateMessageSetElement {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_AggregateMessageSetElement>, ProtobufUnittest_AggregateMessageSet>(
+    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_AggregateMessageSetElement>, Proto2Unittest_AggregateMessageSet>(
       _protobuf_fieldNumber: 15447542,
-      fieldName: "protobuf_unittest.AggregateMessageSetElement"
+      fieldName: "proto2_unittest.AggregateMessageSetElement"
     )
   }
 }
 
-extension ProtobufUnittest_Aggregate {
+extension Proto2Unittest_Aggregate {
   enum Extensions {
-    static let nested = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+    static let nested = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_Aggregate>, SwiftProtobuf.Google_Protobuf_FileOptions>(
       _protobuf_fieldNumber: 15476903,
-      fieldName: "protobuf_unittest.Aggregate.nested"
+      fieldName: "proto2_unittest.Aggregate.nested"
     )
   }
 }
 
-extension ProtobufUnittest_NestedOptionType {
+extension Proto2Unittest_NestedOptionType {
   enum Extensions {
     static let nested_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
       _protobuf_fieldNumber: 7912573,
-      fieldName: "protobuf_unittest.NestedOptionType.nested_extension"
+      fieldName: "proto2_unittest.NestedOptionType.nested_extension"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_MethodOpt1: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MethodOpt1: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "METHODOPT1_VAL1"),
     2: .same(proto: "METHODOPT1_VAL2"),
   ]
 }
 
-extension ProtobufUnittest_AggregateEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_AggregateEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "VALUE"),
   ]
 }
 
-extension ProtobufUnittest_TestMessageWithCustomOptions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageWithCustomOptions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageWithCustomOptions"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "field1"),
@@ -1804,7 +1804,7 @@ extension ProtobufUnittest_TestMessageWithCustomOptions: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageWithCustomOptions, rhs: ProtobufUnittest_TestMessageWithCustomOptions) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageWithCustomOptions, rhs: Proto2Unittest_TestMessageWithCustomOptions) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs.anOneof != rhs.anOneof {return false}
     if lhs.mapField != rhs.mapField {return false}
@@ -1813,14 +1813,14 @@ extension ProtobufUnittest_TestMessageWithCustomOptions: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_TestMessageWithCustomOptions.AnEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageWithCustomOptions.AnEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "ANENUM_VAL1"),
     2: .same(proto: "ANENUM_VAL2"),
   ]
 }
 
-extension ProtobufUnittest_CustomOptionFooRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionFooRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionFooRequest"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1833,13 +1833,13 @@ extension ProtobufUnittest_CustomOptionFooRequest: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionFooRequest, rhs: ProtobufUnittest_CustomOptionFooRequest) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionFooRequest, rhs: Proto2Unittest_CustomOptionFooRequest) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionFooResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionFooResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionFooResponse"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1852,13 +1852,13 @@ extension ProtobufUnittest_CustomOptionFooResponse: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionFooResponse, rhs: ProtobufUnittest_CustomOptionFooResponse) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionFooResponse, rhs: Proto2Unittest_CustomOptionFooResponse) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionFooClientMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionFooClientMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionFooClientMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1871,13 +1871,13 @@ extension ProtobufUnittest_CustomOptionFooClientMessage: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionFooClientMessage, rhs: ProtobufUnittest_CustomOptionFooClientMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionFooClientMessage, rhs: Proto2Unittest_CustomOptionFooClientMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionFooServerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionFooServerMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionFooServerMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1890,13 +1890,13 @@ extension ProtobufUnittest_CustomOptionFooServerMessage: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionFooServerMessage, rhs: ProtobufUnittest_CustomOptionFooServerMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionFooServerMessage, rhs: Proto2Unittest_CustomOptionFooServerMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_DummyMessageContainingEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_DummyMessageContainingEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".DummyMessageContainingEnum"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1909,20 +1909,20 @@ extension ProtobufUnittest_DummyMessageContainingEnum: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_DummyMessageContainingEnum, rhs: ProtobufUnittest_DummyMessageContainingEnum) -> Bool {
+  static func ==(lhs: Proto2Unittest_DummyMessageContainingEnum, rhs: Proto2Unittest_DummyMessageContainingEnum) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_DummyMessageContainingEnum.TestEnumType: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_DummyMessageContainingEnum.TestEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -23: .same(proto: "TEST_OPTION_ENUM_TYPE2"),
     22: .same(proto: "TEST_OPTION_ENUM_TYPE1"),
   ]
 }
 
-extension ProtobufUnittest_DummyMessageInvalidAsOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_DummyMessageInvalidAsOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".DummyMessageInvalidAsOptionType"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1935,13 +1935,13 @@ extension ProtobufUnittest_DummyMessageInvalidAsOptionType: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_DummyMessageInvalidAsOptionType, rhs: ProtobufUnittest_DummyMessageInvalidAsOptionType) -> Bool {
+  static func ==(lhs: Proto2Unittest_DummyMessageInvalidAsOptionType, rhs: Proto2Unittest_DummyMessageInvalidAsOptionType) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionMinIntegerValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionMinIntegerValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionMinIntegerValues"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1954,13 +1954,13 @@ extension ProtobufUnittest_CustomOptionMinIntegerValues: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionMinIntegerValues, rhs: ProtobufUnittest_CustomOptionMinIntegerValues) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionMinIntegerValues, rhs: Proto2Unittest_CustomOptionMinIntegerValues) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionMaxIntegerValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionMaxIntegerValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionMaxIntegerValues"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1973,13 +1973,13 @@ extension ProtobufUnittest_CustomOptionMaxIntegerValues: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionMaxIntegerValues, rhs: ProtobufUnittest_CustomOptionMaxIntegerValues) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionMaxIntegerValues, rhs: Proto2Unittest_CustomOptionMaxIntegerValues) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_CustomOptionOtherValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_CustomOptionOtherValues: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".CustomOptionOtherValues"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -1992,13 +1992,13 @@ extension ProtobufUnittest_CustomOptionOtherValues: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_CustomOptionOtherValues, rhs: ProtobufUnittest_CustomOptionOtherValues) -> Bool {
+  static func ==(lhs: Proto2Unittest_CustomOptionOtherValues, rhs: Proto2Unittest_CustomOptionOtherValues) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromPositiveInts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromPositiveInts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromPositiveInts"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2011,13 +2011,13 @@ extension ProtobufUnittest_SettingRealsFromPositiveInts: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromPositiveInts, rhs: ProtobufUnittest_SettingRealsFromPositiveInts) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromPositiveInts, rhs: Proto2Unittest_SettingRealsFromPositiveInts) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromNegativeInts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromNegativeInts: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromNegativeInts"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2030,13 +2030,13 @@ extension ProtobufUnittest_SettingRealsFromNegativeInts: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromNegativeInts, rhs: ProtobufUnittest_SettingRealsFromNegativeInts) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromNegativeInts, rhs: Proto2Unittest_SettingRealsFromNegativeInts) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromInf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromInf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromInf"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2049,13 +2049,13 @@ extension ProtobufUnittest_SettingRealsFromInf: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromInf, rhs: ProtobufUnittest_SettingRealsFromInf) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromInf, rhs: Proto2Unittest_SettingRealsFromInf) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromNegativeInf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromNegativeInf: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromNegativeInf"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2068,13 +2068,13 @@ extension ProtobufUnittest_SettingRealsFromNegativeInf: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromNegativeInf, rhs: ProtobufUnittest_SettingRealsFromNegativeInf) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromNegativeInf, rhs: Proto2Unittest_SettingRealsFromNegativeInf) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromNan: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromNan: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromNan"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2087,13 +2087,13 @@ extension ProtobufUnittest_SettingRealsFromNan: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromNan, rhs: ProtobufUnittest_SettingRealsFromNan) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromNan, rhs: Proto2Unittest_SettingRealsFromNan) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_SettingRealsFromNegativeNan: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_SettingRealsFromNegativeNan: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".SettingRealsFromNegativeNan"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2106,13 +2106,13 @@ extension ProtobufUnittest_SettingRealsFromNegativeNan: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_SettingRealsFromNegativeNan, rhs: ProtobufUnittest_SettingRealsFromNegativeNan) -> Bool {
+  static func ==(lhs: Proto2Unittest_SettingRealsFromNegativeNan, rhs: Proto2Unittest_SettingRealsFromNegativeNan) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ComplexOptionType1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ComplexOptionType1"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "foo"),
@@ -2137,7 +2137,7 @@ extension ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.Message, SwiftProto
       case 3: try { try decoder.decodeSingularInt32Field(value: &self._foo3) }()
       case 4: try { try decoder.decodeRepeatedInt32Field(value: &self.foo4) }()
       case 100..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_ComplexOptionType1.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_ComplexOptionType1.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -2164,7 +2164,7 @@ extension ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOptionType1, rhs: ProtobufUnittest_ComplexOptionType1) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOptionType1, rhs: Proto2Unittest_ComplexOptionType1) -> Bool {
     if lhs._foo != rhs._foo {return false}
     if lhs._foo2 != rhs._foo2 {return false}
     if lhs._foo3 != rhs._foo3 {return false}
@@ -2175,7 +2175,7 @@ extension ProtobufUnittest_ComplexOptionType1: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ComplexOptionType2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ComplexOptionType2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bar"),
@@ -2201,7 +2201,7 @@ extension ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.Message, SwiftProto
       case 3: try { try decoder.decodeSingularMessageField(value: &self._fred) }()
       case 4: try { try decoder.decodeRepeatedMessageField(value: &self.barney) }()
       case 100..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_ComplexOptionType2.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_ComplexOptionType2.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -2228,7 +2228,7 @@ extension ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOptionType2, rhs: ProtobufUnittest_ComplexOptionType2) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOptionType2, rhs: Proto2Unittest_ComplexOptionType2) -> Bool {
     if lhs._bar != rhs._bar {return false}
     if lhs._baz != rhs._baz {return false}
     if lhs._fred != rhs._fred {return false}
@@ -2239,8 +2239,8 @@ extension ProtobufUnittest_ComplexOptionType2: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType2.ComplexOptionType4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_ComplexOptionType2.protoMessageName + ".ComplexOptionType4"
+extension Proto2Unittest_ComplexOptionType2.ComplexOptionType4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_ComplexOptionType2.protoMessageName + ".ComplexOptionType4"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "waldo"),
   ]
@@ -2268,14 +2268,14 @@ extension ProtobufUnittest_ComplexOptionType2.ComplexOptionType4: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4, rhs: ProtobufUnittest_ComplexOptionType2.ComplexOptionType4) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOptionType2.ComplexOptionType4, rhs: Proto2Unittest_ComplexOptionType2.ComplexOptionType4) -> Bool {
     if lhs._waldo != rhs._waldo {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ComplexOptionType3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ComplexOptionType3"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "moo"),
@@ -2310,7 +2310,7 @@ extension ProtobufUnittest_ComplexOptionType3: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOptionType3, rhs: ProtobufUnittest_ComplexOptionType3) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOptionType3, rhs: Proto2Unittest_ComplexOptionType3) -> Bool {
     if lhs._moo != rhs._moo {return false}
     if lhs._complexOptionType5 != rhs._complexOptionType5 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -2318,8 +2318,8 @@ extension ProtobufUnittest_ComplexOptionType3: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_ComplexOptionType3.ComplexOptionType5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_ComplexOptionType3.protoMessageName + ".ComplexOptionType5"
+extension Proto2Unittest_ComplexOptionType3.ComplexOptionType5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_ComplexOptionType3.protoMessageName + ".ComplexOptionType5"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     3: .same(proto: "plugh"),
   ]
@@ -2347,14 +2347,14 @@ extension ProtobufUnittest_ComplexOptionType3.ComplexOptionType5: SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOptionType3.ComplexOptionType5, rhs: ProtobufUnittest_ComplexOptionType3.ComplexOptionType5) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOptionType3.ComplexOptionType5, rhs: Proto2Unittest_ComplexOptionType3.ComplexOptionType5) -> Bool {
     if lhs._plugh != rhs._plugh {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ComplexOpt6: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ComplexOpt6: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ComplexOpt6"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     7593951: .same(proto: "xyzzy"),
@@ -2383,14 +2383,14 @@ extension ProtobufUnittest_ComplexOpt6: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ComplexOpt6, rhs: ProtobufUnittest_ComplexOpt6) -> Bool {
+  static func ==(lhs: Proto2Unittest_ComplexOpt6, rhs: Proto2Unittest_ComplexOpt6) -> Bool {
     if lhs._xyzzy != rhs._xyzzy {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_VariousComplexOptions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_VariousComplexOptions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".VariousComplexOptions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2403,13 +2403,13 @@ extension ProtobufUnittest_VariousComplexOptions: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_VariousComplexOptions, rhs: ProtobufUnittest_VariousComplexOptions) -> Bool {
+  static func ==(lhs: Proto2Unittest_VariousComplexOptions, rhs: Proto2Unittest_VariousComplexOptions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_AggregateMessageSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_AggregateMessageSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".AggregateMessageSet"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2419,7 +2419,7 @@ extension ProtobufUnittest_AggregateMessageSet: SwiftProtobuf.Message, SwiftProt
   }
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    try decoder.decodeExtensionFieldsAsMessageSet(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_AggregateMessageSet.self)
+    try decoder.decodeExtensionFieldsAsMessageSet(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_AggregateMessageSet.self)
   }
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
@@ -2427,14 +2427,14 @@ extension ProtobufUnittest_AggregateMessageSet: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_AggregateMessageSet, rhs: ProtobufUnittest_AggregateMessageSet) -> Bool {
+  static func ==(lhs: Proto2Unittest_AggregateMessageSet, rhs: Proto2Unittest_AggregateMessageSet) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_AggregateMessageSetElement: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_AggregateMessageSetElement: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".AggregateMessageSetElement"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "s"),
@@ -2463,14 +2463,14 @@ extension ProtobufUnittest_AggregateMessageSetElement: SwiftProtobuf.Message, Sw
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_AggregateMessageSetElement, rhs: ProtobufUnittest_AggregateMessageSetElement) -> Bool {
+  static func ==(lhs: Proto2Unittest_AggregateMessageSetElement, rhs: Proto2Unittest_AggregateMessageSetElement) -> Bool {
     if lhs._s != rhs._s {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Aggregate"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "i"),
@@ -2484,9 +2484,9 @@ extension ProtobufUnittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._Mess
   fileprivate class _StorageClass {
     var _i: Int32? = nil
     var _s: String? = nil
-    var _sub: ProtobufUnittest_Aggregate? = nil
+    var _sub: Proto2Unittest_Aggregate? = nil
     var _file: SwiftProtobuf.Google_Protobuf_FileOptions? = nil
-    var _mset: ProtobufUnittest_AggregateMessageSet? = nil
+    var _mset: Proto2Unittest_AggregateMessageSet? = nil
     var _any: SwiftProtobuf.Google_Protobuf_Any? = nil
 
     #if swift(>=5.10)
@@ -2575,7 +2575,7 @@ extension ProtobufUnittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Aggregate, rhs: ProtobufUnittest_Aggregate) -> Bool {
+  static func ==(lhs: Proto2Unittest_Aggregate, rhs: Proto2Unittest_Aggregate) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -2595,7 +2595,7 @@ extension ProtobufUnittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._Mess
   }
 }
 
-extension ProtobufUnittest_AggregateMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_AggregateMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".AggregateMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "fieldname"),
@@ -2624,14 +2624,14 @@ extension ProtobufUnittest_AggregateMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_AggregateMessage, rhs: ProtobufUnittest_AggregateMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_AggregateMessage, rhs: Proto2Unittest_AggregateMessage) -> Bool {
     if lhs._fieldname != rhs._fieldname {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NestedOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NestedOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NestedOptionType"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2644,20 +2644,20 @@ extension ProtobufUnittest_NestedOptionType: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NestedOptionType, rhs: ProtobufUnittest_NestedOptionType) -> Bool {
+  static func ==(lhs: Proto2Unittest_NestedOptionType, rhs: Proto2Unittest_NestedOptionType) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NestedOptionType.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NestedOptionType.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "NESTED_ENUM_VALUE"),
   ]
 }
 
-extension ProtobufUnittest_NestedOptionType.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_NestedOptionType.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_NestedOptionType.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_NestedOptionType.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "nested_field"),
   ]
@@ -2685,14 +2685,14 @@ extension ProtobufUnittest_NestedOptionType.NestedMessage: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NestedOptionType.NestedMessage, rhs: ProtobufUnittest_NestedOptionType.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_NestedOptionType.NestedMessage, rhs: Proto2Unittest_NestedOptionType.NestedMessage) -> Bool {
     if lhs._nestedField != rhs._nestedField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OldOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OldOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OldOptionType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "value"),
@@ -2726,20 +2726,20 @@ extension ProtobufUnittest_OldOptionType: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OldOptionType, rhs: ProtobufUnittest_OldOptionType) -> Bool {
+  static func ==(lhs: Proto2Unittest_OldOptionType, rhs: Proto2Unittest_OldOptionType) -> Bool {
     if lhs._value != rhs._value {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OldOptionType.TestEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OldOptionType.TestEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "OLD_VALUE"),
   ]
 }
 
-extension ProtobufUnittest_NewOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NewOptionType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NewOptionType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "value"),
@@ -2773,21 +2773,21 @@ extension ProtobufUnittest_NewOptionType: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NewOptionType, rhs: ProtobufUnittest_NewOptionType) -> Bool {
+  static func ==(lhs: Proto2Unittest_NewOptionType, rhs: Proto2Unittest_NewOptionType) -> Bool {
     if lhs._value != rhs._value {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NewOptionType.TestEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NewOptionType.TestEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "OLD_VALUE"),
     1: .same(proto: "NEW_VALUE"),
   ]
 }
 
-extension ProtobufUnittest_TestMessageWithRequiredEnumOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageWithRequiredEnumOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageWithRequiredEnumOption"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -2800,7 +2800,7 @@ extension ProtobufUnittest_TestMessageWithRequiredEnumOption: SwiftProtobuf.Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageWithRequiredEnumOption, rhs: ProtobufUnittest_TestMessageWithRequiredEnumOption) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageWithRequiredEnumOption, rhs: Proto2Unittest_TestMessageWithRequiredEnumOption) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
diff --git a/Reference/upstream/google/protobuf/unittest_embed_optimize_for.pb.swift b/Reference/upstream/google/protobuf/unittest_embed_optimize_for.pb.swift
index 1f4a579fa..5242f573f 100644
--- a/Reference/upstream/google/protobuf/unittest_embed_optimize_for.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_embed_optimize_for.pb.swift
@@ -33,15 +33,15 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestEmbedOptimizedForSize: Sendable {
+struct Proto2Unittest_TestEmbedOptimizedForSize: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// Test that embedding a message which has optimize_for = CODE_SIZE into
   /// one optimized for speed works.
-  var optionalMessage: ProtobufUnittest_TestOptimizedForSize {
-    get {return _optionalMessage ?? ProtobufUnittest_TestOptimizedForSize()}
+  var optionalMessage: Proto2Unittest_TestOptimizedForSize {
+    get {return _optionalMessage ?? Proto2Unittest_TestOptimizedForSize()}
     set {_optionalMessage = newValue}
   }
   /// Returns true if `optionalMessage` has been explicitly set.
@@ -49,20 +49,20 @@ struct ProtobufUnittest_TestEmbedOptimizedForSize: Sendable {
   /// Clears the value of `optionalMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalMessage() {self._optionalMessage = nil}
 
-  var repeatedMessage: [ProtobufUnittest_TestOptimizedForSize] = []
+  var repeatedMessage: [Proto2Unittest_TestOptimizedForSize] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 
-  fileprivate var _optionalMessage: ProtobufUnittest_TestOptimizedForSize? = nil
+  fileprivate var _optionalMessage: Proto2Unittest_TestOptimizedForSize? = nil
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestEmbedOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEmbedOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEmbedOptimizedForSize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_message"),
@@ -102,7 +102,7 @@ extension ProtobufUnittest_TestEmbedOptimizedForSize: SwiftProtobuf.Message, Swi
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEmbedOptimizedForSize, rhs: ProtobufUnittest_TestEmbedOptimizedForSize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEmbedOptimizedForSize, rhs: Proto2Unittest_TestEmbedOptimizedForSize) -> Bool {
     if lhs._optionalMessage != rhs._optionalMessage {return false}
     if lhs.repeatedMessage != rhs.repeatedMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
diff --git a/Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift b/Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift
index 93fca9925..bf57402c4 100644
--- a/Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift
@@ -37,7 +37,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 }
 
 /// clang-format off
-struct ProtobufUnittest_TestEnormousDescriptor: @unchecked Sendable {
+struct Proto2Unittest_TestEnormousDescriptor: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -9051,9 +9051,9 @@ struct ProtobufUnittest_TestEnormousDescriptor: @unchecked Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestEnormousDescriptor: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEnormousDescriptor: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEnormousDescriptor"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1"),
@@ -16107,7 +16107,7 @@ extension ProtobufUnittest_TestEnormousDescriptor: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEnormousDescriptor, rhs: ProtobufUnittest_TestEnormousDescriptor) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEnormousDescriptor, rhs: Proto2Unittest_TestEnormousDescriptor) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
diff --git a/Reference/upstream/google/protobuf/unittest_extension_set.pb.swift b/Reference/upstream/google/protobuf/unittest_extension_set.pb.swift
index 1be282d88..c9ba3eb47 100644
--- a/Reference/upstream/google/protobuf/unittest_extension_set.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_extension_set.pb.swift
@@ -34,7 +34,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 }
 
 /// A message with message_set_wire_format.
-struct ProtobufUnittest_TestExtensionSet: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestExtensionSet: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -46,13 +46,13 @@ struct ProtobufUnittest_TestExtensionSet: SwiftProtobuf.ExtensibleMessage, Senda
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_TestExtensionSetContainer: Sendable {
+struct Proto2Unittest_TestExtensionSetContainer: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var `extension`: ProtobufUnittest_TestExtensionSet {
-    get {return _extension ?? ProtobufUnittest_TestExtensionSet()}
+  var `extension`: Proto2Unittest_TestExtensionSet {
+    get {return _extension ?? Proto2Unittest_TestExtensionSet()}
     set {_extension = newValue}
   }
   /// Returns true if ``extension`` has been explicitly set.
@@ -64,14 +64,14 @@ struct ProtobufUnittest_TestExtensionSetContainer: Sendable {
 
   init() {}
 
-  fileprivate var _extension: ProtobufUnittest_TestExtensionSet? = nil
+  fileprivate var _extension: Proto2Unittest_TestExtensionSet? = nil
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestExtensionSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionSet"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -83,7 +83,7 @@ extension ProtobufUnittest_TestExtensionSet: SwiftProtobuf.Message, SwiftProtobu
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (4 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestExtensionSet.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestExtensionSet.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -93,14 +93,14 @@ extension ProtobufUnittest_TestExtensionSet: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionSet, rhs: ProtobufUnittest_TestExtensionSet) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionSet, rhs: Proto2Unittest_TestExtensionSet) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestExtensionSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestExtensionSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestExtensionSetContainer"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "extension"),
@@ -134,7 +134,7 @@ extension ProtobufUnittest_TestExtensionSetContainer: SwiftProtobuf.Message, Swi
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestExtensionSetContainer, rhs: ProtobufUnittest_TestExtensionSetContainer) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestExtensionSetContainer, rhs: Proto2Unittest_TestExtensionSetContainer) -> Bool {
     if lhs._extension != rhs._extension {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_import.pb.swift b/Reference/upstream/google/protobuf/unittest_import.pb.swift
index 8c09fd06c..485284760 100644
--- a/Reference/upstream/google/protobuf/unittest_import.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_import.pb.swift
@@ -33,7 +33,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittestImport_ImportEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2UnittestImport_ImportEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case importFoo = 7
   case importBar = 8
   case importBaz = 9
@@ -45,7 +45,7 @@ enum ProtobufUnittestImport_ImportEnum: Int, SwiftProtobuf.Enum, Swift.CaseItera
 }
 
 /// To use an enum in a map, it must has the first value as 0.
-enum ProtobufUnittestImport_ImportEnumForMap: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2UnittestImport_ImportEnumForMap: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case unknown = 0
   case foo = 1
   case bar = 2
@@ -56,7 +56,7 @@ enum ProtobufUnittestImport_ImportEnumForMap: Int, SwiftProtobuf.Enum, Swift.Cas
 
 }
 
-struct ProtobufUnittestImport_ImportMessage: Sendable {
+struct Proto2UnittestImport_ImportMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -79,9 +79,9 @@ struct ProtobufUnittestImport_ImportMessage: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest_import"
+fileprivate let _protobuf_package = "proto2_unittest_import"
 
-extension ProtobufUnittestImport_ImportEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_ImportEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     7: .same(proto: "IMPORT_FOO"),
     8: .same(proto: "IMPORT_BAR"),
@@ -89,7 +89,7 @@ extension ProtobufUnittestImport_ImportEnum: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittestImport_ImportEnumForMap: SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_ImportEnumForMap: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "UNKNOWN"),
     1: .same(proto: "FOO"),
@@ -97,7 +97,7 @@ extension ProtobufUnittestImport_ImportEnumForMap: SwiftProtobuf._ProtoNameProvi
   ]
 }
 
-extension ProtobufUnittestImport_ImportMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_ImportMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ImportMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "d"),
@@ -126,7 +126,7 @@ extension ProtobufUnittestImport_ImportMessage: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittestImport_ImportMessage, rhs: ProtobufUnittestImport_ImportMessage) -> Bool {
+  static func ==(lhs: Proto2UnittestImport_ImportMessage, rhs: Proto2UnittestImport_ImportMessage) -> Bool {
     if lhs._d != rhs._d {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_import_lite.pb.swift b/Reference/upstream/google/protobuf/unittest_import_lite.pb.swift
index c3eeed136..f1b94b2e4 100644
--- a/Reference/upstream/google/protobuf/unittest_import_lite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_import_lite.pb.swift
@@ -31,7 +31,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittestImport_ImportEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2UnittestImport_ImportEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case importLiteFoo = 7
   case importLiteBar = 8
   case importLiteBaz = 9
@@ -42,7 +42,7 @@ enum ProtobufUnittestImport_ImportEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseI
 
 }
 
-struct ProtobufUnittestImport_ImportMessageLite: Sendable {
+struct Proto2UnittestImport_ImportMessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -65,9 +65,9 @@ struct ProtobufUnittestImport_ImportMessageLite: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest_import"
+fileprivate let _protobuf_package = "proto2_unittest_import"
 
-extension ProtobufUnittestImport_ImportEnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_ImportEnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     7: .same(proto: "IMPORT_LITE_FOO"),
     8: .same(proto: "IMPORT_LITE_BAR"),
@@ -75,7 +75,7 @@ extension ProtobufUnittestImport_ImportEnumLite: SwiftProtobuf._ProtoNameProvidi
   ]
 }
 
-extension ProtobufUnittestImport_ImportMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_ImportMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ImportMessageLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "d"),
@@ -104,7 +104,7 @@ extension ProtobufUnittestImport_ImportMessageLite: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittestImport_ImportMessageLite, rhs: ProtobufUnittestImport_ImportMessageLite) -> Bool {
+  static func ==(lhs: Proto2UnittestImport_ImportMessageLite, rhs: Proto2UnittestImport_ImportMessageLite) -> Bool {
     if lhs._d != rhs._d {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_import_public.pb.swift b/Reference/upstream/google/protobuf/unittest_import_public.pb.swift
index 731521000..72c29ccd9 100644
--- a/Reference/upstream/google/protobuf/unittest_import_public.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_import_public.pb.swift
@@ -29,7 +29,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittestImport_PublicImportMessage: Sendable {
+struct Proto2UnittestImport_PublicImportMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -52,9 +52,9 @@ struct ProtobufUnittestImport_PublicImportMessage: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest_import"
+fileprivate let _protobuf_package = "proto2_unittest_import"
 
-extension ProtobufUnittestImport_PublicImportMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_PublicImportMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".PublicImportMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "e"),
@@ -83,7 +83,7 @@ extension ProtobufUnittestImport_PublicImportMessage: SwiftProtobuf.Message, Swi
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittestImport_PublicImportMessage, rhs: ProtobufUnittestImport_PublicImportMessage) -> Bool {
+  static func ==(lhs: Proto2UnittestImport_PublicImportMessage, rhs: Proto2UnittestImport_PublicImportMessage) -> Bool {
     if lhs._e != rhs._e {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_import_public_lite.pb.swift b/Reference/upstream/google/protobuf/unittest_import_public_lite.pb.swift
index bdcfffeed..e7746dcac 100644
--- a/Reference/upstream/google/protobuf/unittest_import_public_lite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_import_public_lite.pb.swift
@@ -29,7 +29,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittestImport_PublicImportMessageLite: Sendable {
+struct Proto2UnittestImport_PublicImportMessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -52,9 +52,9 @@ struct ProtobufUnittestImport_PublicImportMessageLite: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest_import"
+fileprivate let _protobuf_package = "proto2_unittest_import"
 
-extension ProtobufUnittestImport_PublicImportMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2UnittestImport_PublicImportMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".PublicImportMessageLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "e"),
@@ -83,7 +83,7 @@ extension ProtobufUnittestImport_PublicImportMessageLite: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittestImport_PublicImportMessageLite, rhs: ProtobufUnittestImport_PublicImportMessageLite) -> Bool {
+  static func ==(lhs: Proto2UnittestImport_PublicImportMessageLite, rhs: Proto2UnittestImport_PublicImportMessageLite) -> Bool {
     if lhs._e != rhs._e {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_large_oneof.pb.swift b/Reference/upstream/google/protobuf/unittest_large_oneof.pb.swift
index 52e05f28e..f85e2e9a1 100644
--- a/Reference/upstream/google/protobuf/unittest_large_oneof.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_large_oneof.pb.swift
@@ -20,12 +20,12 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestLargeOneofLargeFieldNumber: Sendable {
+struct Proto2Unittest_TestLargeOneofLargeFieldNumber: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var foo: ProtobufUnittest_TestLargeOneofLargeFieldNumber.OneOf_Foo? = nil
+  var foo: Proto2Unittest_TestLargeOneofLargeFieldNumber.OneOf_Foo? = nil
 
   var int321: Int32 {
     get {
@@ -63038,9 +63038,9 @@ struct ProtobufUnittest_TestLargeOneofLargeFieldNumber: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestLargeOneofLargeFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestLargeOneofLargeFieldNumber: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestLargeOneofLargeFieldNumber"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     100001: .standard(proto: "int32_1"),
@@ -154067,7 +154067,7 @@ extension ProtobufUnittest_TestLargeOneofLargeFieldNumber: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestLargeOneofLargeFieldNumber, rhs: ProtobufUnittest_TestLargeOneofLargeFieldNumber) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestLargeOneofLargeFieldNumber, rhs: Proto2Unittest_TestLargeOneofLargeFieldNumber) -> Bool {
     if lhs.foo != rhs.foo {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_lazy_dependencies.pb.swift b/Reference/upstream/google/protobuf/unittest_lazy_dependencies.pb.swift
index 7b51f6a05..e1d7067df 100644
--- a/Reference/upstream/google/protobuf/unittest_lazy_dependencies.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_lazy_dependencies.pb.swift
@@ -33,13 +33,13 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_LazyImports_ImportedMessage: Sendable {
+struct Proto2Unittest_LazyImports_ImportedMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var lazyMessage: ProtobufUnittest_LazyImports_LazyMessage {
-    get {return _lazyMessage ?? ProtobufUnittest_LazyImports_LazyMessage()}
+  var lazyMessage: Proto2Unittest_LazyImports_LazyMessage {
+    get {return _lazyMessage ?? Proto2Unittest_LazyImports_LazyMessage()}
     set {_lazyMessage = newValue}
   }
   /// Returns true if `lazyMessage` has been explicitly set.
@@ -51,10 +51,10 @@ struct ProtobufUnittest_LazyImports_ImportedMessage: Sendable {
 
   init() {}
 
-  fileprivate var _lazyMessage: ProtobufUnittest_LazyImports_LazyMessage? = nil
+  fileprivate var _lazyMessage: Proto2Unittest_LazyImports_LazyMessage? = nil
 }
 
-struct ProtobufUnittest_LazyImports_MessageCustomOption: Sendable {
+struct Proto2Unittest_LazyImports_MessageCustomOption: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -64,7 +64,7 @@ struct ProtobufUnittest_LazyImports_MessageCustomOption: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_LazyImports_MessageCustomOption2: Sendable {
+struct Proto2Unittest_LazyImports_MessageCustomOption2: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -76,9 +76,9 @@ struct ProtobufUnittest_LazyImports_MessageCustomOption2: Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest.lazy_imports"
+fileprivate let _protobuf_package = "proto2_unittest.lazy_imports"
 
-extension ProtobufUnittest_LazyImports_ImportedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LazyImports_ImportedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ImportedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "lazy_message"),
@@ -107,14 +107,14 @@ extension ProtobufUnittest_LazyImports_ImportedMessage: SwiftProtobuf.Message, S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LazyImports_ImportedMessage, rhs: ProtobufUnittest_LazyImports_ImportedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_LazyImports_ImportedMessage, rhs: Proto2Unittest_LazyImports_ImportedMessage) -> Bool {
     if lhs._lazyMessage != rhs._lazyMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_LazyImports_MessageCustomOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LazyImports_MessageCustomOption: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageCustomOption"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -127,13 +127,13 @@ extension ProtobufUnittest_LazyImports_MessageCustomOption: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LazyImports_MessageCustomOption, rhs: ProtobufUnittest_LazyImports_MessageCustomOption) -> Bool {
+  static func ==(lhs: Proto2Unittest_LazyImports_MessageCustomOption, rhs: Proto2Unittest_LazyImports_MessageCustomOption) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_LazyImports_MessageCustomOption2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LazyImports_MessageCustomOption2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MessageCustomOption2"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -146,7 +146,7 @@ extension ProtobufUnittest_LazyImports_MessageCustomOption2: SwiftProtobuf.Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LazyImports_MessageCustomOption2, rhs: ProtobufUnittest_LazyImports_MessageCustomOption2) -> Bool {
+  static func ==(lhs: Proto2Unittest_LazyImports_MessageCustomOption2, rhs: Proto2Unittest_LazyImports_MessageCustomOption2) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
diff --git a/Reference/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.pb.swift b/Reference/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.pb.swift
index 6ab5c8521..0bb0c02c3 100644
--- a/Reference/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_lazy_dependencies_custom_option.pb.swift
@@ -33,7 +33,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_LazyImports_LazyMessage: Sendable {
+struct Proto2Unittest_LazyImports_LazyMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -65,47 +65,47 @@ struct ProtobufUnittest_LazyImports_LazyMessage: Sendable {
 
 extension SwiftProtobuf.Google_Protobuf_MessageOptions {
 
-  var ProtobufUnittest_LazyImports_lazyEnumOption: ProtobufUnittest_LazyImports_LazyEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_LazyImports_Extensions_lazy_enum_option) ?? .lazyEnum1}
-    set {setExtensionValue(ext: ProtobufUnittest_LazyImports_Extensions_lazy_enum_option, value: newValue)}
+  var Proto2Unittest_LazyImports_lazyEnumOption: Proto2Unittest_LazyImports_LazyEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_LazyImports_Extensions_lazy_enum_option) ?? .lazyEnum1}
+    set {setExtensionValue(ext: Proto2Unittest_LazyImports_Extensions_lazy_enum_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_LazyImports_Extensions_lazy_enum_option`
+  /// Returns true if extension `Proto2Unittest_LazyImports_Extensions_lazy_enum_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_LazyImports_lazyEnumOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_LazyImports_Extensions_lazy_enum_option)
+  var hasProto2Unittest_LazyImports_lazyEnumOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_LazyImports_Extensions_lazy_enum_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_LazyImports_Extensions_lazy_enum_option`.
+  /// Clears the value of extension `Proto2Unittest_LazyImports_Extensions_lazy_enum_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_LazyImports_lazyEnumOption() {
-    clearExtensionValue(ext: ProtobufUnittest_LazyImports_Extensions_lazy_enum_option)
+  mutating func clearProto2Unittest_LazyImports_lazyEnumOption() {
+    clearExtensionValue(ext: Proto2Unittest_LazyImports_Extensions_lazy_enum_option)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_LazyImports_UnittestLazyDependenciesCustomOption_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_LazyImports_UnittestLazyDependenciesCustomOption_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_LazyImports_UnittestLazyDependenciesCustomOption_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_LazyImports_Extensions_lazy_enum_option
+let Proto2Unittest_LazyImports_UnittestLazyDependenciesCustomOption_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_LazyImports_Extensions_lazy_enum_option
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufUnittest_LazyImports_Extensions_lazy_enum_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_LazyImports_LazyEnum>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_LazyImports_Extensions_lazy_enum_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_LazyImports_LazyEnum>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 138596335,
-  fieldName: "protobuf_unittest.lazy_imports.lazy_enum_option"
+  fieldName: "proto2_unittest.lazy_imports.lazy_enum_option"
 )
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest.lazy_imports"
+fileprivate let _protobuf_package = "proto2_unittest.lazy_imports"
 
-extension ProtobufUnittest_LazyImports_LazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LazyImports_LazyMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".LazyMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -134,7 +134,7 @@ extension ProtobufUnittest_LazyImports_LazyMessage: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_LazyImports_LazyMessage, rhs: ProtobufUnittest_LazyImports_LazyMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_LazyImports_LazyMessage, rhs: Proto2Unittest_LazyImports_LazyMessage) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_lazy_dependencies_enum.pb.swift b/Reference/upstream/google/protobuf/unittest_lazy_dependencies_enum.pb.swift
index 7e630b6ca..546675459 100644
--- a/Reference/upstream/google/protobuf/unittest_lazy_dependencies_enum.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_lazy_dependencies_enum.pb.swift
@@ -33,7 +33,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_LazyImports_LazyEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_LazyImports_LazyEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case lazyEnum0 = 0
   case lazyEnum1 = 1
 
@@ -45,7 +45,7 @@ enum ProtobufUnittest_LazyImports_LazyEnum: Int, SwiftProtobuf.Enum, Swift.CaseI
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-extension ProtobufUnittest_LazyImports_LazyEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_LazyImports_LazyEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "LAZY_ENUM_0"),
     1: .same(proto: "LAZY_ENUM_1"),
diff --git a/Reference/upstream/google/protobuf/unittest_lite.pb.swift b/Reference/upstream/google/protobuf/unittest_lite.pb.swift
index 6cc9d805d..78de05a3a 100644
--- a/Reference/upstream/google/protobuf/unittest_lite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_lite.pb.swift
@@ -32,7 +32,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_ForeignEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_ForeignEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case foreignLiteFoo = 4
   case foreignLiteBaz = 6
   case foreignLiteBar = 5
@@ -43,7 +43,7 @@ enum ProtobufUnittest_ForeignEnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterab
 
 }
 
-enum ProtobufUnittest_V1EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_V1EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case v1First = 1
 
   init() {
@@ -52,7 +52,7 @@ enum ProtobufUnittest_V1EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
 
 }
 
-enum ProtobufUnittest_V2EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_V2EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case v2First = 1
   case v2Second = 2
 
@@ -63,7 +63,7 @@ enum ProtobufUnittest_V2EnumLite: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
 }
 
 /// Same as TestAllTypes but with the lite runtime.
-struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
+struct Proto2Unittest_TestAllTypesLite: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -204,8 +204,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalBytes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBytes() {_uniqueStorage()._optionalBytes = nil}
 
-  var optionalGroup: ProtobufUnittest_TestAllTypesLite.OptionalGroup {
-    get {return _storage._optionalGroup ?? ProtobufUnittest_TestAllTypesLite.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestAllTypesLite.OptionalGroup {
+    get {return _storage._optionalGroup ?? Proto2Unittest_TestAllTypesLite.OptionalGroup()}
     set {_uniqueStorage()._optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -213,8 +213,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalGroup`. Subsequent reads from it will return its default value.
   mutating func clearOptionalGroup() {_uniqueStorage()._optionalGroup = nil}
 
-  var optionalNestedMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return _storage._optionalNestedMessage ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return _storage._optionalNestedMessage ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
     set {_uniqueStorage()._optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -222,8 +222,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalNestedMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalNestedMessage() {_uniqueStorage()._optionalNestedMessage = nil}
 
-  var optionalForeignMessage: ProtobufUnittest_ForeignMessageLite {
-    get {return _storage._optionalForeignMessage ?? ProtobufUnittest_ForeignMessageLite()}
+  var optionalForeignMessage: Proto2Unittest_ForeignMessageLite {
+    get {return _storage._optionalForeignMessage ?? Proto2Unittest_ForeignMessageLite()}
     set {_uniqueStorage()._optionalForeignMessage = newValue}
   }
   /// Returns true if `optionalForeignMessage` has been explicitly set.
@@ -231,8 +231,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessageLite {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessageLite()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessageLite {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessageLite()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -240,7 +240,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalImportMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalImportMessage() {_uniqueStorage()._optionalImportMessage = nil}
 
-  var optionalNestedEnum: ProtobufUnittest_TestAllTypesLite.NestedEnum {
+  var optionalNestedEnum: Proto2Unittest_TestAllTypesLite.NestedEnum {
     get {return _storage._optionalNestedEnum ?? .foo}
     set {_uniqueStorage()._optionalNestedEnum = newValue}
   }
@@ -249,7 +249,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalNestedEnum`. Subsequent reads from it will return its default value.
   mutating func clearOptionalNestedEnum() {_uniqueStorage()._optionalNestedEnum = nil}
 
-  var optionalForeignEnum: ProtobufUnittest_ForeignEnumLite {
+  var optionalForeignEnum: Proto2Unittest_ForeignEnumLite {
     get {return _storage._optionalForeignEnum ?? .foreignLiteFoo}
     set {_uniqueStorage()._optionalForeignEnum = newValue}
   }
@@ -258,7 +258,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignEnum() {_uniqueStorage()._optionalForeignEnum = nil}
 
-  var optionalImportEnum: ProtobufUnittestImport_ImportEnumLite {
+  var optionalImportEnum: Proto2UnittestImport_ImportEnumLite {
     get {return _storage._optionalImportEnum ?? .importLiteFoo}
     set {_uniqueStorage()._optionalImportEnum = newValue}
   }
@@ -295,8 +295,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   mutating func clearOptionalBytesCord() {_uniqueStorage()._optionalBytesCord = nil}
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessageLite {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessageLite()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessageLite {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessageLite()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -304,8 +304,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalPublicImportMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalPublicImportMessage() {_uniqueStorage()._optionalPublicImportMessage = nil}
 
-  var optionalLazyMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return _storage._optionalLazyMessage ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
+  var optionalLazyMessage: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return _storage._optionalLazyMessage ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
     set {_uniqueStorage()._optionalLazyMessage = newValue}
   }
   /// Returns true if `optionalLazyMessage` has been explicitly set.
@@ -313,8 +313,8 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `optionalLazyMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalLazyMessage() {_uniqueStorage()._optionalLazyMessage = nil}
 
-  var optionalUnverifiedLazyMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return _storage._optionalUnverifiedLazyMessage ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
+  var optionalUnverifiedLazyMessage: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return _storage._optionalUnverifiedLazyMessage ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
     set {_uniqueStorage()._optionalUnverifiedLazyMessage = newValue}
   }
   /// Returns true if `optionalUnverifiedLazyMessage` has been explicitly set.
@@ -398,37 +398,37 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
     set {_uniqueStorage()._repeatedBytes = newValue}
   }
 
-  var repeatedGroup: [ProtobufUnittest_TestAllTypesLite.RepeatedGroup] {
+  var repeatedGroup: [Proto2Unittest_TestAllTypesLite.RepeatedGroup] {
     get {return _storage._repeatedGroup}
     set {_uniqueStorage()._repeatedGroup = newValue}
   }
 
-  var repeatedNestedMessage: [ProtobufUnittest_TestAllTypesLite.NestedMessage] {
+  var repeatedNestedMessage: [Proto2Unittest_TestAllTypesLite.NestedMessage] {
     get {return _storage._repeatedNestedMessage}
     set {_uniqueStorage()._repeatedNestedMessage = newValue}
   }
 
-  var repeatedForeignMessage: [ProtobufUnittest_ForeignMessageLite] {
+  var repeatedForeignMessage: [Proto2Unittest_ForeignMessageLite] {
     get {return _storage._repeatedForeignMessage}
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessageLite] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessageLite] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
 
-  var repeatedNestedEnum: [ProtobufUnittest_TestAllTypesLite.NestedEnum] {
+  var repeatedNestedEnum: [Proto2Unittest_TestAllTypesLite.NestedEnum] {
     get {return _storage._repeatedNestedEnum}
     set {_uniqueStorage()._repeatedNestedEnum = newValue}
   }
 
-  var repeatedForeignEnum: [ProtobufUnittest_ForeignEnumLite] {
+  var repeatedForeignEnum: [Proto2Unittest_ForeignEnumLite] {
     get {return _storage._repeatedForeignEnum}
     set {_uniqueStorage()._repeatedForeignEnum = newValue}
   }
 
-  var repeatedImportEnum: [ProtobufUnittestImport_ImportEnumLite] {
+  var repeatedImportEnum: [Proto2UnittestImport_ImportEnumLite] {
     get {return _storage._repeatedImportEnum}
     set {_uniqueStorage()._repeatedImportEnum = newValue}
   }
@@ -443,7 +443,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
     set {_uniqueStorage()._repeatedCord = newValue}
   }
 
-  var repeatedLazyMessage: [ProtobufUnittest_TestAllTypesLite.NestedMessage] {
+  var repeatedLazyMessage: [Proto2Unittest_TestAllTypesLite.NestedMessage] {
     get {return _storage._repeatedLazyMessage}
     set {_uniqueStorage()._repeatedLazyMessage = newValue}
   }
@@ -584,7 +584,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `defaultBytes`. Subsequent reads from it will return its default value.
   mutating func clearDefaultBytes() {_uniqueStorage()._defaultBytes = nil}
 
-  var defaultNestedEnum: ProtobufUnittest_TestAllTypesLite.NestedEnum {
+  var defaultNestedEnum: Proto2Unittest_TestAllTypesLite.NestedEnum {
     get {return _storage._defaultNestedEnum ?? .bar}
     set {_uniqueStorage()._defaultNestedEnum = newValue}
   }
@@ -593,7 +593,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `defaultNestedEnum`. Subsequent reads from it will return its default value.
   mutating func clearDefaultNestedEnum() {_uniqueStorage()._defaultNestedEnum = nil}
 
-  var defaultForeignEnum: ProtobufUnittest_ForeignEnumLite {
+  var defaultForeignEnum: Proto2Unittest_ForeignEnumLite {
     get {return _storage._defaultForeignEnum ?? .foreignLiteBar}
     set {_uniqueStorage()._defaultForeignEnum = newValue}
   }
@@ -602,7 +602,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// Clears the value of `defaultForeignEnum`. Subsequent reads from it will return its default value.
   mutating func clearDefaultForeignEnum() {_uniqueStorage()._defaultForeignEnum = nil}
 
-  var defaultImportEnum: ProtobufUnittestImport_ImportEnumLite {
+  var defaultImportEnum: Proto2UnittestImport_ImportEnumLite {
     get {return _storage._defaultImportEnum ?? .importLiteBar}
     set {_uniqueStorage()._defaultImportEnum = newValue}
   }
@@ -643,10 +643,10 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
     set {_uniqueStorage()._oneofField = .oneofUint32(newValue)}
   }
 
-  var oneofNestedMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage {
+  var oneofNestedMessage: Proto2Unittest_TestAllTypesLite.NestedMessage {
     get {
       if case .oneofNestedMessage(let v)? = _storage._oneofField {return v}
-      return ProtobufUnittest_TestAllTypesLite.NestedMessage()
+      return Proto2Unittest_TestAllTypesLite.NestedMessage()
     }
     set {_uniqueStorage()._oneofField = .oneofNestedMessage(newValue)}
   }
@@ -667,18 +667,18 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
     set {_uniqueStorage()._oneofField = .oneofBytes(newValue)}
   }
 
-  var oneofLazyNestedMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage {
+  var oneofLazyNestedMessage: Proto2Unittest_TestAllTypesLite.NestedMessage {
     get {
       if case .oneofLazyNestedMessage(let v)? = _storage._oneofField {return v}
-      return ProtobufUnittest_TestAllTypesLite.NestedMessage()
+      return Proto2Unittest_TestAllTypesLite.NestedMessage()
     }
     set {_uniqueStorage()._oneofField = .oneofLazyNestedMessage(newValue)}
   }
 
-  var oneofNestedMessage2: ProtobufUnittest_TestAllTypesLite.NestedMessage2 {
+  var oneofNestedMessage2: Proto2Unittest_TestAllTypesLite.NestedMessage2 {
     get {
       if case .oneofNestedMessage2(let v)? = _storage._oneofField {return v}
-      return ProtobufUnittest_TestAllTypesLite.NestedMessage2()
+      return Proto2Unittest_TestAllTypesLite.NestedMessage2()
     }
     set {_uniqueStorage()._oneofField = .oneofNestedMessage2(newValue)}
   }
@@ -698,11 +698,11 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   /// For oneof test
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
     case oneofUint32(UInt32)
-    case oneofNestedMessage(ProtobufUnittest_TestAllTypesLite.NestedMessage)
+    case oneofNestedMessage(Proto2Unittest_TestAllTypesLite.NestedMessage)
     case oneofString(String)
     case oneofBytes(Data)
-    case oneofLazyNestedMessage(ProtobufUnittest_TestAllTypesLite.NestedMessage)
-    case oneofNestedMessage2(ProtobufUnittest_TestAllTypesLite.NestedMessage2)
+    case oneofLazyNestedMessage(Proto2Unittest_TestAllTypesLite.NestedMessage)
+    case oneofNestedMessage2(Proto2Unittest_TestAllTypesLite.NestedMessage2)
 
   }
 
@@ -818,7 +818,7 @@ struct ProtobufUnittest_TestAllTypesLite: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_ForeignMessageLite: Sendable {
+struct Proto2Unittest_ForeignMessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -839,7 +839,7 @@ struct ProtobufUnittest_ForeignMessageLite: Sendable {
   fileprivate var _c: Int32? = nil
 }
 
-struct ProtobufUnittest_TestPackedTypesLite: Sendable {
+struct Proto2Unittest_TestPackedTypesLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -870,14 +870,14 @@ struct ProtobufUnittest_TestPackedTypesLite: Sendable {
 
   var packedBool: [Bool] = []
 
-  var packedEnum: [ProtobufUnittest_ForeignEnumLite] = []
+  var packedEnum: [Proto2Unittest_ForeignEnumLite] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
 }
 
-struct ProtobufUnittest_TestAllExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestAllExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -889,7 +889,7 @@ struct ProtobufUnittest_TestAllExtensionsLite: SwiftProtobuf.ExtensibleMessage,
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_OptionalGroup_extension_lite: Sendable {
+struct Proto2Unittest_OptionalGroup_extension_lite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -910,7 +910,7 @@ struct ProtobufUnittest_OptionalGroup_extension_lite: Sendable {
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_RepeatedGroup_extension_lite: Sendable {
+struct Proto2Unittest_RepeatedGroup_extension_lite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -931,7 +931,7 @@ struct ProtobufUnittest_RepeatedGroup_extension_lite: Sendable {
   fileprivate var _a: Int32? = nil
 }
 
-struct ProtobufUnittest_TestPackedExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestPackedExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -943,7 +943,7 @@ struct ProtobufUnittest_TestPackedExtensionsLite: SwiftProtobuf.ExtensibleMessag
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_TestNestedExtensionLite: Sendable {
+struct Proto2Unittest_TestNestedExtensionLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -955,7 +955,7 @@ struct ProtobufUnittest_TestNestedExtensionLite: Sendable {
 
 /// Test that deprecated fields work.  We only verify that they compile (at one
 /// point this failed).
-struct ProtobufUnittest_TestDeprecatedLite: @unchecked Sendable {
+struct Proto2Unittest_TestDeprecatedLite: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -991,8 +991,8 @@ struct ProtobufUnittest_TestDeprecatedLite: @unchecked Sendable {
   mutating func clearDeprecatedField3() {_uniqueStorage()._deprecatedField3 = nil}
 
   /// NOTE: This field was marked as deprecated in the .proto file.
-  var deprecatedField4: ProtobufUnittest_TestDeprecatedLite {
-    get {return _storage._deprecatedField4 ?? ProtobufUnittest_TestDeprecatedLite()}
+  var deprecatedField4: Proto2Unittest_TestDeprecatedLite {
+    get {return _storage._deprecatedField4 ?? Proto2Unittest_TestDeprecatedLite()}
     set {_uniqueStorage()._deprecatedField4 = newValue}
   }
   /// Returns true if `deprecatedField4` has been explicitly set.
@@ -1008,13 +1008,13 @@ struct ProtobufUnittest_TestDeprecatedLite: @unchecked Sendable {
 }
 
 /// See the comments of the same type in unittest.proto.
-struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var requiredAllTypes: ProtobufUnittest_TestAllTypesLite {
-    get {return _requiredAllTypes ?? ProtobufUnittest_TestAllTypesLite()}
+  var requiredAllTypes: Proto2Unittest_TestAllTypesLite {
+    get {return _requiredAllTypes ?? Proto2Unittest_TestAllTypesLite()}
     set {_requiredAllTypes = newValue}
   }
   /// Returns true if `requiredAllTypes` has been explicitly set.
@@ -1022,8 +1022,8 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
   /// Clears the value of `requiredAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearRequiredAllTypes() {self._requiredAllTypes = nil}
 
-  var optionalAllTypes: ProtobufUnittest_TestAllTypesLite {
-    get {return _optionalAllTypes ?? ProtobufUnittest_TestAllTypesLite()}
+  var optionalAllTypes: Proto2Unittest_TestAllTypesLite {
+    get {return _optionalAllTypes ?? Proto2Unittest_TestAllTypesLite()}
     set {_optionalAllTypes = newValue}
   }
   /// Returns true if `optionalAllTypes` has been explicitly set.
@@ -1031,10 +1031,10 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
   /// Clears the value of `optionalAllTypes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAllTypes() {self._optionalAllTypes = nil}
 
-  var repeatedAllTypes: [ProtobufUnittest_TestAllTypesLite] = []
+  var repeatedAllTypes: [Proto2Unittest_TestAllTypesLite] = []
 
-  var optionalGroup: ProtobufUnittest_TestParsingMergeLite.OptionalGroup {
-    get {return _optionalGroup ?? ProtobufUnittest_TestParsingMergeLite.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestParsingMergeLite.OptionalGroup {
+    get {return _optionalGroup ?? Proto2Unittest_TestParsingMergeLite.OptionalGroup()}
     set {_optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -1042,7 +1042,7 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
   /// Clears the value of `optionalGroup`. Subsequent reads from it will return its default value.
   mutating func clearOptionalGroup() {self._optionalGroup = nil}
 
-  var repeatedGroup: [ProtobufUnittest_TestParsingMergeLite.RepeatedGroup] = []
+  var repeatedGroup: [Proto2Unittest_TestParsingMergeLite.RepeatedGroup] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -1051,19 +1051,19 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var field1: [ProtobufUnittest_TestAllTypesLite] = []
+    var field1: [Proto2Unittest_TestAllTypesLite] = []
 
-    var field2: [ProtobufUnittest_TestAllTypesLite] = []
+    var field2: [Proto2Unittest_TestAllTypesLite] = []
 
-    var field3: [ProtobufUnittest_TestAllTypesLite] = []
+    var field3: [Proto2Unittest_TestAllTypesLite] = []
 
-    var group1: [ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1] = []
+    var group1: [Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1] = []
 
-    var group2: [ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2] = []
+    var group2: [Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2] = []
 
-    var ext1: [ProtobufUnittest_TestAllTypesLite] = []
+    var ext1: [Proto2Unittest_TestAllTypesLite] = []
 
-    var ext2: [ProtobufUnittest_TestAllTypesLite] = []
+    var ext2: [Proto2Unittest_TestAllTypesLite] = []
 
     var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -1072,8 +1072,8 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
       // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
       // methods supported on all messages.
 
-      var field1: ProtobufUnittest_TestAllTypesLite {
-        get {return _field1 ?? ProtobufUnittest_TestAllTypesLite()}
+      var field1: Proto2Unittest_TestAllTypesLite {
+        get {return _field1 ?? Proto2Unittest_TestAllTypesLite()}
         set {_field1 = newValue}
       }
       /// Returns true if `field1` has been explicitly set.
@@ -1085,7 +1085,7 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
 
       init() {}
 
-      fileprivate var _field1: ProtobufUnittest_TestAllTypesLite? = nil
+      fileprivate var _field1: Proto2Unittest_TestAllTypesLite? = nil
     }
 
     struct Group2: Sendable {
@@ -1093,8 +1093,8 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
       // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
       // methods supported on all messages.
 
-      var field1: ProtobufUnittest_TestAllTypesLite {
-        get {return _field1 ?? ProtobufUnittest_TestAllTypesLite()}
+      var field1: Proto2Unittest_TestAllTypesLite {
+        get {return _field1 ?? Proto2Unittest_TestAllTypesLite()}
         set {_field1 = newValue}
       }
       /// Returns true if `field1` has been explicitly set.
@@ -1106,7 +1106,7 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
 
       init() {}
 
-      fileprivate var _field1: ProtobufUnittest_TestAllTypesLite? = nil
+      fileprivate var _field1: Proto2Unittest_TestAllTypesLite? = nil
     }
 
     init() {}
@@ -1117,8 +1117,8 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var optionalGroupAllTypes: ProtobufUnittest_TestAllTypesLite {
-      get {return _optionalGroupAllTypes ?? ProtobufUnittest_TestAllTypesLite()}
+    var optionalGroupAllTypes: Proto2Unittest_TestAllTypesLite {
+      get {return _optionalGroupAllTypes ?? Proto2Unittest_TestAllTypesLite()}
       set {_optionalGroupAllTypes = newValue}
     }
     /// Returns true if `optionalGroupAllTypes` has been explicitly set.
@@ -1130,7 +1130,7 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
 
     init() {}
 
-    fileprivate var _optionalGroupAllTypes: ProtobufUnittest_TestAllTypesLite? = nil
+    fileprivate var _optionalGroupAllTypes: Proto2Unittest_TestAllTypesLite? = nil
   }
 
   struct RepeatedGroup: Sendable {
@@ -1138,8 +1138,8 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var repeatedGroupAllTypes: ProtobufUnittest_TestAllTypesLite {
-      get {return _repeatedGroupAllTypes ?? ProtobufUnittest_TestAllTypesLite()}
+    var repeatedGroupAllTypes: Proto2Unittest_TestAllTypesLite {
+      get {return _repeatedGroupAllTypes ?? Proto2Unittest_TestAllTypesLite()}
       set {_repeatedGroupAllTypes = newValue}
     }
     /// Returns true if `repeatedGroupAllTypes` has been explicitly set.
@@ -1151,26 +1151,26 @@ struct ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.ExtensibleMessage, S
 
     init() {}
 
-    fileprivate var _repeatedGroupAllTypes: ProtobufUnittest_TestAllTypesLite? = nil
+    fileprivate var _repeatedGroupAllTypes: Proto2Unittest_TestAllTypesLite? = nil
   }
 
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
-  fileprivate var _requiredAllTypes: ProtobufUnittest_TestAllTypesLite? = nil
-  fileprivate var _optionalAllTypes: ProtobufUnittest_TestAllTypesLite? = nil
-  fileprivate var _optionalGroup: ProtobufUnittest_TestParsingMergeLite.OptionalGroup? = nil
+  fileprivate var _requiredAllTypes: Proto2Unittest_TestAllTypesLite? = nil
+  fileprivate var _optionalAllTypes: Proto2Unittest_TestAllTypesLite? = nil
+  fileprivate var _optionalGroup: Proto2Unittest_TestParsingMergeLite.OptionalGroup? = nil
 }
 
 /// Test that the correct exception is thrown by parseFrom in a corner case
 /// involving merging, extensions, and required fields.
-struct ProtobufUnittest_TestMergeExceptionLite: Sendable {
+struct Proto2Unittest_TestMergeExceptionLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var allExtensions: ProtobufUnittest_TestAllExtensionsLite {
-    get {return _allExtensions ?? ProtobufUnittest_TestAllExtensionsLite()}
+  var allExtensions: Proto2Unittest_TestAllExtensionsLite {
+    get {return _allExtensions ?? Proto2Unittest_TestAllExtensionsLite()}
     set {_allExtensions = newValue}
   }
   /// Returns true if `allExtensions` has been explicitly set.
@@ -1182,11 +1182,11 @@ struct ProtobufUnittest_TestMergeExceptionLite: Sendable {
 
   init() {}
 
-  fileprivate var _allExtensions: ProtobufUnittest_TestAllExtensionsLite? = nil
+  fileprivate var _allExtensions: Proto2Unittest_TestAllExtensionsLite? = nil
 }
 
 /// TestEmptyMessageLite is used to test unknown fields support in lite mode.
-struct ProtobufUnittest_TestEmptyMessageLite: Sendable {
+struct Proto2Unittest_TestEmptyMessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1198,7 +1198,7 @@ struct ProtobufUnittest_TestEmptyMessageLite: Sendable {
 
 /// Like above, but declare all field numbers as potential extensions.  No
 /// actual extensions should ever be defined for this type.
-struct ProtobufUnittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1210,7 +1210,7 @@ struct ProtobufUnittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.Extens
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_V1MessageLite: Sendable {
+struct Proto2Unittest_V1MessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1224,7 +1224,7 @@ struct ProtobufUnittest_V1MessageLite: Sendable {
   /// Clears the value of `intField`. Subsequent reads from it will return its default value.
   mutating func clearIntField() {self._intField = nil}
 
-  var enumField: ProtobufUnittest_V1EnumLite {
+  var enumField: Proto2Unittest_V1EnumLite {
     get {return _enumField ?? .v1First}
     set {_enumField = newValue}
   }
@@ -1238,10 +1238,10 @@ struct ProtobufUnittest_V1MessageLite: Sendable {
   init() {}
 
   fileprivate var _intField: Int32? = nil
-  fileprivate var _enumField: ProtobufUnittest_V1EnumLite? = nil
+  fileprivate var _enumField: Proto2Unittest_V1EnumLite? = nil
 }
 
-struct ProtobufUnittest_V2MessageLite: Sendable {
+struct Proto2Unittest_V2MessageLite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1255,7 +1255,7 @@ struct ProtobufUnittest_V2MessageLite: Sendable {
   /// Clears the value of `intField`. Subsequent reads from it will return its default value.
   mutating func clearIntField() {self._intField = nil}
 
-  var enumField: ProtobufUnittest_V2EnumLite {
+  var enumField: Proto2Unittest_V2EnumLite {
     get {return _enumField ?? .v2First}
     set {_enumField = newValue}
   }
@@ -1269,10 +1269,10 @@ struct ProtobufUnittest_V2MessageLite: Sendable {
   init() {}
 
   fileprivate var _intField: Int32? = nil
-  fileprivate var _enumField: ProtobufUnittest_V2EnumLite? = nil
+  fileprivate var _enumField: Proto2Unittest_V2EnumLite? = nil
 }
 
-struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
+struct Proto2Unittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessage, @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1299,7 +1299,7 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
 
   var packedInt32: [Int32] = []
 
-  var optionalEnum: ProtobufUnittest_ForeignEnumLite {
+  var optionalEnum: Proto2Unittest_ForeignEnumLite {
     get {return _optionalEnum ?? .foreignLiteFoo}
     set {_optionalEnum = newValue}
   }
@@ -1326,8 +1326,8 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
   /// Clears the value of `optionalBytes`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBytes() {self._optionalBytes = nil}
 
-  var optionalMessage: ProtobufUnittest_ForeignMessageLite {
-    get {return _optionalMessage ?? ProtobufUnittest_ForeignMessageLite()}
+  var optionalMessage: Proto2Unittest_ForeignMessageLite {
+    get {return _optionalMessage ?? Proto2Unittest_ForeignMessageLite()}
     set {_optionalMessage = newValue}
   }
   /// Returns true if `optionalMessage` has been explicitly set.
@@ -1335,8 +1335,8 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
   /// Clears the value of `optionalMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalMessage() {self._optionalMessage = nil}
 
-  var optionalGroup: ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup {
-    get {return _optionalGroup ?? ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup()}
+  var optionalGroup: Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup {
+    get {return _optionalGroup ?? Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup()}
     set {_optionalGroup = newValue}
   }
   /// Returns true if `optionalGroup` has been explicitly set.
@@ -1346,7 +1346,7 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
 
   var stringStringMap: Dictionary<String,String> = [:]
 
-  var oneofField: ProtobufUnittest_TestHugeFieldNumbersLite.OneOf_OneofField? = nil
+  var oneofField: Proto2Unittest_TestHugeFieldNumbersLite.OneOf_OneofField? = nil
 
   var oneofUint32: UInt32 {
     get {
@@ -1356,10 +1356,10 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
     set {oneofField = .oneofUint32(newValue)}
   }
 
-  var oneofTestAllTypes: ProtobufUnittest_TestAllTypesLite {
+  var oneofTestAllTypes: Proto2Unittest_TestAllTypesLite {
     get {
       if case .oneofTestAllTypes(let v)? = oneofField {return v}
-      return ProtobufUnittest_TestAllTypesLite()
+      return Proto2Unittest_TestAllTypesLite()
     }
     set {oneofField = .oneofTestAllTypes(newValue)}
   }
@@ -1384,7 +1384,7 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
     case oneofUint32(UInt32)
-    case oneofTestAllTypes(ProtobufUnittest_TestAllTypesLite)
+    case oneofTestAllTypes(Proto2Unittest_TestAllTypesLite)
     case oneofString(String)
     case oneofBytes(Data)
 
@@ -1416,19 +1416,19 @@ struct ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.ExtensibleMessag
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
   fileprivate var _optionalInt32: Int32? = nil
   fileprivate var _fixed32: Int32? = nil
-  fileprivate var _optionalEnum: ProtobufUnittest_ForeignEnumLite? = nil
+  fileprivate var _optionalEnum: Proto2Unittest_ForeignEnumLite? = nil
   fileprivate var _optionalString: String? = nil
   fileprivate var _optionalBytes: Data? = nil
-  fileprivate var _optionalMessage: ProtobufUnittest_ForeignMessageLite? = nil
-  fileprivate var _optionalGroup: ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup? = nil
+  fileprivate var _optionalMessage: Proto2Unittest_ForeignMessageLite? = nil
+  fileprivate var _optionalGroup: Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup? = nil
 }
 
-struct ProtobufUnittest_TestOneofParsingLite: @unchecked Sendable {
+struct Proto2Unittest_TestOneofParsingLite: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var oneofField: ProtobufUnittest_TestOneofParsingLite.OneOf_OneofField? = nil
+  var oneofField: Proto2Unittest_TestOneofParsingLite.OneOf_OneofField? = nil
 
   var oneofInt32: Int32 {
     get {
@@ -1438,10 +1438,10 @@ struct ProtobufUnittest_TestOneofParsingLite: @unchecked Sendable {
     set {oneofField = .oneofInt32(newValue)}
   }
 
-  var oneofSubmessage: ProtobufUnittest_TestAllTypesLite {
+  var oneofSubmessage: Proto2Unittest_TestAllTypesLite {
     get {
       if case .oneofSubmessage(let v)? = oneofField {return v}
-      return ProtobufUnittest_TestAllTypesLite()
+      return Proto2Unittest_TestAllTypesLite()
     }
     set {oneofField = .oneofSubmessage(newValue)}
   }
@@ -1494,7 +1494,7 @@ struct ProtobufUnittest_TestOneofParsingLite: @unchecked Sendable {
     set {oneofField = .oneofBytesStringPiece(newValue)}
   }
 
-  var oneofEnum: ProtobufUnittest_V2EnumLite {
+  var oneofEnum: Proto2Unittest_V2EnumLite {
     get {
       if case .oneofEnum(let v)? = oneofField {return v}
       return .v2First
@@ -1506,21 +1506,21 @@ struct ProtobufUnittest_TestOneofParsingLite: @unchecked Sendable {
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
     case oneofInt32(Int32)
-    case oneofSubmessage(ProtobufUnittest_TestAllTypesLite)
+    case oneofSubmessage(Proto2Unittest_TestAllTypesLite)
     case oneofString(String)
     case oneofBytes(Data)
     case oneofStringCord(String)
     case oneofBytesCord(Data)
     case oneofStringStringPiece(String)
     case oneofBytesStringPiece(Data)
-    case oneofEnum(ProtobufUnittest_V2EnumLite)
+    case oneofEnum(Proto2Unittest_V2EnumLite)
 
   }
 
   init() {}
 }
 
-struct ProtobufUnittest_TestMessageSetLite: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestMessageSetLite: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1535,7 +1535,7 @@ struct ProtobufUnittest_TestMessageSetLite: SwiftProtobuf.ExtensibleMessage, Sen
 /// The following four messages are set up to test for wire compatibility between
 /// packed and non-packed repeated fields. We use the field number 2048, because
 /// that is large enough to require a 3-byte varint for the tag.
-struct ProtobufUnittest_PackedInt32: Sendable {
+struct Proto2Unittest_PackedInt32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1547,7 +1547,7 @@ struct ProtobufUnittest_PackedInt32: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_NonPackedInt32: Sendable {
+struct Proto2Unittest_NonPackedInt32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1559,7 +1559,7 @@ struct ProtobufUnittest_NonPackedInt32: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_PackedFixed32: Sendable {
+struct Proto2Unittest_PackedFixed32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1571,7 +1571,7 @@ struct ProtobufUnittest_PackedFixed32: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_NonPackedFixed32: Sendable {
+struct Proto2Unittest_NonPackedFixed32: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1584,7 +1584,7 @@ struct ProtobufUnittest_NonPackedFixed32: Sendable {
 }
 
 /// Test an enum that has multiple values with the same number.
-struct ProtobufUnittest_DupEnum: Sendable {
+struct Proto2Unittest_DupEnum: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -1607,13 +1607,13 @@ struct ProtobufUnittest_DupEnum: Sendable {
   init() {}
 }
 
-struct ProtobufUnittest_RecursiveMessage: @unchecked Sendable {
+struct Proto2Unittest_RecursiveMessage: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var recurse: ProtobufUnittest_RecursiveMessage {
-    get {return _storage._recurse ?? ProtobufUnittest_RecursiveMessage()}
+  var recurse: Proto2Unittest_RecursiveMessage {
+    get {return _storage._recurse ?? Proto2Unittest_RecursiveMessage()}
     set {_uniqueStorage()._recurse = newValue}
   }
   /// Returns true if `recurse` has been explicitly set.
@@ -1637,13 +1637,13 @@ struct ProtobufUnittest_RecursiveMessage: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_RecursiveGroup: @unchecked Sendable {
+struct Proto2Unittest_RecursiveGroup: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var recurse: ProtobufUnittest_RecursiveGroup {
-    get {return _storage._recurse ?? ProtobufUnittest_RecursiveGroup()}
+  var recurse: Proto2Unittest_RecursiveGroup {
+    get {return _storage._recurse ?? Proto2Unittest_RecursiveGroup()}
     set {_uniqueStorage()._recurse = newValue}
   }
   /// Returns true if `recurse` has been explicitly set.
@@ -1667,1156 +1667,1156 @@ struct ProtobufUnittest_RecursiveGroup: @unchecked Sendable {
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_TestAllExtensionsLite {
+extension Proto2Unittest_TestAllExtensionsLite {
 
   /// Singular
-  var ProtobufUnittest_optionalInt32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalInt32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_int32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_int32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalInt32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension_lite)
+  var hasProto2Unittest_optionalInt32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_int32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_int32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalInt32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_int32_extension_lite)
+  mutating func clearProto2Unittest_optionalInt32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_int32_extension_lite)
   }
 
-  var ProtobufUnittest_optionalInt64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalInt64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_int64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_int64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalInt64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension_lite)
+  var hasProto2Unittest_optionalInt64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_int64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_int64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalInt64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_int64_extension_lite)
+  mutating func clearProto2Unittest_optionalInt64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_int64_extension_lite)
   }
 
-  var ProtobufUnittest_optionalUint32ExtensionLite: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalUint32ExtensionLite: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_uint32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_uint32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUint32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension_lite)
+  var hasProto2Unittest_optionalUint32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_uint32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_uint32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUint32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint32_extension_lite)
+  mutating func clearProto2Unittest_optionalUint32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_uint32_extension_lite)
   }
 
-  var ProtobufUnittest_optionalUint64ExtensionLite: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalUint64ExtensionLite: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_uint64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_uint64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUint64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension_lite)
+  var hasProto2Unittest_optionalUint64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_uint64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_uint64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUint64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_uint64_extension_lite)
+  mutating func clearProto2Unittest_optionalUint64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_uint64_extension_lite)
   }
 
-  var ProtobufUnittest_optionalSint32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalSint32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sint32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sint32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSint32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension_lite)
+  var hasProto2Unittest_optionalSint32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sint32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sint32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSint32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint32_extension_lite)
+  mutating func clearProto2Unittest_optionalSint32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sint32_extension_lite)
   }
 
-  var ProtobufUnittest_optionalSint64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalSint64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sint64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sint64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSint64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension_lite)
+  var hasProto2Unittest_optionalSint64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sint64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sint64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSint64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sint64_extension_lite)
+  mutating func clearProto2Unittest_optionalSint64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sint64_extension_lite)
   }
 
-  var ProtobufUnittest_optionalFixed32ExtensionLite: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalFixed32ExtensionLite: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_fixed32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_fixed32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFixed32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension_lite)
+  var hasProto2Unittest_optionalFixed32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_fixed32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_fixed32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFixed32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed32_extension_lite)
+  mutating func clearProto2Unittest_optionalFixed32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed32_extension_lite)
   }
 
-  var ProtobufUnittest_optionalFixed64ExtensionLite: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalFixed64ExtensionLite: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_fixed64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_fixed64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFixed64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension_lite)
+  var hasProto2Unittest_optionalFixed64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_fixed64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_fixed64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFixed64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_fixed64_extension_lite)
+  mutating func clearProto2Unittest_optionalFixed64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_fixed64_extension_lite)
   }
 
-  var ProtobufUnittest_optionalSfixed32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalSfixed32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sfixed32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sfixed32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSfixed32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension_lite)
+  var hasProto2Unittest_optionalSfixed32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sfixed32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sfixed32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSfixed32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed32_extension_lite)
+  mutating func clearProto2Unittest_optionalSfixed32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed32_extension_lite)
   }
 
-  var ProtobufUnittest_optionalSfixed64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalSfixed64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_sfixed64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_sfixed64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalSfixed64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension_lite)
+  var hasProto2Unittest_optionalSfixed64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_sfixed64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_sfixed64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalSfixed64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_sfixed64_extension_lite)
+  mutating func clearProto2Unittest_optionalSfixed64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_sfixed64_extension_lite)
   }
 
-  var ProtobufUnittest_optionalFloatExtensionLite: Float {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalFloatExtensionLite: Float {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_float_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_float_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalFloatExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension_lite)
+  var hasProto2Unittest_optionalFloatExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_float_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_float_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalFloatExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_float_extension_lite)
+  mutating func clearProto2Unittest_optionalFloatExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_float_extension_lite)
   }
 
-  var ProtobufUnittest_optionalDoubleExtensionLite: Double {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalDoubleExtensionLite: Double {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_double_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_double_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalDoubleExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension_lite)
+  var hasProto2Unittest_optionalDoubleExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_double_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_double_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalDoubleExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_double_extension_lite)
+  mutating func clearProto2Unittest_optionalDoubleExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_double_extension_lite)
   }
 
-  var ProtobufUnittest_optionalBoolExtensionLite: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension_lite) ?? false}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalBoolExtensionLite: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension_lite) ?? false}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bool_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bool_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBoolExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension_lite)
+  var hasProto2Unittest_optionalBoolExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bool_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bool_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBoolExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bool_extension_lite)
+  mutating func clearProto2Unittest_optionalBoolExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bool_extension_lite)
   }
 
-  var ProtobufUnittest_optionalStringExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension_lite) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalStringExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension_lite) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_string_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_string_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalStringExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension_lite)
+  var hasProto2Unittest_optionalStringExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_string_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_string_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalStringExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_extension_lite)
+  mutating func clearProto2Unittest_optionalStringExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_string_extension_lite)
   }
 
-  var ProtobufUnittest_optionalBytesExtensionLite: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension_lite) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalBytesExtensionLite: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension_lite) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bytes_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bytes_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBytesExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension_lite)
+  var hasProto2Unittest_optionalBytesExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bytes_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bytes_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBytesExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_extension_lite)
+  mutating func clearProto2Unittest_optionalBytesExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_extension_lite)
   }
 
-  var ProtobufUnittest_optionalGroupExtensionLite: ProtobufUnittest_OptionalGroup_extension_lite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension_lite) ?? ProtobufUnittest_OptionalGroup_extension_lite()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalGroupExtensionLite: Proto2Unittest_OptionalGroup_extension_lite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension_lite) ?? Proto2Unittest_OptionalGroup_extension_lite()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_OptionalGroup_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_OptionalGroup_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalGroupExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension_lite)
+  var hasProto2Unittest_optionalGroupExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_OptionalGroup_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_OptionalGroup_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalGroupExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_OptionalGroup_extension_lite)
+  mutating func clearProto2Unittest_optionalGroupExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_OptionalGroup_extension_lite)
   }
 
-  var ProtobufUnittest_optionalNestedMessageExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension_lite) ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalNestedMessageExtensionLite: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension_lite) ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_nested_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_nested_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalNestedMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension_lite)
+  var hasProto2Unittest_optionalNestedMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_nested_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_nested_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalNestedMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_message_extension_lite)
+  mutating func clearProto2Unittest_optionalNestedMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_message_extension_lite)
   }
 
-  var ProtobufUnittest_optionalForeignMessageExtensionLite: ProtobufUnittest_ForeignMessageLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension_lite) ?? ProtobufUnittest_ForeignMessageLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalForeignMessageExtensionLite: Proto2Unittest_ForeignMessageLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension_lite) ?? Proto2Unittest_ForeignMessageLite()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_foreign_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_foreign_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalForeignMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension_lite)
+  var hasProto2Unittest_optionalForeignMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_foreign_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_foreign_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalForeignMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_message_extension_lite)
+  mutating func clearProto2Unittest_optionalForeignMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_message_extension_lite)
   }
 
-  var ProtobufUnittest_optionalImportMessageExtensionLite: ProtobufUnittestImport_ImportMessageLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension_lite) ?? ProtobufUnittestImport_ImportMessageLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalImportMessageExtensionLite: Proto2UnittestImport_ImportMessageLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension_lite) ?? Proto2UnittestImport_ImportMessageLite()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_import_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_import_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalImportMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension_lite)
+  var hasProto2Unittest_optionalImportMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_import_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_import_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalImportMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_message_extension_lite)
+  mutating func clearProto2Unittest_optionalImportMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_import_message_extension_lite)
   }
 
-  var ProtobufUnittest_optionalNestedEnumExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension_lite) ?? .foo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalNestedEnumExtensionLite: Proto2Unittest_TestAllTypesLite.NestedEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension_lite) ?? .foo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_nested_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_nested_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalNestedEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension_lite)
+  var hasProto2Unittest_optionalNestedEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_nested_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_nested_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalNestedEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_nested_enum_extension_lite)
+  mutating func clearProto2Unittest_optionalNestedEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_nested_enum_extension_lite)
   }
 
-  var ProtobufUnittest_optionalForeignEnumExtensionLite: ProtobufUnittest_ForeignEnumLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite) ?? .foreignLiteFoo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalForeignEnumExtensionLite: Proto2Unittest_ForeignEnumLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension_lite) ?? .foreignLiteFoo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_foreign_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalForeignEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite)
+  var hasProto2Unittest_optionalForeignEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_foreign_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalForeignEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite)
+  mutating func clearProto2Unittest_optionalForeignEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_foreign_enum_extension_lite)
   }
 
-  var ProtobufUnittest_optionalImportEnumExtensionLite: ProtobufUnittestImport_ImportEnumLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension_lite) ?? .importLiteFoo}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalImportEnumExtensionLite: Proto2UnittestImport_ImportEnumLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension_lite) ?? .importLiteFoo}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_import_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_import_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalImportEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension_lite)
+  var hasProto2Unittest_optionalImportEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_import_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_import_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalImportEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_import_enum_extension_lite)
+  mutating func clearProto2Unittest_optionalImportEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_import_enum_extension_lite)
   }
 
-  var ProtobufUnittest_optionalStringPieceExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension_lite) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalStringPieceExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension_lite) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_string_piece_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_string_piece_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalStringPieceExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension_lite)
+  var hasProto2Unittest_optionalStringPieceExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_string_piece_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_string_piece_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalStringPieceExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_string_piece_extension_lite)
+  mutating func clearProto2Unittest_optionalStringPieceExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_string_piece_extension_lite)
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_optionalCordExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension_lite) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalCordExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension_lite) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_cord_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_cord_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalCordExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension_lite)
+  var hasProto2Unittest_optionalCordExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_cord_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_cord_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalCordExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_cord_extension_lite)
+  mutating func clearProto2Unittest_optionalCordExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_cord_extension_lite)
   }
 
-  var ProtobufUnittest_optionalBytesCordExtensionLite: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalBytesCordExtensionLite: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension_lite) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_bytes_cord_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalBytesCordExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite)
+  var hasProto2Unittest_optionalBytesCordExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_bytes_cord_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalBytesCordExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite)
+  mutating func clearProto2Unittest_optionalBytesCordExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_bytes_cord_extension_lite)
   }
 
-  var ProtobufUnittest_optionalPublicImportMessageExtensionLite: ProtobufUnittestImport_PublicImportMessageLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension_lite) ?? ProtobufUnittestImport_PublicImportMessageLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalPublicImportMessageExtensionLite: Proto2UnittestImport_PublicImportMessageLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension_lite) ?? Proto2UnittestImport_PublicImportMessageLite()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_public_import_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_public_import_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalPublicImportMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension_lite)
+  var hasProto2Unittest_optionalPublicImportMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_public_import_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_public_import_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalPublicImportMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_public_import_message_extension_lite)
+  mutating func clearProto2Unittest_optionalPublicImportMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_public_import_message_extension_lite)
   }
 
-  var ProtobufUnittest_optionalLazyMessageExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension_lite) ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalLazyMessageExtensionLite: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension_lite) ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_lazy_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_lazy_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalLazyMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension_lite)
+  var hasProto2Unittest_optionalLazyMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_lazy_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_lazy_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalLazyMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_lazy_message_extension_lite)
+  mutating func clearProto2Unittest_optionalLazyMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_lazy_message_extension_lite)
   }
 
-  var ProtobufUnittest_optionalUnverifiedLazyMessageExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite) ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite, value: newValue)}
+  var Proto2Unittest_optionalUnverifiedLazyMessageExtensionLite: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite) ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_optionalUnverifiedLazyMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite)
+  var hasProto2Unittest_optionalUnverifiedLazyMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_optionalUnverifiedLazyMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite)
+  mutating func clearProto2Unittest_optionalUnverifiedLazyMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite)
   }
 
   /// Repeated
-  var ProtobufUnittest_repeatedInt32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int32_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedInt32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_int32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_int32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedInt64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_int64_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedInt64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_int64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_int64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedUint32ExtensionLite: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint32_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedUint32ExtensionLite: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedUint64ExtensionLite: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_uint64_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedUint64ExtensionLite: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_uint64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSint32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint32_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedSint32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSint64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sint64_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedSint64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sint64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFixed32ExtensionLite: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedFixed32ExtensionLite: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFixed64ExtensionLite: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_fixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedFixed64ExtensionLite: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_fixed64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSfixed32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedSfixed32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedSfixed64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_sfixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedSfixed64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_sfixed64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedFloatExtensionLite: [Float] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_float_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_float_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedFloatExtensionLite: [Float] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_float_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_float_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedDoubleExtensionLite: [Double] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_double_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_double_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedDoubleExtensionLite: [Double] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_double_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_double_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedBoolExtensionLite: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bool_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bool_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedBoolExtensionLite: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_bool_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_bool_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedStringExtensionLite: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedStringExtensionLite: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedBytesExtensionLite: [Data] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedBytesExtensionLite: [Data] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedGroupExtensionLite: [ProtobufUnittest_RepeatedGroup_extension_lite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_RepeatedGroup_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_RepeatedGroup_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedGroupExtensionLite: [Proto2Unittest_RepeatedGroup_extension_lite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_RepeatedGroup_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_RepeatedGroup_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedNestedMessageExtensionLite: [ProtobufUnittest_TestAllTypesLite.NestedMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_message_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_message_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedNestedMessageExtensionLite: [Proto2Unittest_TestAllTypesLite.NestedMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_message_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_message_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedForeignMessageExtensionLite: [ProtobufUnittest_ForeignMessageLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_message_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_message_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedForeignMessageExtensionLite: [Proto2Unittest_ForeignMessageLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_message_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_message_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedImportMessageExtensionLite: [ProtobufUnittestImport_ImportMessageLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_message_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_message_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedImportMessageExtensionLite: [Proto2UnittestImport_ImportMessageLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_message_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_message_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedNestedEnumExtensionLite: [ProtobufUnittest_TestAllTypesLite.NestedEnum] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_enum_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_nested_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedNestedEnumExtensionLite: [Proto2Unittest_TestAllTypesLite.NestedEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_enum_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_nested_enum_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedForeignEnumExtensionLite: [ProtobufUnittest_ForeignEnumLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_enum_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_foreign_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedForeignEnumExtensionLite: [Proto2Unittest_ForeignEnumLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_enum_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_foreign_enum_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedImportEnumExtensionLite: [ProtobufUnittestImport_ImportEnumLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_enum_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_import_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedImportEnumExtensionLite: [Proto2UnittestImport_ImportEnumLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_enum_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_import_enum_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedStringPieceExtensionLite: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_piece_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_piece_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedStringPieceExtensionLite: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_piece_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_piece_extension_lite, value: newValue)}
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_repeatedCordExtensionLite: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_cord_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_cord_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedCordExtensionLite: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_cord_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_cord_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedLazyMessageExtensionLite: [ProtobufUnittest_TestAllTypesLite.NestedMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_lazy_message_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_lazy_message_extension_lite, value: newValue)}
+  var Proto2Unittest_repeatedLazyMessageExtensionLite: [Proto2Unittest_TestAllTypesLite.NestedMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_lazy_message_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_lazy_message_extension_lite, value: newValue)}
   }
 
   /// Singular with defaults
-  var ProtobufUnittest_defaultInt32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension_lite) ?? 41}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultInt32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension_lite) ?? 41}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_int32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_int32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultInt32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension_lite)
+  var hasProto2Unittest_defaultInt32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_int32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_int32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultInt32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_int32_extension_lite)
+  mutating func clearProto2Unittest_defaultInt32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_int32_extension_lite)
   }
 
-  var ProtobufUnittest_defaultInt64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension_lite) ?? 42}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultInt64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension_lite) ?? 42}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_int64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_int64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultInt64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension_lite)
+  var hasProto2Unittest_defaultInt64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_int64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_int64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultInt64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_int64_extension_lite)
+  mutating func clearProto2Unittest_defaultInt64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_int64_extension_lite)
   }
 
-  var ProtobufUnittest_defaultUint32ExtensionLite: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension_lite) ?? 43}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultUint32ExtensionLite: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension_lite) ?? 43}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_uint32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_uint32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultUint32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension_lite)
+  var hasProto2Unittest_defaultUint32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_uint32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_uint32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultUint32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_uint32_extension_lite)
+  mutating func clearProto2Unittest_defaultUint32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_uint32_extension_lite)
   }
 
-  var ProtobufUnittest_defaultUint64ExtensionLite: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension_lite) ?? 44}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultUint64ExtensionLite: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension_lite) ?? 44}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_uint64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_uint64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultUint64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension_lite)
+  var hasProto2Unittest_defaultUint64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_uint64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_uint64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultUint64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_uint64_extension_lite)
+  mutating func clearProto2Unittest_defaultUint64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_uint64_extension_lite)
   }
 
-  var ProtobufUnittest_defaultSint32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension_lite) ?? -45}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultSint32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension_lite) ?? -45}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sint32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sint32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSint32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension_lite)
+  var hasProto2Unittest_defaultSint32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sint32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sint32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSint32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sint32_extension_lite)
+  mutating func clearProto2Unittest_defaultSint32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sint32_extension_lite)
   }
 
-  var ProtobufUnittest_defaultSint64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension_lite) ?? 46}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultSint64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension_lite) ?? 46}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sint64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sint64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSint64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension_lite)
+  var hasProto2Unittest_defaultSint64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sint64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sint64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSint64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sint64_extension_lite)
+  mutating func clearProto2Unittest_defaultSint64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sint64_extension_lite)
   }
 
-  var ProtobufUnittest_defaultFixed32ExtensionLite: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension_lite) ?? 47}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultFixed32ExtensionLite: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension_lite) ?? 47}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_fixed32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_fixed32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFixed32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension_lite)
+  var hasProto2Unittest_defaultFixed32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_fixed32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_fixed32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFixed32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed32_extension_lite)
+  mutating func clearProto2Unittest_defaultFixed32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_fixed32_extension_lite)
   }
 
-  var ProtobufUnittest_defaultFixed64ExtensionLite: UInt64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension_lite) ?? 48}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultFixed64ExtensionLite: UInt64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension_lite) ?? 48}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_fixed64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_fixed64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFixed64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension_lite)
+  var hasProto2Unittest_defaultFixed64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_fixed64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_fixed64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFixed64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_fixed64_extension_lite)
+  mutating func clearProto2Unittest_defaultFixed64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_fixed64_extension_lite)
   }
 
-  var ProtobufUnittest_defaultSfixed32ExtensionLite: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension_lite) ?? 49}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultSfixed32ExtensionLite: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension_lite) ?? 49}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sfixed32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sfixed32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSfixed32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension_lite)
+  var hasProto2Unittest_defaultSfixed32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sfixed32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sfixed32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSfixed32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed32_extension_lite)
+  mutating func clearProto2Unittest_defaultSfixed32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed32_extension_lite)
   }
 
-  var ProtobufUnittest_defaultSfixed64ExtensionLite: Int64 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension_lite) ?? -50}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultSfixed64ExtensionLite: Int64 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension_lite) ?? -50}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_sfixed64_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_sfixed64_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultSfixed64ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension_lite)
+  var hasProto2Unittest_defaultSfixed64ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_sfixed64_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_sfixed64_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultSfixed64ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_sfixed64_extension_lite)
+  mutating func clearProto2Unittest_defaultSfixed64ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_sfixed64_extension_lite)
   }
 
-  var ProtobufUnittest_defaultFloatExtensionLite: Float {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension_lite) ?? 51.5}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultFloatExtensionLite: Float {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension_lite) ?? 51.5}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_float_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_float_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultFloatExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension_lite)
+  var hasProto2Unittest_defaultFloatExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_float_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_float_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultFloatExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_float_extension_lite)
+  mutating func clearProto2Unittest_defaultFloatExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_float_extension_lite)
   }
 
-  var ProtobufUnittest_defaultDoubleExtensionLite: Double {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension_lite) ?? 52000}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultDoubleExtensionLite: Double {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension_lite) ?? 52000}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_double_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_double_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultDoubleExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension_lite)
+  var hasProto2Unittest_defaultDoubleExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_double_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_double_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultDoubleExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_double_extension_lite)
+  mutating func clearProto2Unittest_defaultDoubleExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_double_extension_lite)
   }
 
-  var ProtobufUnittest_defaultBoolExtensionLite: Bool {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension_lite) ?? true}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultBoolExtensionLite: Bool {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension_lite) ?? true}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_bool_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_bool_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultBoolExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension_lite)
+  var hasProto2Unittest_defaultBoolExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_bool_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_bool_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultBoolExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_bool_extension_lite)
+  mutating func clearProto2Unittest_defaultBoolExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_bool_extension_lite)
   }
 
-  var ProtobufUnittest_defaultStringExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension_lite) ?? "hello"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultStringExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension_lite) ?? "hello"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_string_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_string_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultStringExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension_lite)
+  var hasProto2Unittest_defaultStringExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_string_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_string_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultStringExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_string_extension_lite)
+  mutating func clearProto2Unittest_defaultStringExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_string_extension_lite)
   }
 
-  var ProtobufUnittest_defaultBytesExtensionLite: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension_lite) ?? Data([119, 111, 114, 108, 100])}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultBytesExtensionLite: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension_lite) ?? Data([119, 111, 114, 108, 100])}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_bytes_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_bytes_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultBytesExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension_lite)
+  var hasProto2Unittest_defaultBytesExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_bytes_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_bytes_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultBytesExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_bytes_extension_lite)
+  mutating func clearProto2Unittest_defaultBytesExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_bytes_extension_lite)
   }
 
-  var ProtobufUnittest_defaultNestedEnumExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedEnum {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension_lite) ?? .bar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultNestedEnumExtensionLite: Proto2Unittest_TestAllTypesLite.NestedEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension_lite) ?? .bar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_nested_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_nested_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultNestedEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension_lite)
+  var hasProto2Unittest_defaultNestedEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_nested_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_nested_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultNestedEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_nested_enum_extension_lite)
+  mutating func clearProto2Unittest_defaultNestedEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_nested_enum_extension_lite)
   }
 
-  var ProtobufUnittest_defaultForeignEnumExtensionLite: ProtobufUnittest_ForeignEnumLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension_lite) ?? .foreignLiteBar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultForeignEnumExtensionLite: Proto2Unittest_ForeignEnumLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension_lite) ?? .foreignLiteBar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_foreign_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_foreign_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultForeignEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension_lite)
+  var hasProto2Unittest_defaultForeignEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_foreign_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_foreign_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultForeignEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_foreign_enum_extension_lite)
+  mutating func clearProto2Unittest_defaultForeignEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_foreign_enum_extension_lite)
   }
 
-  var ProtobufUnittest_defaultImportEnumExtensionLite: ProtobufUnittestImport_ImportEnumLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension_lite) ?? .importLiteBar}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultImportEnumExtensionLite: Proto2UnittestImport_ImportEnumLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension_lite) ?? .importLiteBar}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_import_enum_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_import_enum_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultImportEnumExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension_lite)
+  var hasProto2Unittest_defaultImportEnumExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_import_enum_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_import_enum_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultImportEnumExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_import_enum_extension_lite)
+  mutating func clearProto2Unittest_defaultImportEnumExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_import_enum_extension_lite)
   }
 
-  var ProtobufUnittest_defaultStringPieceExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension_lite) ?? "abc"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultStringPieceExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension_lite) ?? "abc"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_string_piece_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_string_piece_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultStringPieceExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension_lite)
+  var hasProto2Unittest_defaultStringPieceExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_string_piece_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_string_piece_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultStringPieceExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_string_piece_extension_lite)
+  mutating func clearProto2Unittest_defaultStringPieceExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_string_piece_extension_lite)
   }
 
   /// TODO: ctype=CORD is not supported for extension. Add
   /// ctype=CORD option back after it is supported.
-  var ProtobufUnittest_defaultCordExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension_lite) ?? "123"}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension_lite, value: newValue)}
+  var Proto2Unittest_defaultCordExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension_lite) ?? "123"}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_default_cord_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_default_cord_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_defaultCordExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension_lite)
+  var hasProto2Unittest_defaultCordExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_default_cord_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_default_cord_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_defaultCordExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_default_cord_extension_lite)
+  mutating func clearProto2Unittest_defaultCordExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_default_cord_extension_lite)
   }
 
   /// For oneof test
-  var ProtobufUnittest_oneofUint32ExtensionLite: UInt32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension_lite) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension_lite, value: newValue)}
+  var Proto2Unittest_oneofUint32ExtensionLite: UInt32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension_lite) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_uint32_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_uint32_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofUint32ExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension_lite)
+  var hasProto2Unittest_oneofUint32ExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_uint32_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_uint32_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofUint32ExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_uint32_extension_lite)
+  mutating func clearProto2Unittest_oneofUint32ExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_uint32_extension_lite)
   }
 
-  var ProtobufUnittest_oneofNestedMessageExtensionLite: ProtobufUnittest_TestAllTypesLite.NestedMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension_lite) ?? ProtobufUnittest_TestAllTypesLite.NestedMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension_lite, value: newValue)}
+  var Proto2Unittest_oneofNestedMessageExtensionLite: Proto2Unittest_TestAllTypesLite.NestedMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension_lite) ?? Proto2Unittest_TestAllTypesLite.NestedMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_nested_message_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_nested_message_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofNestedMessageExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension_lite)
+  var hasProto2Unittest_oneofNestedMessageExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_nested_message_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_nested_message_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofNestedMessageExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_nested_message_extension_lite)
+  mutating func clearProto2Unittest_oneofNestedMessageExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_nested_message_extension_lite)
   }
 
-  var ProtobufUnittest_oneofStringExtensionLite: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension_lite) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension_lite, value: newValue)}
+  var Proto2Unittest_oneofStringExtensionLite: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension_lite) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_string_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_string_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofStringExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension_lite)
+  var hasProto2Unittest_oneofStringExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_string_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_string_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofStringExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_string_extension_lite)
+  mutating func clearProto2Unittest_oneofStringExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_string_extension_lite)
   }
 
-  var ProtobufUnittest_oneofBytesExtensionLite: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension_lite) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension_lite, value: newValue)}
+  var Proto2Unittest_oneofBytesExtensionLite: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension_lite) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_bytes_extension_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_bytes_extension_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofBytesExtensionLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension_lite)
+  var hasProto2Unittest_oneofBytesExtensionLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_bytes_extension_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_bytes_extension_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofBytesExtensionLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_bytes_extension_lite)
+  mutating func clearProto2Unittest_oneofBytesExtensionLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_bytes_extension_lite)
   }
 
-  var ProtobufUnittest_TestNestedExtensionLite_nestedExtension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension, value: newValue)}
+  var Proto2Unittest_TestNestedExtensionLite_nestedExtension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension`
+  /// Returns true if extension `Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestNestedExtensionLite_nestedExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension)
+  var hasProto2Unittest_TestNestedExtensionLite_nestedExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestNestedExtensionLite_nestedExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension)
+  mutating func clearProto2Unittest_TestNestedExtensionLite_nestedExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension)
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbersLite {
+extension Proto2Unittest_TestHugeFieldNumbersLite {
 
-  var ProtobufUnittest_testAllTypesLite: ProtobufUnittest_TestAllTypesLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types_lite) ?? ProtobufUnittest_TestAllTypesLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types_lite, value: newValue)}
+  var Proto2Unittest_testAllTypesLite: Proto2Unittest_TestAllTypesLite {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_test_all_types_lite) ?? Proto2Unittest_TestAllTypesLite()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_test_all_types_lite, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_test_all_types_lite`
+  /// Returns true if extension `Proto2Unittest_Extensions_test_all_types_lite`
   /// has been explicitly set.
-  var hasProtobufUnittest_testAllTypesLite: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types_lite)
+  var hasProto2Unittest_testAllTypesLite: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_test_all_types_lite)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_test_all_types_lite`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_test_all_types_lite`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_testAllTypesLite() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_test_all_types_lite)
+  mutating func clearProto2Unittest_testAllTypesLite() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_test_all_types_lite)
   }
 }
 
-extension ProtobufUnittest_TestPackedExtensionsLite {
+extension Proto2Unittest_TestPackedExtensionsLite {
 
-  var ProtobufUnittest_packedInt32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_int32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_int32_extension_lite, value: newValue)}
+  var Proto2Unittest_packedInt32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_int32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_int32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedInt64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_int64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_int64_extension_lite, value: newValue)}
+  var Proto2Unittest_packedInt64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_int64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_int64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedUint32ExtensionLite: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint32_extension_lite, value: newValue)}
+  var Proto2Unittest_packedUint32ExtensionLite: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_uint32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_uint32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedUint64ExtensionLite: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_uint64_extension_lite, value: newValue)}
+  var Proto2Unittest_packedUint64ExtensionLite: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_uint64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_uint64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSint32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint32_extension_lite, value: newValue)}
+  var Proto2Unittest_packedSint32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sint32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sint32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSint64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sint64_extension_lite, value: newValue)}
+  var Proto2Unittest_packedSint64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sint64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sint64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFixed32ExtensionLite: [UInt32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_packedFixed32ExtensionLite: [UInt32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFixed64ExtensionLite: [UInt64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_fixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_packedFixed64ExtensionLite: [UInt64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_fixed64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSfixed32ExtensionLite: [Int32] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed32_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed32_extension_lite, value: newValue)}
+  var Proto2Unittest_packedSfixed32ExtensionLite: [Int32] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed32_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed32_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedSfixed64ExtensionLite: [Int64] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed64_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_sfixed64_extension_lite, value: newValue)}
+  var Proto2Unittest_packedSfixed64ExtensionLite: [Int64] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed64_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_sfixed64_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedFloatExtensionLite: [Float] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_float_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_float_extension_lite, value: newValue)}
+  var Proto2Unittest_packedFloatExtensionLite: [Float] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_float_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_float_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedDoubleExtensionLite: [Double] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_double_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_double_extension_lite, value: newValue)}
+  var Proto2Unittest_packedDoubleExtensionLite: [Double] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_double_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_double_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedBoolExtensionLite: [Bool] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_bool_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_bool_extension_lite, value: newValue)}
+  var Proto2Unittest_packedBoolExtensionLite: [Bool] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_bool_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_bool_extension_lite, value: newValue)}
   }
 
-  var ProtobufUnittest_packedEnumExtensionLite: [ProtobufUnittest_ForeignEnumLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_packed_enum_extension_lite) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_packed_enum_extension_lite, value: newValue)}
+  var Proto2Unittest_packedEnumExtensionLite: [Proto2Unittest_ForeignEnumLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_packed_enum_extension_lite) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_packed_enum_extension_lite, value: newValue)}
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite {
+extension Proto2Unittest_TestParsingMergeLite {
 
-  var ProtobufUnittest_TestParsingMergeLite_optionalExt: ProtobufUnittest_TestAllTypesLite {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext) ?? ProtobufUnittest_TestAllTypesLite()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext, value: newValue)}
+  var Proto2Unittest_TestParsingMergeLite_optionalExt: Proto2Unittest_TestAllTypesLite {
+    get {return getExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext) ?? Proto2Unittest_TestAllTypesLite()}
+    set {setExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext`
+  /// Returns true if extension `Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestParsingMergeLite_optionalExt: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext)
+  var hasProto2Unittest_TestParsingMergeLite_optionalExt: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext`.
+  /// Clears the value of extension `Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestParsingMergeLite_optionalExt() {
-    clearExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext)
+  mutating func clearProto2Unittest_TestParsingMergeLite_optionalExt() {
+    clearExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext)
   }
 
-  var ProtobufUnittest_TestParsingMergeLite_repeatedExt: [ProtobufUnittest_TestAllTypesLite] {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.repeated_ext) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_TestParsingMergeLite.Extensions.repeated_ext, value: newValue)}
+  var Proto2Unittest_TestParsingMergeLite_repeatedExt: [Proto2Unittest_TestAllTypesLite] {
+    get {return getExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.repeated_ext) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_TestParsingMergeLite.Extensions.repeated_ext, value: newValue)}
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestLite_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestLite_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestLite_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Extensions_optional_int32_extension_lite,
-  ProtobufUnittest_Extensions_optional_int64_extension_lite,
-  ProtobufUnittest_Extensions_optional_uint32_extension_lite,
-  ProtobufUnittest_Extensions_optional_uint64_extension_lite,
-  ProtobufUnittest_Extensions_optional_sint32_extension_lite,
-  ProtobufUnittest_Extensions_optional_sint64_extension_lite,
-  ProtobufUnittest_Extensions_optional_fixed32_extension_lite,
-  ProtobufUnittest_Extensions_optional_fixed64_extension_lite,
-  ProtobufUnittest_Extensions_optional_sfixed32_extension_lite,
-  ProtobufUnittest_Extensions_optional_sfixed64_extension_lite,
-  ProtobufUnittest_Extensions_optional_float_extension_lite,
-  ProtobufUnittest_Extensions_optional_double_extension_lite,
-  ProtobufUnittest_Extensions_optional_bool_extension_lite,
-  ProtobufUnittest_Extensions_optional_string_extension_lite,
-  ProtobufUnittest_Extensions_optional_bytes_extension_lite,
-  ProtobufUnittest_Extensions_OptionalGroup_extension_lite,
-  ProtobufUnittest_Extensions_optional_nested_message_extension_lite,
-  ProtobufUnittest_Extensions_optional_foreign_message_extension_lite,
-  ProtobufUnittest_Extensions_optional_import_message_extension_lite,
-  ProtobufUnittest_Extensions_optional_nested_enum_extension_lite,
-  ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite,
-  ProtobufUnittest_Extensions_optional_import_enum_extension_lite,
-  ProtobufUnittest_Extensions_optional_string_piece_extension_lite,
-  ProtobufUnittest_Extensions_optional_cord_extension_lite,
-  ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite,
-  ProtobufUnittest_Extensions_optional_public_import_message_extension_lite,
-  ProtobufUnittest_Extensions_optional_lazy_message_extension_lite,
-  ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite,
-  ProtobufUnittest_Extensions_repeated_int32_extension_lite,
-  ProtobufUnittest_Extensions_repeated_int64_extension_lite,
-  ProtobufUnittest_Extensions_repeated_uint32_extension_lite,
-  ProtobufUnittest_Extensions_repeated_uint64_extension_lite,
-  ProtobufUnittest_Extensions_repeated_sint32_extension_lite,
-  ProtobufUnittest_Extensions_repeated_sint64_extension_lite,
-  ProtobufUnittest_Extensions_repeated_fixed32_extension_lite,
-  ProtobufUnittest_Extensions_repeated_fixed64_extension_lite,
-  ProtobufUnittest_Extensions_repeated_sfixed32_extension_lite,
-  ProtobufUnittest_Extensions_repeated_sfixed64_extension_lite,
-  ProtobufUnittest_Extensions_repeated_float_extension_lite,
-  ProtobufUnittest_Extensions_repeated_double_extension_lite,
-  ProtobufUnittest_Extensions_repeated_bool_extension_lite,
-  ProtobufUnittest_Extensions_repeated_string_extension_lite,
-  ProtobufUnittest_Extensions_repeated_bytes_extension_lite,
-  ProtobufUnittest_Extensions_RepeatedGroup_extension_lite,
-  ProtobufUnittest_Extensions_repeated_nested_message_extension_lite,
-  ProtobufUnittest_Extensions_repeated_foreign_message_extension_lite,
-  ProtobufUnittest_Extensions_repeated_import_message_extension_lite,
-  ProtobufUnittest_Extensions_repeated_nested_enum_extension_lite,
-  ProtobufUnittest_Extensions_repeated_foreign_enum_extension_lite,
-  ProtobufUnittest_Extensions_repeated_import_enum_extension_lite,
-  ProtobufUnittest_Extensions_repeated_string_piece_extension_lite,
-  ProtobufUnittest_Extensions_repeated_cord_extension_lite,
-  ProtobufUnittest_Extensions_repeated_lazy_message_extension_lite,
-  ProtobufUnittest_Extensions_default_int32_extension_lite,
-  ProtobufUnittest_Extensions_default_int64_extension_lite,
-  ProtobufUnittest_Extensions_default_uint32_extension_lite,
-  ProtobufUnittest_Extensions_default_uint64_extension_lite,
-  ProtobufUnittest_Extensions_default_sint32_extension_lite,
-  ProtobufUnittest_Extensions_default_sint64_extension_lite,
-  ProtobufUnittest_Extensions_default_fixed32_extension_lite,
-  ProtobufUnittest_Extensions_default_fixed64_extension_lite,
-  ProtobufUnittest_Extensions_default_sfixed32_extension_lite,
-  ProtobufUnittest_Extensions_default_sfixed64_extension_lite,
-  ProtobufUnittest_Extensions_default_float_extension_lite,
-  ProtobufUnittest_Extensions_default_double_extension_lite,
-  ProtobufUnittest_Extensions_default_bool_extension_lite,
-  ProtobufUnittest_Extensions_default_string_extension_lite,
-  ProtobufUnittest_Extensions_default_bytes_extension_lite,
-  ProtobufUnittest_Extensions_default_nested_enum_extension_lite,
-  ProtobufUnittest_Extensions_default_foreign_enum_extension_lite,
-  ProtobufUnittest_Extensions_default_import_enum_extension_lite,
-  ProtobufUnittest_Extensions_default_string_piece_extension_lite,
-  ProtobufUnittest_Extensions_default_cord_extension_lite,
-  ProtobufUnittest_Extensions_oneof_uint32_extension_lite,
-  ProtobufUnittest_Extensions_oneof_nested_message_extension_lite,
-  ProtobufUnittest_Extensions_oneof_string_extension_lite,
-  ProtobufUnittest_Extensions_oneof_bytes_extension_lite,
-  ProtobufUnittest_Extensions_packed_int32_extension_lite,
-  ProtobufUnittest_Extensions_packed_int64_extension_lite,
-  ProtobufUnittest_Extensions_packed_uint32_extension_lite,
-  ProtobufUnittest_Extensions_packed_uint64_extension_lite,
-  ProtobufUnittest_Extensions_packed_sint32_extension_lite,
-  ProtobufUnittest_Extensions_packed_sint64_extension_lite,
-  ProtobufUnittest_Extensions_packed_fixed32_extension_lite,
-  ProtobufUnittest_Extensions_packed_fixed64_extension_lite,
-  ProtobufUnittest_Extensions_packed_sfixed32_extension_lite,
-  ProtobufUnittest_Extensions_packed_sfixed64_extension_lite,
-  ProtobufUnittest_Extensions_packed_float_extension_lite,
-  ProtobufUnittest_Extensions_packed_double_extension_lite,
-  ProtobufUnittest_Extensions_packed_bool_extension_lite,
-  ProtobufUnittest_Extensions_packed_enum_extension_lite,
-  ProtobufUnittest_Extensions_test_all_types_lite,
-  ProtobufUnittest_TestNestedExtensionLite.Extensions.nested_extension,
-  ProtobufUnittest_TestParsingMergeLite.Extensions.optional_ext,
-  ProtobufUnittest_TestParsingMergeLite.Extensions.repeated_ext
+let Proto2Unittest_UnittestLite_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_optional_int32_extension_lite,
+  Proto2Unittest_Extensions_optional_int64_extension_lite,
+  Proto2Unittest_Extensions_optional_uint32_extension_lite,
+  Proto2Unittest_Extensions_optional_uint64_extension_lite,
+  Proto2Unittest_Extensions_optional_sint32_extension_lite,
+  Proto2Unittest_Extensions_optional_sint64_extension_lite,
+  Proto2Unittest_Extensions_optional_fixed32_extension_lite,
+  Proto2Unittest_Extensions_optional_fixed64_extension_lite,
+  Proto2Unittest_Extensions_optional_sfixed32_extension_lite,
+  Proto2Unittest_Extensions_optional_sfixed64_extension_lite,
+  Proto2Unittest_Extensions_optional_float_extension_lite,
+  Proto2Unittest_Extensions_optional_double_extension_lite,
+  Proto2Unittest_Extensions_optional_bool_extension_lite,
+  Proto2Unittest_Extensions_optional_string_extension_lite,
+  Proto2Unittest_Extensions_optional_bytes_extension_lite,
+  Proto2Unittest_Extensions_OptionalGroup_extension_lite,
+  Proto2Unittest_Extensions_optional_nested_message_extension_lite,
+  Proto2Unittest_Extensions_optional_foreign_message_extension_lite,
+  Proto2Unittest_Extensions_optional_import_message_extension_lite,
+  Proto2Unittest_Extensions_optional_nested_enum_extension_lite,
+  Proto2Unittest_Extensions_optional_foreign_enum_extension_lite,
+  Proto2Unittest_Extensions_optional_import_enum_extension_lite,
+  Proto2Unittest_Extensions_optional_string_piece_extension_lite,
+  Proto2Unittest_Extensions_optional_cord_extension_lite,
+  Proto2Unittest_Extensions_optional_bytes_cord_extension_lite,
+  Proto2Unittest_Extensions_optional_public_import_message_extension_lite,
+  Proto2Unittest_Extensions_optional_lazy_message_extension_lite,
+  Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite,
+  Proto2Unittest_Extensions_repeated_int32_extension_lite,
+  Proto2Unittest_Extensions_repeated_int64_extension_lite,
+  Proto2Unittest_Extensions_repeated_uint32_extension_lite,
+  Proto2Unittest_Extensions_repeated_uint64_extension_lite,
+  Proto2Unittest_Extensions_repeated_sint32_extension_lite,
+  Proto2Unittest_Extensions_repeated_sint64_extension_lite,
+  Proto2Unittest_Extensions_repeated_fixed32_extension_lite,
+  Proto2Unittest_Extensions_repeated_fixed64_extension_lite,
+  Proto2Unittest_Extensions_repeated_sfixed32_extension_lite,
+  Proto2Unittest_Extensions_repeated_sfixed64_extension_lite,
+  Proto2Unittest_Extensions_repeated_float_extension_lite,
+  Proto2Unittest_Extensions_repeated_double_extension_lite,
+  Proto2Unittest_Extensions_repeated_bool_extension_lite,
+  Proto2Unittest_Extensions_repeated_string_extension_lite,
+  Proto2Unittest_Extensions_repeated_bytes_extension_lite,
+  Proto2Unittest_Extensions_RepeatedGroup_extension_lite,
+  Proto2Unittest_Extensions_repeated_nested_message_extension_lite,
+  Proto2Unittest_Extensions_repeated_foreign_message_extension_lite,
+  Proto2Unittest_Extensions_repeated_import_message_extension_lite,
+  Proto2Unittest_Extensions_repeated_nested_enum_extension_lite,
+  Proto2Unittest_Extensions_repeated_foreign_enum_extension_lite,
+  Proto2Unittest_Extensions_repeated_import_enum_extension_lite,
+  Proto2Unittest_Extensions_repeated_string_piece_extension_lite,
+  Proto2Unittest_Extensions_repeated_cord_extension_lite,
+  Proto2Unittest_Extensions_repeated_lazy_message_extension_lite,
+  Proto2Unittest_Extensions_default_int32_extension_lite,
+  Proto2Unittest_Extensions_default_int64_extension_lite,
+  Proto2Unittest_Extensions_default_uint32_extension_lite,
+  Proto2Unittest_Extensions_default_uint64_extension_lite,
+  Proto2Unittest_Extensions_default_sint32_extension_lite,
+  Proto2Unittest_Extensions_default_sint64_extension_lite,
+  Proto2Unittest_Extensions_default_fixed32_extension_lite,
+  Proto2Unittest_Extensions_default_fixed64_extension_lite,
+  Proto2Unittest_Extensions_default_sfixed32_extension_lite,
+  Proto2Unittest_Extensions_default_sfixed64_extension_lite,
+  Proto2Unittest_Extensions_default_float_extension_lite,
+  Proto2Unittest_Extensions_default_double_extension_lite,
+  Proto2Unittest_Extensions_default_bool_extension_lite,
+  Proto2Unittest_Extensions_default_string_extension_lite,
+  Proto2Unittest_Extensions_default_bytes_extension_lite,
+  Proto2Unittest_Extensions_default_nested_enum_extension_lite,
+  Proto2Unittest_Extensions_default_foreign_enum_extension_lite,
+  Proto2Unittest_Extensions_default_import_enum_extension_lite,
+  Proto2Unittest_Extensions_default_string_piece_extension_lite,
+  Proto2Unittest_Extensions_default_cord_extension_lite,
+  Proto2Unittest_Extensions_oneof_uint32_extension_lite,
+  Proto2Unittest_Extensions_oneof_nested_message_extension_lite,
+  Proto2Unittest_Extensions_oneof_string_extension_lite,
+  Proto2Unittest_Extensions_oneof_bytes_extension_lite,
+  Proto2Unittest_Extensions_packed_int32_extension_lite,
+  Proto2Unittest_Extensions_packed_int64_extension_lite,
+  Proto2Unittest_Extensions_packed_uint32_extension_lite,
+  Proto2Unittest_Extensions_packed_uint64_extension_lite,
+  Proto2Unittest_Extensions_packed_sint32_extension_lite,
+  Proto2Unittest_Extensions_packed_sint64_extension_lite,
+  Proto2Unittest_Extensions_packed_fixed32_extension_lite,
+  Proto2Unittest_Extensions_packed_fixed64_extension_lite,
+  Proto2Unittest_Extensions_packed_sfixed32_extension_lite,
+  Proto2Unittest_Extensions_packed_sfixed64_extension_lite,
+  Proto2Unittest_Extensions_packed_float_extension_lite,
+  Proto2Unittest_Extensions_packed_double_extension_lite,
+  Proto2Unittest_Extensions_packed_bool_extension_lite,
+  Proto2Unittest_Extensions_packed_enum_extension_lite,
+  Proto2Unittest_Extensions_test_all_types_lite,
+  Proto2Unittest_TestNestedExtensionLite.Extensions.nested_extension,
+  Proto2Unittest_TestParsingMergeLite.Extensions.optional_ext,
+  Proto2Unittest_TestParsingMergeLite.Extensions.repeated_ext
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
@@ -2824,503 +2824,503 @@ let ProtobufUnittest_UnittestLite_Extensions: SwiftProtobuf.SimpleExtensionMap =
 // accessors for the extension fields on the messages directly.
 
 /// Singular
-let ProtobufUnittest_Extensions_optional_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 1,
-  fieldName: "protobuf_unittest.optional_int32_extension_lite"
+  fieldName: "proto2_unittest.optional_int32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 2,
-  fieldName: "protobuf_unittest.optional_int64_extension_lite"
+  fieldName: "proto2_unittest.optional_int64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 3,
-  fieldName: "protobuf_unittest.optional_uint32_extension_lite"
+  fieldName: "proto2_unittest.optional_uint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 4,
-  fieldName: "protobuf_unittest.optional_uint64_extension_lite"
+  fieldName: "proto2_unittest.optional_uint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 5,
-  fieldName: "protobuf_unittest.optional_sint32_extension_lite"
+  fieldName: "proto2_unittest.optional_sint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 6,
-  fieldName: "protobuf_unittest.optional_sint64_extension_lite"
+  fieldName: "proto2_unittest.optional_sint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 7,
-  fieldName: "protobuf_unittest.optional_fixed32_extension_lite"
+  fieldName: "proto2_unittest.optional_fixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 8,
-  fieldName: "protobuf_unittest.optional_fixed64_extension_lite"
+  fieldName: "proto2_unittest.optional_fixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 9,
-  fieldName: "protobuf_unittest.optional_sfixed32_extension_lite"
+  fieldName: "proto2_unittest.optional_sfixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 10,
-  fieldName: "protobuf_unittest.optional_sfixed64_extension_lite"
+  fieldName: "proto2_unittest.optional_sfixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 11,
-  fieldName: "protobuf_unittest.optional_float_extension_lite"
+  fieldName: "proto2_unittest.optional_float_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 12,
-  fieldName: "protobuf_unittest.optional_double_extension_lite"
+  fieldName: "proto2_unittest.optional_double_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 13,
-  fieldName: "protobuf_unittest.optional_bool_extension_lite"
+  fieldName: "proto2_unittest.optional_bool_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 14,
-  fieldName: "protobuf_unittest.optional_string_extension_lite"
+  fieldName: "proto2_unittest.optional_string_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 15,
-  fieldName: "protobuf_unittest.optional_bytes_extension_lite"
+  fieldName: "proto2_unittest.optional_bytes_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_OptionalGroup_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<ProtobufUnittest_OptionalGroup_extension_lite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_OptionalGroup_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalGroupExtensionField<Proto2Unittest_OptionalGroup_extension_lite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 16,
-  fieldName: "protobuf_unittest.optionalgroup_extension_lite"
+  fieldName: "proto2_unittest.optionalgroup_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 18,
-  fieldName: "protobuf_unittest.optional_nested_message_extension_lite"
+  fieldName: "proto2_unittest.optional_nested_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_foreign_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_ForeignMessageLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_foreign_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_ForeignMessageLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 19,
-  fieldName: "protobuf_unittest.optional_foreign_message_extension_lite"
+  fieldName: "proto2_unittest.optional_foreign_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_ImportMessageLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_ImportMessageLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 20,
-  fieldName: "protobuf_unittest.optional_import_message_extension_lite"
+  fieldName: "proto2_unittest.optional_import_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_TestAllTypesLite.NestedEnum>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_TestAllTypesLite.NestedEnum>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 21,
-  fieldName: "protobuf_unittest.optional_nested_enum_extension_lite"
+  fieldName: "proto2_unittest.optional_nested_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_ForeignEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_ForeignEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 22,
-  fieldName: "protobuf_unittest.optional_foreign_enum_extension_lite"
+  fieldName: "proto2_unittest.optional_foreign_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 23,
-  fieldName: "protobuf_unittest.optional_import_enum_extension_lite"
+  fieldName: "proto2_unittest.optional_import_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 24,
-  fieldName: "protobuf_unittest.optional_string_piece_extension_lite"
+  fieldName: "proto2_unittest.optional_string_piece_extension_lite"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_optional_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 25,
-  fieldName: "protobuf_unittest.optional_cord_extension_lite"
+  fieldName: "proto2_unittest.optional_cord_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_bytes_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_bytes_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 86,
-  fieldName: "protobuf_unittest.optional_bytes_cord_extension_lite"
+  fieldName: "proto2_unittest.optional_bytes_cord_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_public_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittestImport_PublicImportMessageLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_public_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2UnittestImport_PublicImportMessageLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 26,
-  fieldName: "protobuf_unittest.optional_public_import_message_extension_lite"
+  fieldName: "proto2_unittest.optional_public_import_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 27,
-  fieldName: "protobuf_unittest.optional_lazy_message_extension_lite"
+  fieldName: "proto2_unittest.optional_lazy_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_optional_unverified_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_optional_unverified_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 28,
-  fieldName: "protobuf_unittest.optional_unverified_lazy_message_extension_lite"
+  fieldName: "proto2_unittest.optional_unverified_lazy_message_extension_lite"
 )
 
 /// Repeated
-let ProtobufUnittest_Extensions_repeated_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 31,
-  fieldName: "protobuf_unittest.repeated_int32_extension_lite"
+  fieldName: "proto2_unittest.repeated_int32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 32,
-  fieldName: "protobuf_unittest.repeated_int64_extension_lite"
+  fieldName: "proto2_unittest.repeated_int64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 33,
-  fieldName: "protobuf_unittest.repeated_uint32_extension_lite"
+  fieldName: "proto2_unittest.repeated_uint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 34,
-  fieldName: "protobuf_unittest.repeated_uint64_extension_lite"
+  fieldName: "proto2_unittest.repeated_uint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 35,
-  fieldName: "protobuf_unittest.repeated_sint32_extension_lite"
+  fieldName: "proto2_unittest.repeated_sint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 36,
-  fieldName: "protobuf_unittest.repeated_sint64_extension_lite"
+  fieldName: "proto2_unittest.repeated_sint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 37,
-  fieldName: "protobuf_unittest.repeated_fixed32_extension_lite"
+  fieldName: "proto2_unittest.repeated_fixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 38,
-  fieldName: "protobuf_unittest.repeated_fixed64_extension_lite"
+  fieldName: "proto2_unittest.repeated_fixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 39,
-  fieldName: "protobuf_unittest.repeated_sfixed32_extension_lite"
+  fieldName: "proto2_unittest.repeated_sfixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 40,
-  fieldName: "protobuf_unittest.repeated_sfixed64_extension_lite"
+  fieldName: "proto2_unittest.repeated_sfixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 41,
-  fieldName: "protobuf_unittest.repeated_float_extension_lite"
+  fieldName: "proto2_unittest.repeated_float_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 42,
-  fieldName: "protobuf_unittest.repeated_double_extension_lite"
+  fieldName: "proto2_unittest.repeated_double_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 43,
-  fieldName: "protobuf_unittest.repeated_bool_extension_lite"
+  fieldName: "proto2_unittest.repeated_bool_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 44,
-  fieldName: "protobuf_unittest.repeated_string_extension_lite"
+  fieldName: "proto2_unittest.repeated_string_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 45,
-  fieldName: "protobuf_unittest.repeated_bytes_extension_lite"
+  fieldName: "proto2_unittest.repeated_bytes_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_RepeatedGroup_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedGroupExtensionField<ProtobufUnittest_RepeatedGroup_extension_lite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_RepeatedGroup_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedGroupExtensionField<Proto2Unittest_RepeatedGroup_extension_lite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 46,
-  fieldName: "protobuf_unittest.repeatedgroup_extension_lite"
+  fieldName: "proto2_unittest.repeatedgroup_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 48,
-  fieldName: "protobuf_unittest.repeated_nested_message_extension_lite"
+  fieldName: "proto2_unittest.repeated_nested_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_foreign_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_ForeignMessageLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_foreign_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_ForeignMessageLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 49,
-  fieldName: "protobuf_unittest.repeated_foreign_message_extension_lite"
+  fieldName: "proto2_unittest.repeated_foreign_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittestImport_ImportMessageLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_import_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2UnittestImport_ImportMessageLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 50,
-  fieldName: "protobuf_unittest.repeated_import_message_extension_lite"
+  fieldName: "proto2_unittest.repeated_import_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_TestAllTypesLite.NestedEnum>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_TestAllTypesLite.NestedEnum>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 51,
-  fieldName: "protobuf_unittest.repeated_nested_enum_extension_lite"
+  fieldName: "proto2_unittest.repeated_nested_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittest_ForeignEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_ForeignEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 52,
-  fieldName: "protobuf_unittest.repeated_foreign_enum_extension_lite"
+  fieldName: "proto2_unittest.repeated_foreign_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<ProtobufUnittestImport_ImportEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2UnittestImport_ImportEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 53,
-  fieldName: "protobuf_unittest.repeated_import_enum_extension_lite"
+  fieldName: "proto2_unittest.repeated_import_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 54,
-  fieldName: "protobuf_unittest.repeated_string_piece_extension_lite"
+  fieldName: "proto2_unittest.repeated_string_piece_extension_lite"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_repeated_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 55,
-  fieldName: "protobuf_unittest.repeated_cord_extension_lite"
+  fieldName: "proto2_unittest.repeated_cord_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_repeated_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_repeated_lazy_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 57,
-  fieldName: "protobuf_unittest.repeated_lazy_message_extension_lite"
+  fieldName: "proto2_unittest.repeated_lazy_message_extension_lite"
 )
 
 /// Singular with defaults
-let ProtobufUnittest_Extensions_default_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 61,
-  fieldName: "protobuf_unittest.default_int32_extension_lite"
+  fieldName: "proto2_unittest.default_int32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 62,
-  fieldName: "protobuf_unittest.default_int64_extension_lite"
+  fieldName: "proto2_unittest.default_int64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 63,
-  fieldName: "protobuf_unittest.default_uint32_extension_lite"
+  fieldName: "proto2_unittest.default_uint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 64,
-  fieldName: "protobuf_unittest.default_uint64_extension_lite"
+  fieldName: "proto2_unittest.default_uint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 65,
-  fieldName: "protobuf_unittest.default_sint32_extension_lite"
+  fieldName: "proto2_unittest.default_sint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 66,
-  fieldName: "protobuf_unittest.default_sint64_extension_lite"
+  fieldName: "proto2_unittest.default_sint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 67,
-  fieldName: "protobuf_unittest.default_fixed32_extension_lite"
+  fieldName: "proto2_unittest.default_fixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 68,
-  fieldName: "protobuf_unittest.default_fixed64_extension_lite"
+  fieldName: "proto2_unittest.default_fixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 69,
-  fieldName: "protobuf_unittest.default_sfixed32_extension_lite"
+  fieldName: "proto2_unittest.default_sfixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 70,
-  fieldName: "protobuf_unittest.default_sfixed64_extension_lite"
+  fieldName: "proto2_unittest.default_sfixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 71,
-  fieldName: "protobuf_unittest.default_float_extension_lite"
+  fieldName: "proto2_unittest.default_float_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 72,
-  fieldName: "protobuf_unittest.default_double_extension_lite"
+  fieldName: "proto2_unittest.default_double_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 73,
-  fieldName: "protobuf_unittest.default_bool_extension_lite"
+  fieldName: "proto2_unittest.default_bool_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 74,
-  fieldName: "protobuf_unittest.default_string_extension_lite"
+  fieldName: "proto2_unittest.default_string_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 75,
-  fieldName: "protobuf_unittest.default_bytes_extension_lite"
+  fieldName: "proto2_unittest.default_bytes_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_TestAllTypesLite.NestedEnum>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_nested_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_TestAllTypesLite.NestedEnum>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 81,
-  fieldName: "protobuf_unittest.default_nested_enum_extension_lite"
+  fieldName: "proto2_unittest.default_nested_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittest_ForeignEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_foreign_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_ForeignEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 82,
-  fieldName: "protobuf_unittest.default_foreign_enum_extension_lite"
+  fieldName: "proto2_unittest.default_foreign_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<ProtobufUnittestImport_ImportEnumLite>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_import_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2UnittestImport_ImportEnumLite>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 83,
-  fieldName: "protobuf_unittest.default_import_enum_extension_lite"
+  fieldName: "proto2_unittest.default_import_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_default_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_string_piece_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 84,
-  fieldName: "protobuf_unittest.default_string_piece_extension_lite"
+  fieldName: "proto2_unittest.default_string_piece_extension_lite"
 )
 
 /// TODO: ctype=CORD is not supported for extension. Add
 /// ctype=CORD option back after it is supported.
-let ProtobufUnittest_Extensions_default_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_default_cord_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 85,
-  fieldName: "protobuf_unittest.default_cord_extension_lite"
+  fieldName: "proto2_unittest.default_cord_extension_lite"
 )
 
 /// For oneof test
-let ProtobufUnittest_Extensions_oneof_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_oneof_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 111,
-  fieldName: "protobuf_unittest.oneof_uint32_extension_lite"
+  fieldName: "proto2_unittest.oneof_uint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_oneof_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite.NestedMessage>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_oneof_nested_message_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite.NestedMessage>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 112,
-  fieldName: "protobuf_unittest.oneof_nested_message_extension_lite"
+  fieldName: "proto2_unittest.oneof_nested_message_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_oneof_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_oneof_string_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 113,
-  fieldName: "protobuf_unittest.oneof_string_extension_lite"
+  fieldName: "proto2_unittest.oneof_string_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_oneof_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestAllExtensionsLite>(
+let Proto2Unittest_Extensions_oneof_bytes_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestAllExtensionsLite>(
   _protobuf_fieldNumber: 114,
-  fieldName: "protobuf_unittest.oneof_bytes_extension_lite"
+  fieldName: "proto2_unittest.oneof_bytes_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_int32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 90,
-  fieldName: "protobuf_unittest.packed_int32_extension_lite"
+  fieldName: "proto2_unittest.packed_int32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_int64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufInt64>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 91,
-  fieldName: "protobuf_unittest.packed_int64_extension_lite"
+  fieldName: "proto2_unittest.packed_int64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt32>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_uint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt32>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 92,
-  fieldName: "protobuf_unittest.packed_uint32_extension_lite"
+  fieldName: "proto2_unittest.packed_uint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt64>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_uint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufUInt64>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 93,
-  fieldName: "protobuf_unittest.packed_uint64_extension_lite"
+  fieldName: "proto2_unittest.packed_uint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt32>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_sint32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt32>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 94,
-  fieldName: "protobuf_unittest.packed_sint32_extension_lite"
+  fieldName: "proto2_unittest.packed_sint32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt64>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_sint64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSInt64>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 95,
-  fieldName: "protobuf_unittest.packed_sint64_extension_lite"
+  fieldName: "proto2_unittest.packed_sint64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed32>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_fixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed32>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 96,
-  fieldName: "protobuf_unittest.packed_fixed32_extension_lite"
+  fieldName: "proto2_unittest.packed_fixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed64>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_fixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFixed64>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 97,
-  fieldName: "protobuf_unittest.packed_fixed64_extension_lite"
+  fieldName: "proto2_unittest.packed_fixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_sfixed32_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed32>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 98,
-  fieldName: "protobuf_unittest.packed_sfixed32_extension_lite"
+  fieldName: "proto2_unittest.packed_sfixed32_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed64>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_sfixed64_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufSFixed64>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 99,
-  fieldName: "protobuf_unittest.packed_sfixed64_extension_lite"
+  fieldName: "proto2_unittest.packed_sfixed64_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFloat>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_float_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufFloat>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 100,
-  fieldName: "protobuf_unittest.packed_float_extension_lite"
+  fieldName: "proto2_unittest.packed_float_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufDouble>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_double_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufDouble>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 101,
-  fieldName: "protobuf_unittest.packed_double_extension_lite"
+  fieldName: "proto2_unittest.packed_double_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_bool_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedExtensionField<SwiftProtobuf.ProtobufBool>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 102,
-  fieldName: "protobuf_unittest.packed_bool_extension_lite"
+  fieldName: "proto2_unittest.packed_bool_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_packed_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<ProtobufUnittest_ForeignEnumLite>, ProtobufUnittest_TestPackedExtensionsLite>(
+let Proto2Unittest_Extensions_packed_enum_extension_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.PackedEnumExtensionField<Proto2Unittest_ForeignEnumLite>, Proto2Unittest_TestPackedExtensionsLite>(
   _protobuf_fieldNumber: 103,
-  fieldName: "protobuf_unittest.packed_enum_extension_lite"
+  fieldName: "proto2_unittest.packed_enum_extension_lite"
 )
 
-let ProtobufUnittest_Extensions_test_all_types_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite>, ProtobufUnittest_TestHugeFieldNumbersLite>(
+let Proto2Unittest_Extensions_test_all_types_lite = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite>, Proto2Unittest_TestHugeFieldNumbersLite>(
   _protobuf_fieldNumber: 536860000,
-  fieldName: "protobuf_unittest.test_all_types_lite"
+  fieldName: "proto2_unittest.test_all_types_lite"
 )
 
-extension ProtobufUnittest_TestNestedExtensionLite {
+extension Proto2Unittest_TestNestedExtensionLite {
   enum Extensions {
-    static let nested_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestAllExtensionsLite>(
+    static let nested_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestAllExtensionsLite>(
       _protobuf_fieldNumber: 12345,
-      fieldName: "protobuf_unittest.TestNestedExtensionLite.nested_extension"
+      fieldName: "proto2_unittest.TestNestedExtensionLite.nested_extension"
     )
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite {
+extension Proto2Unittest_TestParsingMergeLite {
   enum Extensions {
-    static let optional_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestAllTypesLite>, ProtobufUnittest_TestParsingMergeLite>(
+    static let optional_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestAllTypesLite>, Proto2Unittest_TestParsingMergeLite>(
       _protobuf_fieldNumber: 1000,
-      fieldName: "protobuf_unittest.TestParsingMergeLite.optional_ext"
+      fieldName: "proto2_unittest.TestParsingMergeLite.optional_ext"
     )
 
-    static let repeated_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_TestAllTypesLite>, ProtobufUnittest_TestParsingMergeLite>(
+    static let repeated_ext = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_TestAllTypesLite>, Proto2Unittest_TestParsingMergeLite>(
       _protobuf_fieldNumber: 1001,
-      fieldName: "protobuf_unittest.TestParsingMergeLite.repeated_ext"
+      fieldName: "proto2_unittest.TestParsingMergeLite.repeated_ext"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_ForeignEnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignEnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     4: .same(proto: "FOREIGN_LITE_FOO"),
     5: .same(proto: "FOREIGN_LITE_BAR"),
@@ -3328,20 +3328,20 @@ extension ProtobufUnittest_ForeignEnumLite: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension ProtobufUnittest_V1EnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_V1EnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "V1_FIRST"),
   ]
 }
 
-extension ProtobufUnittest_V2EnumLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_V2EnumLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "V2_FIRST"),
     2: .same(proto: "V2_SECOND"),
   ]
 }
 
-extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllTypesLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32"),
@@ -3444,19 +3444,19 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
     var _optionalBool: Bool? = nil
     var _optionalString: String? = nil
     var _optionalBytes: Data? = nil
-    var _optionalGroup: ProtobufUnittest_TestAllTypesLite.OptionalGroup? = nil
-    var _optionalNestedMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage? = nil
-    var _optionalForeignMessage: ProtobufUnittest_ForeignMessageLite? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessageLite? = nil
-    var _optionalNestedEnum: ProtobufUnittest_TestAllTypesLite.NestedEnum? = nil
-    var _optionalForeignEnum: ProtobufUnittest_ForeignEnumLite? = nil
-    var _optionalImportEnum: ProtobufUnittestImport_ImportEnumLite? = nil
+    var _optionalGroup: Proto2Unittest_TestAllTypesLite.OptionalGroup? = nil
+    var _optionalNestedMessage: Proto2Unittest_TestAllTypesLite.NestedMessage? = nil
+    var _optionalForeignMessage: Proto2Unittest_ForeignMessageLite? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessageLite? = nil
+    var _optionalNestedEnum: Proto2Unittest_TestAllTypesLite.NestedEnum? = nil
+    var _optionalForeignEnum: Proto2Unittest_ForeignEnumLite? = nil
+    var _optionalImportEnum: Proto2UnittestImport_ImportEnumLite? = nil
     var _optionalStringPiece: String? = nil
     var _optionalCord: String? = nil
     var _optionalBytesCord: Data? = nil
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessageLite? = nil
-    var _optionalLazyMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage? = nil
-    var _optionalUnverifiedLazyMessage: ProtobufUnittest_TestAllTypesLite.NestedMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessageLite? = nil
+    var _optionalLazyMessage: Proto2Unittest_TestAllTypesLite.NestedMessage? = nil
+    var _optionalUnverifiedLazyMessage: Proto2Unittest_TestAllTypesLite.NestedMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
     var _repeatedUint32: [UInt32] = []
@@ -3472,16 +3472,16 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
     var _repeatedBool: [Bool] = []
     var _repeatedString: [String] = []
     var _repeatedBytes: [Data] = []
-    var _repeatedGroup: [ProtobufUnittest_TestAllTypesLite.RepeatedGroup] = []
-    var _repeatedNestedMessage: [ProtobufUnittest_TestAllTypesLite.NestedMessage] = []
-    var _repeatedForeignMessage: [ProtobufUnittest_ForeignMessageLite] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessageLite] = []
-    var _repeatedNestedEnum: [ProtobufUnittest_TestAllTypesLite.NestedEnum] = []
-    var _repeatedForeignEnum: [ProtobufUnittest_ForeignEnumLite] = []
-    var _repeatedImportEnum: [ProtobufUnittestImport_ImportEnumLite] = []
+    var _repeatedGroup: [Proto2Unittest_TestAllTypesLite.RepeatedGroup] = []
+    var _repeatedNestedMessage: [Proto2Unittest_TestAllTypesLite.NestedMessage] = []
+    var _repeatedForeignMessage: [Proto2Unittest_ForeignMessageLite] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessageLite] = []
+    var _repeatedNestedEnum: [Proto2Unittest_TestAllTypesLite.NestedEnum] = []
+    var _repeatedForeignEnum: [Proto2Unittest_ForeignEnumLite] = []
+    var _repeatedImportEnum: [Proto2UnittestImport_ImportEnumLite] = []
     var _repeatedStringPiece: [String] = []
     var _repeatedCord: [String] = []
-    var _repeatedLazyMessage: [ProtobufUnittest_TestAllTypesLite.NestedMessage] = []
+    var _repeatedLazyMessage: [Proto2Unittest_TestAllTypesLite.NestedMessage] = []
     var _defaultInt32: Int32? = nil
     var _defaultInt64: Int64? = nil
     var _defaultUint32: UInt32? = nil
@@ -3497,12 +3497,12 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
     var _defaultBool: Bool? = nil
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
-    var _defaultNestedEnum: ProtobufUnittest_TestAllTypesLite.NestedEnum? = nil
-    var _defaultForeignEnum: ProtobufUnittest_ForeignEnumLite? = nil
-    var _defaultImportEnum: ProtobufUnittestImport_ImportEnumLite? = nil
+    var _defaultNestedEnum: Proto2Unittest_TestAllTypesLite.NestedEnum? = nil
+    var _defaultForeignEnum: Proto2Unittest_ForeignEnumLite? = nil
+    var _defaultImportEnum: Proto2UnittestImport_ImportEnumLite? = nil
     var _defaultStringPiece: String? = nil
     var _defaultCord: String? = nil
-    var _oneofField: ProtobufUnittest_TestAllTypesLite.OneOf_OneofField?
+    var _oneofField: Proto2Unittest_TestAllTypesLite.OneOf_OneofField?
     var _deceptivelyNamedList: Int32? = nil
 
     #if swift(>=5.10)
@@ -3693,7 +3693,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
           }
         }()
         case 112: try {
-          var v: ProtobufUnittest_TestAllTypesLite.NestedMessage?
+          var v: Proto2Unittest_TestAllTypesLite.NestedMessage?
           var hadOneofValue = false
           if let current = _storage._oneofField {
             hadOneofValue = true
@@ -3722,7 +3722,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
           }
         }()
         case 115: try {
-          var v: ProtobufUnittest_TestAllTypesLite.NestedMessage?
+          var v: Proto2Unittest_TestAllTypesLite.NestedMessage?
           var hadOneofValue = false
           if let current = _storage._oneofField {
             hadOneofValue = true
@@ -3736,7 +3736,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
         }()
         case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._deceptivelyNamedList) }()
         case 117: try {
-          var v: ProtobufUnittest_TestAllTypesLite.NestedMessage2?
+          var v: Proto2Unittest_TestAllTypesLite.NestedMessage2?
           var hadOneofValue = false
           if let current = _storage._oneofField {
             hadOneofValue = true
@@ -4012,7 +4012,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypesLite, rhs: ProtobufUnittest_TestAllTypesLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypesLite, rhs: Proto2Unittest_TestAllTypesLite) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -4101,7 +4101,7 @@ extension ProtobufUnittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_TestAllTypesLite.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllTypesLite.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "FOO"),
     2: .same(proto: "BAR"),
@@ -4109,8 +4109,8 @@ extension ProtobufUnittest_TestAllTypesLite.NestedEnum: SwiftProtobuf._ProtoName
   ]
 }
 
-extension ProtobufUnittest_TestAllTypesLite.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestAllTypesLite.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypesLite.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bb"),
     2: .same(proto: "cc"),
@@ -4148,7 +4148,7 @@ extension ProtobufUnittest_TestAllTypesLite.NestedMessage: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypesLite.NestedMessage, rhs: ProtobufUnittest_TestAllTypesLite.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypesLite.NestedMessage, rhs: Proto2Unittest_TestAllTypesLite.NestedMessage) -> Bool {
     if lhs._bb != rhs._bb {return false}
     if lhs._cc != rhs._cc {return false}
     if lhs.dd != rhs.dd {return false}
@@ -4157,8 +4157,8 @@ extension ProtobufUnittest_TestAllTypesLite.NestedMessage: SwiftProtobuf.Message
   }
 }
 
-extension ProtobufUnittest_TestAllTypesLite.NestedMessage2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".NestedMessage2"
+extension Proto2Unittest_TestAllTypesLite.NestedMessage2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypesLite.protoMessageName + ".NestedMessage2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "dd"),
   ]
@@ -4186,15 +4186,15 @@ extension ProtobufUnittest_TestAllTypesLite.NestedMessage2: SwiftProtobuf.Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypesLite.NestedMessage2, rhs: ProtobufUnittest_TestAllTypesLite.NestedMessage2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypesLite.NestedMessage2, rhs: Proto2Unittest_TestAllTypesLite.NestedMessage2) -> Bool {
     if lhs._dd != rhs._dd {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestAllTypesLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestAllTypesLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypesLite.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
   ]
@@ -4222,15 +4222,15 @@ extension ProtobufUnittest_TestAllTypesLite.OptionalGroup: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypesLite.OptionalGroup, rhs: ProtobufUnittest_TestAllTypesLite.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypesLite.OptionalGroup, rhs: Proto2Unittest_TestAllTypesLite.OptionalGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestAllTypesLite.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestAllTypesLite.protoMessageName + ".RepeatedGroup"
+extension Proto2Unittest_TestAllTypesLite.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestAllTypesLite.protoMessageName + ".RepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     47: .same(proto: "a"),
   ]
@@ -4258,14 +4258,14 @@ extension ProtobufUnittest_TestAllTypesLite.RepeatedGroup: SwiftProtobuf.Message
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllTypesLite.RepeatedGroup, rhs: ProtobufUnittest_TestAllTypesLite.RepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllTypesLite.RepeatedGroup, rhs: Proto2Unittest_TestAllTypesLite.RepeatedGroup) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_ForeignMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_ForeignMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "c"),
@@ -4294,14 +4294,14 @@ extension ProtobufUnittest_ForeignMessageLite: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_ForeignMessageLite, rhs: ProtobufUnittest_ForeignMessageLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_ForeignMessageLite, rhs: Proto2Unittest_ForeignMessageLite) -> Bool {
     if lhs._c != rhs._c {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPackedTypesLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedTypesLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPackedTypesLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     90: .standard(proto: "packed_int32"),
@@ -4391,7 +4391,7 @@ extension ProtobufUnittest_TestPackedTypesLite: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPackedTypesLite, rhs: ProtobufUnittest_TestPackedTypesLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPackedTypesLite, rhs: Proto2Unittest_TestPackedTypesLite) -> Bool {
     if lhs.packedInt32 != rhs.packedInt32 {return false}
     if lhs.packedInt64 != rhs.packedInt64 {return false}
     if lhs.packedUint32 != rhs.packedUint32 {return false}
@@ -4411,7 +4411,7 @@ extension ProtobufUnittest_TestPackedTypesLite: SwiftProtobuf.Message, SwiftProt
   }
 }
 
-extension ProtobufUnittest_TestAllExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestAllExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllExtensionsLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -4423,7 +4423,7 @@ extension ProtobufUnittest_TestAllExtensionsLite: SwiftProtobuf.Message, SwiftPr
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestAllExtensionsLite.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestAllExtensionsLite.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -4433,14 +4433,14 @@ extension ProtobufUnittest_TestAllExtensionsLite: SwiftProtobuf.Message, SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestAllExtensionsLite, rhs: ProtobufUnittest_TestAllExtensionsLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestAllExtensionsLite, rhs: Proto2Unittest_TestAllExtensionsLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_OptionalGroup_extension_lite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OptionalGroup_extension_lite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OptionalGroup_extension_lite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     17: .same(proto: "a"),
@@ -4469,14 +4469,14 @@ extension ProtobufUnittest_OptionalGroup_extension_lite: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OptionalGroup_extension_lite, rhs: ProtobufUnittest_OptionalGroup_extension_lite) -> Bool {
+  static func ==(lhs: Proto2Unittest_OptionalGroup_extension_lite, rhs: Proto2Unittest_OptionalGroup_extension_lite) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_RepeatedGroup_extension_lite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RepeatedGroup_extension_lite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RepeatedGroup_extension_lite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     47: .same(proto: "a"),
@@ -4505,14 +4505,14 @@ extension ProtobufUnittest_RepeatedGroup_extension_lite: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RepeatedGroup_extension_lite, rhs: ProtobufUnittest_RepeatedGroup_extension_lite) -> Bool {
+  static func ==(lhs: Proto2Unittest_RepeatedGroup_extension_lite, rhs: Proto2Unittest_RepeatedGroup_extension_lite) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestPackedExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestPackedExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestPackedExtensionsLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -4524,7 +4524,7 @@ extension ProtobufUnittest_TestPackedExtensionsLite: SwiftProtobuf.Message, Swif
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestPackedExtensionsLite.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestPackedExtensionsLite.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -4534,14 +4534,14 @@ extension ProtobufUnittest_TestPackedExtensionsLite: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestPackedExtensionsLite, rhs: ProtobufUnittest_TestPackedExtensionsLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestPackedExtensionsLite, rhs: Proto2Unittest_TestPackedExtensionsLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestNestedExtensionLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestNestedExtensionLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestNestedExtensionLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -4554,13 +4554,13 @@ extension ProtobufUnittest_TestNestedExtensionLite: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestNestedExtensionLite, rhs: ProtobufUnittest_TestNestedExtensionLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestNestedExtensionLite, rhs: Proto2Unittest_TestNestedExtensionLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestDeprecatedLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "deprecated_field"),
@@ -4573,7 +4573,7 @@ extension ProtobufUnittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProto
     var _deprecatedField: Int32? = nil
     var _deprecatedField2: Int32? = nil
     var _deprecatedField3: String? = nil
-    var _deprecatedField4: ProtobufUnittest_TestDeprecatedLite? = nil
+    var _deprecatedField4: Proto2Unittest_TestDeprecatedLite? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -4650,7 +4650,7 @@ extension ProtobufUnittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestDeprecatedLite, rhs: ProtobufUnittest_TestDeprecatedLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestDeprecatedLite, rhs: Proto2Unittest_TestDeprecatedLite) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -4668,7 +4668,7 @@ extension ProtobufUnittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestParsingMergeLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestParsingMergeLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "required_all_types"),
@@ -4698,7 +4698,7 @@ extension ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.Message, SwiftPro
       case 10: try { try decoder.decodeSingularGroupField(value: &self._optionalGroup) }()
       case 20: try { try decoder.decodeRepeatedGroupField(value: &self.repeatedGroup) }()
       case 1000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestParsingMergeLite.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestParsingMergeLite.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -4728,7 +4728,7 @@ extension ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite, rhs: ProtobufUnittest_TestParsingMergeLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite, rhs: Proto2Unittest_TestParsingMergeLite) -> Bool {
     if lhs._requiredAllTypes != rhs._requiredAllTypes {return false}
     if lhs._optionalAllTypes != rhs._optionalAllTypes {return false}
     if lhs.repeatedAllTypes != rhs.repeatedAllTypes {return false}
@@ -4740,8 +4740,8 @@ extension ProtobufUnittest_TestParsingMergeLite: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMergeLite.protoMessageName + ".RepeatedFieldsGenerator"
+extension Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMergeLite.protoMessageName + ".RepeatedFieldsGenerator"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "field1"),
     2: .same(proto: "field2"),
@@ -4797,7 +4797,7 @@ extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator: SwiftPr
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator, rhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator, rhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator) -> Bool {
     if lhs.field1 != rhs.field1 {return false}
     if lhs.field2 != rhs.field2 {return false}
     if lhs.field3 != rhs.field3 {return false}
@@ -4810,8 +4810,8 @@ extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator: SwiftPr
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.protoMessageName + ".Group1"
+extension Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.protoMessageName + ".Group1"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     11: .same(proto: "field1"),
   ]
@@ -4839,15 +4839,15 @@ extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1:
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1, rhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1, rhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group1) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.protoMessageName + ".Group2"
+extension Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.protoMessageName + ".Group2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     21: .same(proto: "field1"),
   ]
@@ -4875,15 +4875,15 @@ extension ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2:
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2, rhs: ProtobufUnittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2, rhs: Proto2Unittest_TestParsingMergeLite.RepeatedFieldsGenerator.Group2) -> Bool {
     if lhs._field1 != rhs._field1 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMergeLite.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestParsingMergeLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMergeLite.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     11: .standard(proto: "optional_group_all_types"),
   ]
@@ -4911,15 +4911,15 @@ extension ProtobufUnittest_TestParsingMergeLite.OptionalGroup: SwiftProtobuf.Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite.OptionalGroup, rhs: ProtobufUnittest_TestParsingMergeLite.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite.OptionalGroup, rhs: Proto2Unittest_TestParsingMergeLite.OptionalGroup) -> Bool {
     if lhs._optionalGroupAllTypes != rhs._optionalGroupAllTypes {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestParsingMergeLite.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestParsingMergeLite.protoMessageName + ".RepeatedGroup"
+extension Proto2Unittest_TestParsingMergeLite.RepeatedGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestParsingMergeLite.protoMessageName + ".RepeatedGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     21: .standard(proto: "repeated_group_all_types"),
   ]
@@ -4947,14 +4947,14 @@ extension ProtobufUnittest_TestParsingMergeLite.RepeatedGroup: SwiftProtobuf.Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestParsingMergeLite.RepeatedGroup, rhs: ProtobufUnittest_TestParsingMergeLite.RepeatedGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestParsingMergeLite.RepeatedGroup, rhs: Proto2Unittest_TestParsingMergeLite.RepeatedGroup) -> Bool {
     if lhs._repeatedGroupAllTypes != rhs._repeatedGroupAllTypes {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMergeExceptionLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMergeExceptionLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMergeExceptionLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "all_extensions"),
@@ -4988,14 +4988,14 @@ extension ProtobufUnittest_TestMergeExceptionLite: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMergeExceptionLite, rhs: ProtobufUnittest_TestMergeExceptionLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMergeExceptionLite, rhs: Proto2Unittest_TestMergeExceptionLite) -> Bool {
     if lhs._allExtensions != rhs._allExtensions {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEmptyMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEmptyMessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEmptyMessageLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -5008,13 +5008,13 @@ extension ProtobufUnittest_TestEmptyMessageLite: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEmptyMessageLite, rhs: ProtobufUnittest_TestEmptyMessageLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEmptyMessageLite, rhs: Proto2Unittest_TestEmptyMessageLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestEmptyMessageWithExtensionsLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -5026,7 +5026,7 @@ extension ProtobufUnittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.Mes
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestEmptyMessageWithExtensionsLite.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestEmptyMessageWithExtensionsLite.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -5036,14 +5036,14 @@ extension ProtobufUnittest_TestEmptyMessageWithExtensionsLite: SwiftProtobuf.Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestEmptyMessageWithExtensionsLite, rhs: ProtobufUnittest_TestEmptyMessageWithExtensionsLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestEmptyMessageWithExtensionsLite, rhs: Proto2Unittest_TestEmptyMessageWithExtensionsLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_V1MessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_V1MessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".V1MessageLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "int_field"),
@@ -5082,7 +5082,7 @@ extension ProtobufUnittest_V1MessageLite: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_V1MessageLite, rhs: ProtobufUnittest_V1MessageLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_V1MessageLite, rhs: Proto2Unittest_V1MessageLite) -> Bool {
     if lhs._intField != rhs._intField {return false}
     if lhs._enumField != rhs._enumField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -5090,7 +5090,7 @@ extension ProtobufUnittest_V1MessageLite: SwiftProtobuf.Message, SwiftProtobuf._
   }
 }
 
-extension ProtobufUnittest_V2MessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_V2MessageLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".V2MessageLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "int_field"),
@@ -5129,7 +5129,7 @@ extension ProtobufUnittest_V2MessageLite: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_V2MessageLite, rhs: ProtobufUnittest_V2MessageLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_V2MessageLite, rhs: Proto2Unittest_V2MessageLite) -> Bool {
     if lhs._intField != rhs._intField {return false}
     if lhs._enumField != rhs._enumField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -5137,7 +5137,7 @@ extension ProtobufUnittest_V2MessageLite: SwiftProtobuf.Message, SwiftProtobuf._
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestHugeFieldNumbersLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     536870000: .standard(proto: "optional_int32"),
@@ -5187,7 +5187,7 @@ extension ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, Swif
         }
       }()
       case 536870012: try {
-        var v: ProtobufUnittest_TestAllTypesLite?
+        var v: Proto2Unittest_TestAllTypesLite?
         var hadOneofValue = false
         if let current = self.oneofField {
           hadOneofValue = true
@@ -5216,7 +5216,7 @@ extension ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, Swif
         }
       }()
       case 536860000..<536870000:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestHugeFieldNumbersLite.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestHugeFieldNumbersLite.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -5280,7 +5280,7 @@ extension ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbersLite, rhs: ProtobufUnittest_TestHugeFieldNumbersLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestHugeFieldNumbersLite, rhs: Proto2Unittest_TestHugeFieldNumbersLite) -> Bool {
     if lhs._optionalInt32 != rhs._optionalInt32 {return false}
     if lhs._fixed32 != rhs._fixed32 {return false}
     if lhs.repeatedInt32 != rhs.repeatedInt32 {return false}
@@ -5298,8 +5298,8 @@ extension ProtobufUnittest_TestHugeFieldNumbersLite: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestHugeFieldNumbersLite.protoMessageName + ".OptionalGroup"
+extension Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestHugeFieldNumbersLite.protoMessageName + ".OptionalGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     536870009: .standard(proto: "group_a"),
   ]
@@ -5327,14 +5327,14 @@ extension ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup: SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup, rhs: ProtobufUnittest_TestHugeFieldNumbersLite.OptionalGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup, rhs: Proto2Unittest_TestHugeFieldNumbersLite.OptionalGroup) -> Bool {
     if lhs._groupA != rhs._groupA {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestOneofParsingLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOneofParsingLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOneofParsingLite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "oneof_int32"),
@@ -5363,7 +5363,7 @@ extension ProtobufUnittest_TestOneofParsingLite: SwiftProtobuf.Message, SwiftPro
         }
       }()
       case 2: try {
-        var v: ProtobufUnittest_TestAllTypesLite?
+        var v: Proto2Unittest_TestAllTypesLite?
         var hadOneofValue = false
         if let current = self.oneofField {
           hadOneofValue = true
@@ -5424,7 +5424,7 @@ extension ProtobufUnittest_TestOneofParsingLite: SwiftProtobuf.Message, SwiftPro
         }
       }()
       case 9: try {
-        var v: ProtobufUnittest_V2EnumLite?
+        var v: Proto2Unittest_V2EnumLite?
         try decoder.decodeSingularEnumField(value: &v)
         if let v = v {
           if self.oneofField != nil {try decoder.handleConflictingOneOf()}
@@ -5483,14 +5483,14 @@ extension ProtobufUnittest_TestOneofParsingLite: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOneofParsingLite, rhs: ProtobufUnittest_TestOneofParsingLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOneofParsingLite, rhs: Proto2Unittest_TestOneofParsingLite) -> Bool {
     if lhs.oneofField != rhs.oneofField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMessageSetLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSetLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSetLite"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -5500,7 +5500,7 @@ extension ProtobufUnittest_TestMessageSetLite: SwiftProtobuf.Message, SwiftProto
   }
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
-    try decoder.decodeExtensionFieldsAsMessageSet(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestMessageSetLite.self)
+    try decoder.decodeExtensionFieldsAsMessageSet(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestMessageSetLite.self)
   }
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
@@ -5508,14 +5508,14 @@ extension ProtobufUnittest_TestMessageSetLite: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSetLite, rhs: ProtobufUnittest_TestMessageSetLite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSetLite, rhs: Proto2Unittest_TestMessageSetLite) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_PackedInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_PackedInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".PackedInt32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2048: .standard(proto: "repeated_int32"),
@@ -5540,14 +5540,14 @@ extension ProtobufUnittest_PackedInt32: SwiftProtobuf.Message, SwiftProtobuf._Me
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_PackedInt32, rhs: ProtobufUnittest_PackedInt32) -> Bool {
+  static func ==(lhs: Proto2Unittest_PackedInt32, rhs: Proto2Unittest_PackedInt32) -> Bool {
     if lhs.repeatedInt32 != rhs.repeatedInt32 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NonPackedInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NonPackedInt32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NonPackedInt32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2048: .standard(proto: "repeated_int32"),
@@ -5572,14 +5572,14 @@ extension ProtobufUnittest_NonPackedInt32: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NonPackedInt32, rhs: ProtobufUnittest_NonPackedInt32) -> Bool {
+  static func ==(lhs: Proto2Unittest_NonPackedInt32, rhs: Proto2Unittest_NonPackedInt32) -> Bool {
     if lhs.repeatedInt32 != rhs.repeatedInt32 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_PackedFixed32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_PackedFixed32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".PackedFixed32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2048: .standard(proto: "repeated_fixed32"),
@@ -5604,14 +5604,14 @@ extension ProtobufUnittest_PackedFixed32: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_PackedFixed32, rhs: ProtobufUnittest_PackedFixed32) -> Bool {
+  static func ==(lhs: Proto2Unittest_PackedFixed32, rhs: Proto2Unittest_PackedFixed32) -> Bool {
     if lhs.repeatedFixed32 != rhs.repeatedFixed32 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NonPackedFixed32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NonPackedFixed32: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NonPackedFixed32"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2048: .standard(proto: "repeated_fixed32"),
@@ -5636,14 +5636,14 @@ extension ProtobufUnittest_NonPackedFixed32: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NonPackedFixed32, rhs: ProtobufUnittest_NonPackedFixed32) -> Bool {
+  static func ==(lhs: Proto2Unittest_NonPackedFixed32, rhs: Proto2Unittest_NonPackedFixed32) -> Bool {
     if lhs.repeatedFixed32 != rhs.repeatedFixed32 {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_DupEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_DupEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".DupEnum"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -5656,13 +5656,13 @@ extension ProtobufUnittest_DupEnum: SwiftProtobuf.Message, SwiftProtobuf._Messag
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_DupEnum, rhs: ProtobufUnittest_DupEnum) -> Bool {
+  static func ==(lhs: Proto2Unittest_DupEnum, rhs: Proto2Unittest_DupEnum) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_DupEnum.TestEnumWithDupValueLite: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_DupEnum.TestEnumWithDupValueLite: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .aliased(proto: "FOO1", aliases: ["FOO2"]),
     2: .aliased(proto: "BAR1", aliases: ["BAR2"]),
@@ -5670,7 +5670,7 @@ extension ProtobufUnittest_DupEnum.TestEnumWithDupValueLite: SwiftProtobuf._Prot
   ]
 }
 
-extension ProtobufUnittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RecursiveMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "recurse"),
@@ -5678,7 +5678,7 @@ extension ProtobufUnittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobu
   ]
 
   fileprivate class _StorageClass {
-    var _recurse: ProtobufUnittest_RecursiveMessage? = nil
+    var _recurse: Proto2Unittest_RecursiveMessage? = nil
     var _payload: Data? = nil
 
     #if swift(>=5.10)
@@ -5738,7 +5738,7 @@ extension ProtobufUnittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RecursiveMessage, rhs: ProtobufUnittest_RecursiveMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_RecursiveMessage, rhs: Proto2Unittest_RecursiveMessage) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -5754,14 +5754,14 @@ extension ProtobufUnittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobu
   }
 }
 
-extension ProtobufUnittest_RecursiveGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RecursiveGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RecursiveGroup"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "recurse"),
   ]
 
   fileprivate class _StorageClass {
-    var _recurse: ProtobufUnittest_RecursiveGroup? = nil
+    var _recurse: Proto2Unittest_RecursiveGroup? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -5815,7 +5815,7 @@ extension ProtobufUnittest_RecursiveGroup: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RecursiveGroup, rhs: ProtobufUnittest_RecursiveGroup) -> Bool {
+  static func ==(lhs: Proto2Unittest_RecursiveGroup, rhs: Proto2Unittest_RecursiveGroup) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
diff --git a/Reference/upstream/google/protobuf/unittest_lite_imports_nonlite.pb.swift b/Reference/upstream/google/protobuf/unittest_lite_imports_nonlite.pb.swift
index 0a2e51a15..d509b05da 100644
--- a/Reference/upstream/google/protobuf/unittest_lite_imports_nonlite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_lite_imports_nonlite.pb.swift
@@ -31,13 +31,13 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestLiteImportsNonlite: Sendable {
+struct Proto2Unittest_TestLiteImportsNonlite: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var message: ProtobufUnittest_TestAllTypes {
-    get {return _message ?? ProtobufUnittest_TestAllTypes()}
+  var message: Proto2Unittest_TestAllTypes {
+    get {return _message ?? Proto2Unittest_TestAllTypes()}
     set {_message = newValue}
   }
   /// Returns true if `message` has been explicitly set.
@@ -46,8 +46,8 @@ struct ProtobufUnittest_TestLiteImportsNonlite: Sendable {
   mutating func clearMessage() {self._message = nil}
 
   /// Verifies that transitive required fields generates valid code.
-  var messageWithRequired: ProtobufUnittest_TestRequired {
-    get {return _messageWithRequired ?? ProtobufUnittest_TestRequired()}
+  var messageWithRequired: Proto2Unittest_TestRequired {
+    get {return _messageWithRequired ?? Proto2Unittest_TestRequired()}
     set {_messageWithRequired = newValue}
   }
   /// Returns true if `messageWithRequired` has been explicitly set.
@@ -59,15 +59,15 @@ struct ProtobufUnittest_TestLiteImportsNonlite: Sendable {
 
   init() {}
 
-  fileprivate var _message: ProtobufUnittest_TestAllTypes? = nil
-  fileprivate var _messageWithRequired: ProtobufUnittest_TestRequired? = nil
+  fileprivate var _message: Proto2Unittest_TestAllTypes? = nil
+  fileprivate var _messageWithRequired: Proto2Unittest_TestRequired? = nil
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestLiteImportsNonlite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestLiteImportsNonlite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestLiteImportsNonlite"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "message"),
@@ -106,7 +106,7 @@ extension ProtobufUnittest_TestLiteImportsNonlite: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestLiteImportsNonlite, rhs: ProtobufUnittest_TestLiteImportsNonlite) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestLiteImportsNonlite, rhs: Proto2Unittest_TestLiteImportsNonlite) -> Bool {
     if lhs._message != rhs._message {return false}
     if lhs._messageWithRequired != rhs._messageWithRequired {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
diff --git a/Reference/upstream/google/protobuf/unittest_mset.pb.swift b/Reference/upstream/google/protobuf/unittest_mset.pb.swift
index eb3437dee..eba6c56dc 100644
--- a/Reference/upstream/google/protobuf/unittest_mset.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_mset.pb.swift
@@ -35,7 +35,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestMessageSetContainer: Sendable {
+struct Proto2Unittest_TestMessageSetContainer: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -56,13 +56,13 @@ struct ProtobufUnittest_TestMessageSetContainer: Sendable {
   fileprivate var _messageSet: Proto2WireformatUnittest_TestMessageSet? = nil
 }
 
-struct ProtobufUnittest_NestedTestMessageSetContainer: @unchecked Sendable {
+struct Proto2Unittest_NestedTestMessageSetContainer: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var container: ProtobufUnittest_TestMessageSetContainer {
-    get {return _storage._container ?? ProtobufUnittest_TestMessageSetContainer()}
+  var container: Proto2Unittest_TestMessageSetContainer {
+    get {return _storage._container ?? Proto2Unittest_TestMessageSetContainer()}
     set {_uniqueStorage()._container = newValue}
   }
   /// Returns true if `container` has been explicitly set.
@@ -70,8 +70,8 @@ struct ProtobufUnittest_NestedTestMessageSetContainer: @unchecked Sendable {
   /// Clears the value of `container`. Subsequent reads from it will return its default value.
   mutating func clearContainer() {_uniqueStorage()._container = nil}
 
-  var child: ProtobufUnittest_NestedTestMessageSetContainer {
-    get {return _storage._child ?? ProtobufUnittest_NestedTestMessageSetContainer()}
+  var child: Proto2Unittest_NestedTestMessageSetContainer {
+    get {return _storage._child ?? Proto2Unittest_NestedTestMessageSetContainer()}
     set {_uniqueStorage()._child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -79,8 +79,8 @@ struct ProtobufUnittest_NestedTestMessageSetContainer: @unchecked Sendable {
   /// Clears the value of `child`. Subsequent reads from it will return its default value.
   mutating func clearChild() {_uniqueStorage()._child = nil}
 
-  var lazyChild: ProtobufUnittest_NestedTestMessageSetContainer {
-    get {return _storage._lazyChild ?? ProtobufUnittest_NestedTestMessageSetContainer()}
+  var lazyChild: Proto2Unittest_NestedTestMessageSetContainer {
+    get {return _storage._lazyChild ?? Proto2Unittest_NestedTestMessageSetContainer()}
     set {_uniqueStorage()._lazyChild = newValue}
   }
   /// Returns true if `lazyChild` has been explicitly set.
@@ -95,7 +95,7 @@ struct ProtobufUnittest_NestedTestMessageSetContainer: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_NestedTestInt: @unchecked Sendable {
+struct Proto2Unittest_NestedTestInt: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -118,8 +118,8 @@ struct ProtobufUnittest_NestedTestInt: @unchecked Sendable {
   /// Clears the value of `b`. Subsequent reads from it will return its default value.
   mutating func clearB() {_uniqueStorage()._b = nil}
 
-  var child: ProtobufUnittest_NestedTestInt {
-    get {return _storage._child ?? ProtobufUnittest_NestedTestInt()}
+  var child: Proto2Unittest_NestedTestInt {
+    get {return _storage._child ?? Proto2Unittest_NestedTestInt()}
     set {_uniqueStorage()._child = newValue}
   }
   /// Returns true if `child` has been explicitly set.
@@ -134,7 +134,7 @@ struct ProtobufUnittest_NestedTestInt: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestMessageSetExtension1: Sendable {
+struct Proto2Unittest_TestMessageSetExtension1: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -175,7 +175,7 @@ struct ProtobufUnittest_TestMessageSetExtension1: Sendable {
   fileprivate var _testAliasing: String? = nil
 }
 
-struct ProtobufUnittest_TestMessageSetExtension2: Sendable {
+struct Proto2Unittest_TestMessageSetExtension2: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -196,13 +196,13 @@ struct ProtobufUnittest_TestMessageSetExtension2: Sendable {
   fileprivate var _str: String? = nil
 }
 
-struct ProtobufUnittest_TestMessageSetExtension3: Sendable {
+struct Proto2Unittest_TestMessageSetExtension3: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var msg: ProtobufUnittest_NestedTestInt {
-    get {return _msg ?? ProtobufUnittest_NestedTestInt()}
+  var msg: Proto2Unittest_NestedTestInt {
+    get {return _msg ?? Proto2Unittest_NestedTestInt()}
     set {_msg = newValue}
   }
   /// Returns true if `msg` has been explicitly set.
@@ -223,17 +223,17 @@ struct ProtobufUnittest_TestMessageSetExtension3: Sendable {
 
   init() {}
 
-  fileprivate var _msg: ProtobufUnittest_NestedTestInt? = nil
+  fileprivate var _msg: Proto2Unittest_NestedTestInt? = nil
   fileprivate var _requiredInt: Int32? = nil
 }
 
 /// MessageSet wire format is equivalent to this.
-struct ProtobufUnittest_RawMessageSet: Sendable {
+struct Proto2Unittest_RawMessageSet: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var item: [ProtobufUnittest_RawMessageSet.Item] = []
+  var item: [Proto2Unittest_RawMessageSet.Item] = []
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -282,101 +282,101 @@ struct ProtobufUnittest_RawMessageSet: Sendable {
 
 extension Proto2WireformatUnittest_TestMessageSet {
 
-  var ProtobufUnittest_TestMessageSetExtension1_messageSetExtension: ProtobufUnittest_TestMessageSetExtension1 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension) ?? ProtobufUnittest_TestMessageSetExtension1()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension, value: newValue)}
+  var Proto2Unittest_TestMessageSetExtension1_messageSetExtension: Proto2Unittest_TestMessageSetExtension1 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension) ?? Proto2Unittest_TestMessageSetExtension1()}
+    set {setExtensionValue(ext: Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension`
+  /// Returns true if extension `Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestMessageSetExtension1_messageSetExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension)
+  var hasProto2Unittest_TestMessageSetExtension1_messageSetExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestMessageSetExtension1_messageSetExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension)
+  mutating func clearProto2Unittest_TestMessageSetExtension1_messageSetExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension)
   }
 
-  var ProtobufUnittest_TestMessageSetExtension2_messageSetExtension: ProtobufUnittest_TestMessageSetExtension2 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension) ?? ProtobufUnittest_TestMessageSetExtension2()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension, value: newValue)}
+  var Proto2Unittest_TestMessageSetExtension2_messageSetExtension: Proto2Unittest_TestMessageSetExtension2 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension) ?? Proto2Unittest_TestMessageSetExtension2()}
+    set {setExtensionValue(ext: Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension`
+  /// Returns true if extension `Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestMessageSetExtension2_messageSetExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension)
+  var hasProto2Unittest_TestMessageSetExtension2_messageSetExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestMessageSetExtension2_messageSetExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension)
+  mutating func clearProto2Unittest_TestMessageSetExtension2_messageSetExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension)
   }
 
-  var ProtobufUnittest_TestMessageSetExtension3_messageSetExtension: ProtobufUnittest_TestMessageSetExtension3 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension) ?? ProtobufUnittest_TestMessageSetExtension3()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension, value: newValue)}
+  var Proto2Unittest_TestMessageSetExtension3_messageSetExtension: Proto2Unittest_TestMessageSetExtension3 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension) ?? Proto2Unittest_TestMessageSetExtension3()}
+    set {setExtensionValue(ext: Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension`
+  /// Returns true if extension `Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestMessageSetExtension3_messageSetExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension)
+  var hasProto2Unittest_TestMessageSetExtension3_messageSetExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestMessageSetExtension3_messageSetExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension)
+  mutating func clearProto2Unittest_TestMessageSetExtension3_messageSetExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestMset_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestMset_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestMset_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_TestMessageSetExtension1.Extensions.message_set_extension,
-  ProtobufUnittest_TestMessageSetExtension2.Extensions.message_set_extension,
-  ProtobufUnittest_TestMessageSetExtension3.Extensions.message_set_extension
+let Proto2Unittest_UnittestMset_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_TestMessageSetExtension1.Extensions.message_set_extension,
+  Proto2Unittest_TestMessageSetExtension2.Extensions.message_set_extension,
+  Proto2Unittest_TestMessageSetExtension3.Extensions.message_set_extension
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-extension ProtobufUnittest_TestMessageSetExtension1 {
+extension Proto2Unittest_TestMessageSetExtension1 {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestMessageSetExtension1>, Proto2WireformatUnittest_TestMessageSet>(
+    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestMessageSetExtension1>, Proto2WireformatUnittest_TestMessageSet>(
       _protobuf_fieldNumber: 1545008,
-      fieldName: "protobuf_unittest.TestMessageSetExtension1"
+      fieldName: "proto2_unittest.TestMessageSetExtension1"
     )
   }
 }
 
-extension ProtobufUnittest_TestMessageSetExtension2 {
+extension Proto2Unittest_TestMessageSetExtension2 {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestMessageSetExtension2>, Proto2WireformatUnittest_TestMessageSet>(
+    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestMessageSetExtension2>, Proto2WireformatUnittest_TestMessageSet>(
       _protobuf_fieldNumber: 1547769,
-      fieldName: "protobuf_unittest.TestMessageSetExtension2"
+      fieldName: "proto2_unittest.TestMessageSetExtension2"
     )
   }
 }
 
-extension ProtobufUnittest_TestMessageSetExtension3 {
+extension Proto2Unittest_TestMessageSetExtension3 {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestMessageSetExtension3>, Proto2WireformatUnittest_TestMessageSet>(
+    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestMessageSetExtension3>, Proto2WireformatUnittest_TestMessageSet>(
       _protobuf_fieldNumber: 195273129,
-      fieldName: "protobuf_unittest.TestMessageSetExtension3"
+      fieldName: "proto2_unittest.TestMessageSetExtension3"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestMessageSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSetContainer"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "message_set"),
@@ -410,14 +410,14 @@ extension ProtobufUnittest_TestMessageSetContainer: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSetContainer, rhs: ProtobufUnittest_TestMessageSetContainer) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSetContainer, rhs: Proto2Unittest_TestMessageSetContainer) -> Bool {
     if lhs._messageSet != rhs._messageSet {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_NestedTestMessageSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NestedTestMessageSetContainer: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NestedTestMessageSetContainer"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "container"),
@@ -426,9 +426,9 @@ extension ProtobufUnittest_NestedTestMessageSetContainer: SwiftProtobuf.Message,
   ]
 
   fileprivate class _StorageClass {
-    var _container: ProtobufUnittest_TestMessageSetContainer? = nil
-    var _child: ProtobufUnittest_NestedTestMessageSetContainer? = nil
-    var _lazyChild: ProtobufUnittest_NestedTestMessageSetContainer? = nil
+    var _container: Proto2Unittest_TestMessageSetContainer? = nil
+    var _child: Proto2Unittest_NestedTestMessageSetContainer? = nil
+    var _lazyChild: Proto2Unittest_NestedTestMessageSetContainer? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -501,7 +501,7 @@ extension ProtobufUnittest_NestedTestMessageSetContainer: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NestedTestMessageSetContainer, rhs: ProtobufUnittest_NestedTestMessageSetContainer) -> Bool {
+  static func ==(lhs: Proto2Unittest_NestedTestMessageSetContainer, rhs: Proto2Unittest_NestedTestMessageSetContainer) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -518,7 +518,7 @@ extension ProtobufUnittest_NestedTestMessageSetContainer: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufUnittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NestedTestInt"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -529,7 +529,7 @@ extension ProtobufUnittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._
   fileprivate class _StorageClass {
     var _a: UInt32? = nil
     var _b: Int32? = nil
-    var _child: ProtobufUnittest_NestedTestInt? = nil
+    var _child: Proto2Unittest_NestedTestInt? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -593,7 +593,7 @@ extension ProtobufUnittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NestedTestInt, rhs: ProtobufUnittest_NestedTestInt) -> Bool {
+  static func ==(lhs: Proto2Unittest_NestedTestInt, rhs: Proto2Unittest_NestedTestInt) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -610,7 +610,7 @@ extension ProtobufUnittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._
   }
 }
 
-extension ProtobufUnittest_TestMessageSetExtension1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSetExtension1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSetExtension1"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     15: .same(proto: "i"),
@@ -654,7 +654,7 @@ extension ProtobufUnittest_TestMessageSetExtension1: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSetExtension1, rhs: ProtobufUnittest_TestMessageSetExtension1) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSetExtension1, rhs: Proto2Unittest_TestMessageSetExtension1) -> Bool {
     if lhs._i != rhs._i {return false}
     if lhs._recursive != rhs._recursive {return false}
     if lhs._testAliasing != rhs._testAliasing {return false}
@@ -663,7 +663,7 @@ extension ProtobufUnittest_TestMessageSetExtension1: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_TestMessageSetExtension2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSetExtension2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSetExtension2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     25: .same(proto: "str"),
@@ -692,14 +692,14 @@ extension ProtobufUnittest_TestMessageSetExtension2: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSetExtension2, rhs: ProtobufUnittest_TestMessageSetExtension2) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSetExtension2, rhs: Proto2Unittest_TestMessageSetExtension2) -> Bool {
     if lhs._str != rhs._str {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestMessageSetExtension3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestMessageSetExtension3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessageSetExtension3"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     35: .same(proto: "msg"),
@@ -738,7 +738,7 @@ extension ProtobufUnittest_TestMessageSetExtension3: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestMessageSetExtension3, rhs: ProtobufUnittest_TestMessageSetExtension3) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestMessageSetExtension3, rhs: Proto2Unittest_TestMessageSetExtension3) -> Bool {
     if lhs._msg != rhs._msg {return false}
     if lhs._requiredInt != rhs._requiredInt {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -746,7 +746,7 @@ extension ProtobufUnittest_TestMessageSetExtension3: SwiftProtobuf.Message, Swif
   }
 }
 
-extension ProtobufUnittest_RawMessageSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RawMessageSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RawMessageSet"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "item"),
@@ -777,15 +777,15 @@ extension ProtobufUnittest_RawMessageSet: SwiftProtobuf.Message, SwiftProtobuf._
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RawMessageSet, rhs: ProtobufUnittest_RawMessageSet) -> Bool {
+  static func ==(lhs: Proto2Unittest_RawMessageSet, rhs: Proto2Unittest_RawMessageSet) -> Bool {
     if lhs.item != rhs.item {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_RawMessageSet.Item: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_RawMessageSet.protoMessageName + ".Item"
+extension Proto2Unittest_RawMessageSet.Item: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_RawMessageSet.protoMessageName + ".Item"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     2: .standard(proto: "type_id"),
     3: .same(proto: "message"),
@@ -824,7 +824,7 @@ extension ProtobufUnittest_RawMessageSet.Item: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RawMessageSet.Item, rhs: ProtobufUnittest_RawMessageSet.Item) -> Bool {
+  static func ==(lhs: Proto2Unittest_RawMessageSet.Item, rhs: Proto2Unittest_RawMessageSet.Item) -> Bool {
     if lhs._typeID != rhs._typeID {return false}
     if lhs._message != rhs._message {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
diff --git a/Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift b/Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift
index 2938682e7..958168231 100644
--- a/Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift
@@ -171,8 +171,8 @@ struct Proto2NofieldpresenceUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalProto2Message: ProtobufUnittest_TestAllTypes {
-    get {return _storage._optionalProto2Message ?? ProtobufUnittest_TestAllTypes()}
+  var optionalProto2Message: Proto2Unittest_TestAllTypes {
+    get {return _storage._optionalProto2Message ?? Proto2Unittest_TestAllTypes()}
     set {_uniqueStorage()._optionalProto2Message = newValue}
   }
   /// Returns true if `optionalProto2Message` has been explicitly set.
@@ -187,7 +187,7 @@ struct Proto2NofieldpresenceUnittest_TestAllTypes: @unchecked Sendable {
 
   /// N.B.: proto2-enum-type fields not allowed, because their default values
   /// might not be zero.
-  /// optional protobuf_unittest.ForeignEnum          optional_proto2_enum     =
+  /// optional proto2_unittest.ForeignEnum          optional_proto2_enum     =
   /// 23;
   var optionalForeignEnum: Proto2NofieldpresenceUnittest_ForeignEnum {
     get {return _storage._optionalForeignEnum}
@@ -299,7 +299,7 @@ struct Proto2NofieldpresenceUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedProto2Message: [ProtobufUnittest_TestAllTypes] {
+  var repeatedProto2Message: [Proto2Unittest_TestAllTypes] {
     get {return _storage._repeatedProto2Message}
     set {_uniqueStorage()._repeatedProto2Message = newValue}
   }
@@ -454,8 +454,8 @@ struct Proto2NofieldpresenceUnittest_TestProto2Required: Sendable {
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var proto2: ProtobufUnittest_TestRequired {
-    get {return _proto2 ?? ProtobufUnittest_TestRequired()}
+  var proto2: Proto2Unittest_TestRequired {
+    get {return _proto2 ?? Proto2Unittest_TestRequired()}
     set {_proto2 = newValue}
   }
   /// Returns true if `proto2` has been explicitly set.
@@ -467,7 +467,7 @@ struct Proto2NofieldpresenceUnittest_TestProto2Required: Sendable {
 
   init() {}
 
-  fileprivate var _proto2: ProtobufUnittest_TestRequired? = nil
+  fileprivate var _proto2: Proto2Unittest_TestRequired? = nil
 }
 
 /// Define these after TestAllTypes to make sure the compiler can handle
@@ -592,7 +592,7 @@ extension Proto2NofieldpresenceUnittest_TestAllTypes: SwiftProtobuf.Message, Swi
     var _optionalBytes: Data = Data()
     var _optionalNestedMessage: Proto2NofieldpresenceUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: Proto2NofieldpresenceUnittest_ForeignMessage? = nil
-    var _optionalProto2Message: ProtobufUnittest_TestAllTypes? = nil
+    var _optionalProto2Message: Proto2Unittest_TestAllTypes? = nil
     var _optionalNestedEnum: Proto2NofieldpresenceUnittest_TestAllTypes.NestedEnum = .foo
     var _optionalForeignEnum: Proto2NofieldpresenceUnittest_ForeignEnum = .foreignFoo
     var _optionalStringPiece: String = String()
@@ -615,7 +615,7 @@ extension Proto2NofieldpresenceUnittest_TestAllTypes: SwiftProtobuf.Message, Swi
     var _repeatedBytes: [Data] = []
     var _repeatedNestedMessage: [Proto2NofieldpresenceUnittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [Proto2NofieldpresenceUnittest_ForeignMessage] = []
-    var _repeatedProto2Message: [ProtobufUnittest_TestAllTypes] = []
+    var _repeatedProto2Message: [Proto2Unittest_TestAllTypes] = []
     var _repeatedNestedEnum: [Proto2NofieldpresenceUnittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [Proto2NofieldpresenceUnittest_ForeignEnum] = []
     var _repeatedStringPiece: [String] = []
diff --git a/Reference/upstream/google/protobuf/unittest_no_generic_services.pb.swift b/Reference/upstream/google/protobuf/unittest_no_generic_services.pb.swift
index 31fb8f12a..3e107941f 100644
--- a/Reference/upstream/google/protobuf/unittest_no_generic_services.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_no_generic_services.pb.swift
@@ -29,7 +29,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_NoGenericServicesTest_TestEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_NoGenericServicesTest_TestEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case foo = 1
 
   init() {
@@ -38,7 +38,7 @@ enum ProtobufUnittest_NoGenericServicesTest_TestEnum: Int, SwiftProtobuf.Enum, S
 
 }
 
-struct ProtobufUnittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -69,55 +69,55 @@ struct ProtobufUnittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.Extensi
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_NoGenericServicesTest_TestMessage {
+extension Proto2Unittest_NoGenericServicesTest_TestMessage {
 
-  var ProtobufUnittest_NoGenericServicesTest_testExtension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension, value: newValue)}
+  var Proto2Unittest_NoGenericServicesTest_testExtension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_NoGenericServicesTest_Extensions_test_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_NoGenericServicesTest_Extensions_test_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension`
+  /// Returns true if extension `Proto2Unittest_NoGenericServicesTest_Extensions_test_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_NoGenericServicesTest_testExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension)
+  var hasProto2Unittest_NoGenericServicesTest_testExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_NoGenericServicesTest_Extensions_test_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension`.
+  /// Clears the value of extension `Proto2Unittest_NoGenericServicesTest_Extensions_test_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_NoGenericServicesTest_testExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension)
+  mutating func clearProto2Unittest_NoGenericServicesTest_testExtension() {
+    clearExtensionValue(ext: Proto2Unittest_NoGenericServicesTest_Extensions_test_extension)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_NoGenericServicesTest_UnittestNoGenericServices_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_NoGenericServicesTest_UnittestNoGenericServices_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_NoGenericServicesTest_UnittestNoGenericServices_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension
+let Proto2Unittest_NoGenericServicesTest_UnittestNoGenericServices_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_NoGenericServicesTest_Extensions_test_extension
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufUnittest_NoGenericServicesTest_Extensions_test_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_NoGenericServicesTest_TestMessage>(
+let Proto2Unittest_NoGenericServicesTest_Extensions_test_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_NoGenericServicesTest_TestMessage>(
   _protobuf_fieldNumber: 1000,
-  fieldName: "protobuf_unittest.no_generic_services_test.test_extension"
+  fieldName: "proto2_unittest.no_generic_services_test.test_extension"
 )
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest.no_generic_services_test"
+fileprivate let _protobuf_package = "proto2_unittest.no_generic_services_test"
 
-extension ProtobufUnittest_NoGenericServicesTest_TestEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NoGenericServicesTest_TestEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "FOO"),
   ]
 }
 
-extension ProtobufUnittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "a"),
@@ -136,7 +136,7 @@ extension ProtobufUnittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.Mess
       switch fieldNumber {
       case 1: try { try decoder.decodeSingularInt32Field(value: &self._a) }()
       case 1000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_NoGenericServicesTest_TestMessage.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_NoGenericServicesTest_TestMessage.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -154,7 +154,7 @@ extension ProtobufUnittest_NoGenericServicesTest_TestMessage: SwiftProtobuf.Mess
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_NoGenericServicesTest_TestMessage, rhs: ProtobufUnittest_NoGenericServicesTest_TestMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_NoGenericServicesTest_TestMessage, rhs: Proto2Unittest_NoGenericServicesTest_TestMessage) -> Bool {
     if lhs._a != rhs._a {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
diff --git a/Reference/upstream/google/protobuf/unittest_optimize_for.pb.swift b/Reference/upstream/google/protobuf/unittest_optimize_for.pb.swift
index 5d1e89048..68023bf39 100644
--- a/Reference/upstream/google/protobuf/unittest_optimize_for.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_optimize_for.pb.swift
@@ -33,7 +33,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -47,8 +47,8 @@ struct ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage, S
   /// Clears the value of `i`. Subsequent reads from it will return its default value.
   mutating func clearI() {self._i = nil}
 
-  var msg: ProtobufUnittest_ForeignMessage {
-    get {return _msg ?? ProtobufUnittest_ForeignMessage()}
+  var msg: Proto2Unittest_ForeignMessage {
+    get {return _msg ?? Proto2Unittest_ForeignMessage()}
     set {_msg = newValue}
   }
   /// Returns true if `msg` has been explicitly set.
@@ -56,7 +56,7 @@ struct ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage, S
   /// Clears the value of `msg`. Subsequent reads from it will return its default value.
   mutating func clearMsg() {self._msg = nil}
 
-  var foo: ProtobufUnittest_TestOptimizedForSize.OneOf_Foo? = nil
+  var foo: Proto2Unittest_TestOptimizedForSize.OneOf_Foo? = nil
 
   var integerField: Int32 {
     get {
@@ -86,10 +86,10 @@ struct ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.ExtensibleMessage, S
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
   fileprivate var _i: Int32? = nil
-  fileprivate var _msg: ProtobufUnittest_ForeignMessage? = nil
+  fileprivate var _msg: Proto2Unittest_ForeignMessage? = nil
 }
 
-struct ProtobufUnittest_TestRequiredOptimizedForSize: Sendable {
+struct Proto2Unittest_TestRequiredOptimizedForSize: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -110,13 +110,13 @@ struct ProtobufUnittest_TestRequiredOptimizedForSize: Sendable {
   fileprivate var _x: Int32? = nil
 }
 
-struct ProtobufUnittest_TestOptionalOptimizedForSize: Sendable {
+struct Proto2Unittest_TestOptionalOptimizedForSize: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var o: ProtobufUnittest_TestRequiredOptimizedForSize {
-    get {return _o ?? ProtobufUnittest_TestRequiredOptimizedForSize()}
+  var o: Proto2Unittest_TestRequiredOptimizedForSize {
+    get {return _o ?? Proto2Unittest_TestRequiredOptimizedForSize()}
     set {_o = newValue}
   }
   /// Returns true if `o` has been explicitly set.
@@ -128,7 +128,7 @@ struct ProtobufUnittest_TestOptionalOptimizedForSize: Sendable {
 
   init() {}
 
-  fileprivate var _o: ProtobufUnittest_TestRequiredOptimizedForSize? = nil
+  fileprivate var _o: Proto2Unittest_TestRequiredOptimizedForSize? = nil
 }
 
 // MARK: - Extension support defined in unittest_optimize_for.proto.
@@ -140,74 +140,74 @@ struct ProtobufUnittest_TestOptionalOptimizedForSize: Sendable {
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_TestOptimizedForSize {
+extension Proto2Unittest_TestOptimizedForSize {
 
-  var ProtobufUnittest_TestOptimizedForSize_testExtension: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension, value: newValue)}
+  var Proto2Unittest_TestOptimizedForSize_testExtension: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension`
+  /// Returns true if extension `Proto2Unittest_TestOptimizedForSize.Extensions.test_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestOptimizedForSize_testExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension)
+  var hasProto2Unittest_TestOptimizedForSize_testExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension`.
+  /// Clears the value of extension `Proto2Unittest_TestOptimizedForSize.Extensions.test_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestOptimizedForSize_testExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension)
+  mutating func clearProto2Unittest_TestOptimizedForSize_testExtension() {
+    clearExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension)
   }
 
-  var ProtobufUnittest_TestOptimizedForSize_testExtension2: ProtobufUnittest_TestRequiredOptimizedForSize {
-    get {return getExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2) ?? ProtobufUnittest_TestRequiredOptimizedForSize()}
-    set {setExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2, value: newValue)}
+  var Proto2Unittest_TestOptimizedForSize_testExtension2: Proto2Unittest_TestRequiredOptimizedForSize {
+    get {return getExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2) ?? Proto2Unittest_TestRequiredOptimizedForSize()}
+    set {setExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2`
+  /// Returns true if extension `Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2`
   /// has been explicitly set.
-  var hasProtobufUnittest_TestOptimizedForSize_testExtension2: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2)
+  var hasProto2Unittest_TestOptimizedForSize_testExtension2: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2)
   }
-  /// Clears the value of extension `ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2`.
+  /// Clears the value of extension `Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TestOptimizedForSize_testExtension2() {
-    clearExtensionValue(ext: ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2)
+  mutating func clearProto2Unittest_TestOptimizedForSize_testExtension2() {
+    clearExtensionValue(ext: Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestOptimizeFor_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestOptimizeFor_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestOptimizeFor_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension,
-  ProtobufUnittest_TestOptimizedForSize.Extensions.test_extension2
+let Proto2Unittest_UnittestOptimizeFor_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_TestOptimizedForSize.Extensions.test_extension,
+  Proto2Unittest_TestOptimizedForSize.Extensions.test_extension2
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-extension ProtobufUnittest_TestOptimizedForSize {
+extension Proto2Unittest_TestOptimizedForSize {
   enum Extensions {
-    static let test_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_TestOptimizedForSize>(
+    static let test_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_TestOptimizedForSize>(
       _protobuf_fieldNumber: 1234,
-      fieldName: "protobuf_unittest.TestOptimizedForSize.test_extension"
+      fieldName: "proto2_unittest.TestOptimizedForSize.test_extension"
     )
 
-    static let test_extension2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_TestRequiredOptimizedForSize>, ProtobufUnittest_TestOptimizedForSize>(
+    static let test_extension2 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestRequiredOptimizedForSize>, Proto2Unittest_TestOptimizedForSize>(
       _protobuf_fieldNumber: 1235,
-      fieldName: "protobuf_unittest.TestOptimizedForSize.test_extension2"
+      fieldName: "proto2_unittest.TestOptimizedForSize.test_extension2"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOptimizedForSize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "i"),
@@ -246,7 +246,7 @@ extension ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.Message, SwiftPro
       }()
       case 19: try { try decoder.decodeSingularMessageField(value: &self._msg) }()
       case 1000..<536870912:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestOptimizedForSize.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestOptimizedForSize.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -278,7 +278,7 @@ extension ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.Message, SwiftPro
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOptimizedForSize, rhs: ProtobufUnittest_TestOptimizedForSize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOptimizedForSize, rhs: Proto2Unittest_TestOptimizedForSize) -> Bool {
     if lhs._i != rhs._i {return false}
     if lhs._msg != rhs._msg {return false}
     if lhs.foo != rhs.foo {return false}
@@ -288,7 +288,7 @@ extension ProtobufUnittest_TestOptimizedForSize: SwiftProtobuf.Message, SwiftPro
   }
 }
 
-extension ProtobufUnittest_TestRequiredOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestRequiredOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestRequiredOptimizedForSize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "x"),
@@ -322,14 +322,14 @@ extension ProtobufUnittest_TestRequiredOptimizedForSize: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestRequiredOptimizedForSize, rhs: ProtobufUnittest_TestRequiredOptimizedForSize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestRequiredOptimizedForSize, rhs: Proto2Unittest_TestRequiredOptimizedForSize) -> Bool {
     if lhs._x != rhs._x {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestOptionalOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestOptionalOptimizedForSize: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestOptionalOptimizedForSize"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "o"),
@@ -363,7 +363,7 @@ extension ProtobufUnittest_TestOptionalOptimizedForSize: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestOptionalOptimizedForSize, rhs: ProtobufUnittest_TestOptionalOptimizedForSize) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestOptionalOptimizedForSize, rhs: Proto2Unittest_TestOptionalOptimizedForSize) -> Bool {
     if lhs._o != rhs._o {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_proto3.pb.swift b/Reference/upstream/google/protobuf/unittest_proto3.pb.swift
index 1b671f6c1..1bed0e738 100644
--- a/Reference/upstream/google/protobuf/unittest_proto3.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_proto3.pb.swift
@@ -177,8 +177,8 @@ struct Proto3Unittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -207,8 +207,8 @@ struct Proto3Unittest_TestAllTypes: @unchecked Sendable {
   }
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -234,8 +234,8 @@ struct Proto3Unittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalUnverifiedLazyMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUnverifiedLazyMessage() {_uniqueStorage()._optionalUnverifiedLazyMessage = nil}
 
-  var optionalLazyImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalLazyImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalLazyImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalLazyImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalLazyImportMessage = newValue}
   }
   /// Returns true if `optionalLazyImportMessage` has been explicitly set.
@@ -329,7 +329,7 @@ struct Proto3Unittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
@@ -1150,15 +1150,15 @@ extension Proto3Unittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _optionalBytes: Data = Data()
     var _optionalNestedMessage: Proto3Unittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: Proto3Unittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _optionalNestedEnum: Proto3Unittest_TestAllTypes.NestedEnum = .zero
     var _optionalForeignEnum: Proto3Unittest_ForeignEnum = .foreignZero
     var _optionalStringPiece: String = String()
     var _optionalCord: String = String()
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
     var _optionalLazyMessage: Proto3Unittest_TestAllTypes.NestedMessage? = nil
     var _optionalUnverifiedLazyMessage: Proto3Unittest_TestAllTypes.NestedMessage? = nil
-    var _optionalLazyImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalLazyImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
     var _repeatedUint32: [UInt32] = []
@@ -1176,7 +1176,7 @@ extension Proto3Unittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _repeatedBytes: [Data] = []
     var _repeatedNestedMessage: [Proto3Unittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [Proto3Unittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
     var _repeatedNestedEnum: [Proto3Unittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [Proto3Unittest_ForeignEnum] = []
     var _repeatedStringPiece: [String] = []
diff --git a/Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift b/Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift
index 2cdd10ecb..1c189345b 100644
--- a/Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift
@@ -177,8 +177,8 @@ struct Proto3ArenaUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -212,8 +212,8 @@ struct Proto3ArenaUnittest_TestAllTypes: @unchecked Sendable {
   }
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -239,8 +239,8 @@ struct Proto3ArenaUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalUnverifiedLazyMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUnverifiedLazyMessage() {_uniqueStorage()._optionalUnverifiedLazyMessage = nil}
 
-  var optionalLazyImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalLazyImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalLazyImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalLazyImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalLazyImportMessage = newValue}
   }
   /// Returns true if `optionalLazyImportMessage` has been explicitly set.
@@ -470,7 +470,7 @@ struct Proto3ArenaUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
@@ -903,16 +903,16 @@ extension Proto3ArenaUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf
     var _optionalBytes: Data = Data()
     var _optionalNestedMessage: Proto3ArenaUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: Proto3ArenaUnittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _optionalNestedEnum: Proto3ArenaUnittest_TestAllTypes.NestedEnum = .zero
     var _optionalForeignEnum: Proto3ArenaUnittest_ForeignEnum = .foreignZero
     var _optionalStringPiece: String = String()
     var _optionalCord: String = String()
     var _optionalBytesCord: Data = Data()
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
     var _optionalLazyMessage: Proto3ArenaUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalUnverifiedLazyMessage: Proto3ArenaUnittest_TestAllTypes.NestedMessage? = nil
-    var _optionalLazyImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalLazyImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
     var _repeatedUint32: [UInt32] = []
@@ -945,7 +945,7 @@ extension Proto3ArenaUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf
     var _proto3OptionalBytes: Data? = nil
     var _repeatedNestedMessage: [Proto3ArenaUnittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [Proto3ArenaUnittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
     var _repeatedNestedEnum: [Proto3ArenaUnittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [Proto3ArenaUnittest_ForeignEnum] = []
     var _repeatedStringPiece: [String] = []
diff --git a/Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift b/Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift
index 79e7ea83c..b9a2025bd 100644
--- a/Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift
@@ -171,8 +171,8 @@ struct Proto3ArenaLiteUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -201,8 +201,8 @@ struct Proto3ArenaLiteUnittest_TestAllTypes: @unchecked Sendable {
   }
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -305,7 +305,7 @@ struct Proto3ArenaLiteUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
@@ -670,12 +670,12 @@ extension Proto3ArenaLiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProt
     var _optionalBytes: Data = Data()
     var _optionalNestedMessage: Proto3ArenaLiteUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: Proto3ArenaLiteUnittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _optionalNestedEnum: Proto3ArenaLiteUnittest_TestAllTypes.NestedEnum = .zero
     var _optionalForeignEnum: Proto3ArenaLiteUnittest_ForeignEnum = .foreignZero
     var _optionalStringPiece: String = String()
     var _optionalCord: String = String()
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
     var _optionalLazyMessage: Proto3ArenaLiteUnittest_TestAllTypes.NestedMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
@@ -694,7 +694,7 @@ extension Proto3ArenaLiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProt
     var _repeatedBytes: [Data] = []
     var _repeatedNestedMessage: [Proto3ArenaLiteUnittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [Proto3ArenaLiteUnittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
     var _repeatedNestedEnum: [Proto3ArenaLiteUnittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [Proto3ArenaLiteUnittest_ForeignEnum] = []
     var _repeatedStringPiece: [String] = []
diff --git a/Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift b/Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift
index 96db7d959..16a8a8ca3 100644
--- a/Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift
@@ -171,8 +171,8 @@ struct Proto3LiteUnittest_TestAllTypes: @unchecked Sendable {
   /// Clears the value of `optionalForeignMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalForeignMessage() {_uniqueStorage()._optionalForeignMessage = nil}
 
-  var optionalImportMessage: ProtobufUnittestImport_ImportMessage {
-    get {return _storage._optionalImportMessage ?? ProtobufUnittestImport_ImportMessage()}
+  var optionalImportMessage: Proto2UnittestImport_ImportMessage {
+    get {return _storage._optionalImportMessage ?? Proto2UnittestImport_ImportMessage()}
     set {_uniqueStorage()._optionalImportMessage = newValue}
   }
   /// Returns true if `optionalImportMessage` has been explicitly set.
@@ -201,8 +201,8 @@ struct Proto3LiteUnittest_TestAllTypes: @unchecked Sendable {
   }
 
   /// Defined in unittest_import_public.proto
-  var optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage {
-    get {return _storage._optionalPublicImportMessage ?? ProtobufUnittestImport_PublicImportMessage()}
+  var optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage {
+    get {return _storage._optionalPublicImportMessage ?? Proto2UnittestImport_PublicImportMessage()}
     set {_uniqueStorage()._optionalPublicImportMessage = newValue}
   }
   /// Returns true if `optionalPublicImportMessage` has been explicitly set.
@@ -305,7 +305,7 @@ struct Proto3LiteUnittest_TestAllTypes: @unchecked Sendable {
     set {_uniqueStorage()._repeatedForeignMessage = newValue}
   }
 
-  var repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] {
+  var repeatedImportMessage: [Proto2UnittestImport_ImportMessage] {
     get {return _storage._repeatedImportMessage}
     set {_uniqueStorage()._repeatedImportMessage = newValue}
   }
@@ -670,12 +670,12 @@ extension Proto3LiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf.
     var _optionalBytes: Data = Data()
     var _optionalNestedMessage: Proto3LiteUnittest_TestAllTypes.NestedMessage? = nil
     var _optionalForeignMessage: Proto3LiteUnittest_ForeignMessage? = nil
-    var _optionalImportMessage: ProtobufUnittestImport_ImportMessage? = nil
+    var _optionalImportMessage: Proto2UnittestImport_ImportMessage? = nil
     var _optionalNestedEnum: Proto3LiteUnittest_TestAllTypes.NestedEnum = .zero
     var _optionalForeignEnum: Proto3LiteUnittest_ForeignEnum = .foreignZero
     var _optionalStringPiece: String = String()
     var _optionalCord: String = String()
-    var _optionalPublicImportMessage: ProtobufUnittestImport_PublicImportMessage? = nil
+    var _optionalPublicImportMessage: Proto2UnittestImport_PublicImportMessage? = nil
     var _optionalLazyMessage: Proto3LiteUnittest_TestAllTypes.NestedMessage? = nil
     var _repeatedInt32: [Int32] = []
     var _repeatedInt64: [Int64] = []
@@ -694,7 +694,7 @@ extension Proto3LiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf.
     var _repeatedBytes: [Data] = []
     var _repeatedNestedMessage: [Proto3LiteUnittest_TestAllTypes.NestedMessage] = []
     var _repeatedForeignMessage: [Proto3LiteUnittest_ForeignMessage] = []
-    var _repeatedImportMessage: [ProtobufUnittestImport_ImportMessage] = []
+    var _repeatedImportMessage: [Proto2UnittestImport_ImportMessage] = []
     var _repeatedNestedEnum: [Proto3LiteUnittest_TestAllTypes.NestedEnum] = []
     var _repeatedForeignEnum: [Proto3LiteUnittest_ForeignEnum] = []
     var _repeatedStringPiece: [String] = []
diff --git a/Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift b/Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift
index 5c0cb3a4c..cb50b8d07 100644
--- a/Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift
@@ -28,7 +28,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
+struct Proto2Unittest_TestProto3Optional: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -178,8 +178,8 @@ struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
   /// Clears the value of `optionalCord`. Subsequent reads from it will return its default value.
   mutating func clearOptionalCord() {_uniqueStorage()._optionalCord = nil}
 
-  var optionalNestedMessage: ProtobufUnittest_TestProto3Optional.NestedMessage {
-    get {return _storage._optionalNestedMessage ?? ProtobufUnittest_TestProto3Optional.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestProto3Optional.NestedMessage {
+    get {return _storage._optionalNestedMessage ?? Proto2Unittest_TestProto3Optional.NestedMessage()}
     set {_uniqueStorage()._optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -187,8 +187,8 @@ struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
   /// Clears the value of `optionalNestedMessage`. Subsequent reads from it will return its default value.
   mutating func clearOptionalNestedMessage() {_uniqueStorage()._optionalNestedMessage = nil}
 
-  var lazyNestedMessage: ProtobufUnittest_TestProto3Optional.NestedMessage {
-    get {return _storage._lazyNestedMessage ?? ProtobufUnittest_TestProto3Optional.NestedMessage()}
+  var lazyNestedMessage: Proto2Unittest_TestProto3Optional.NestedMessage {
+    get {return _storage._lazyNestedMessage ?? Proto2Unittest_TestProto3Optional.NestedMessage()}
     set {_uniqueStorage()._lazyNestedMessage = newValue}
   }
   /// Returns true if `lazyNestedMessage` has been explicitly set.
@@ -196,7 +196,7 @@ struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
   /// Clears the value of `lazyNestedMessage`. Subsequent reads from it will return its default value.
   mutating func clearLazyNestedMessage() {_uniqueStorage()._lazyNestedMessage = nil}
 
-  var optionalNestedEnum: ProtobufUnittest_TestProto3Optional.NestedEnum {
+  var optionalNestedEnum: Proto2Unittest_TestProto3Optional.NestedEnum {
     get {return _storage._optionalNestedEnum ?? .unspecified}
     set {_uniqueStorage()._optionalNestedEnum = newValue}
   }
@@ -256,7 +256,7 @@ struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [ProtobufUnittest_TestProto3Optional.NestedEnum] = [
+    static let allCases: [Proto2Unittest_TestProto3Optional.NestedEnum] = [
       .unspecified,
       .foo,
       .bar,
@@ -295,13 +295,13 @@ struct ProtobufUnittest_TestProto3Optional: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_TestProto3OptionalMessage: Sendable {
+struct Proto2Unittest_TestProto3OptionalMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var nestedMessage: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage {
-    get {return _nestedMessage ?? ProtobufUnittest_TestProto3OptionalMessage.NestedMessage()}
+  var nestedMessage: Proto2Unittest_TestProto3OptionalMessage.NestedMessage {
+    get {return _nestedMessage ?? Proto2Unittest_TestProto3OptionalMessage.NestedMessage()}
     set {_nestedMessage = newValue}
   }
   /// Returns true if `nestedMessage` has been explicitly set.
@@ -309,8 +309,8 @@ struct ProtobufUnittest_TestProto3OptionalMessage: Sendable {
   /// Clears the value of `nestedMessage`. Subsequent reads from it will return its default value.
   mutating func clearNestedMessage() {self._nestedMessage = nil}
 
-  var optionalNestedMessage: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage {
-    get {return _optionalNestedMessage ?? ProtobufUnittest_TestProto3OptionalMessage.NestedMessage()}
+  var optionalNestedMessage: Proto2Unittest_TestProto3OptionalMessage.NestedMessage {
+    get {return _optionalNestedMessage ?? Proto2Unittest_TestProto3OptionalMessage.NestedMessage()}
     set {_optionalNestedMessage = newValue}
   }
   /// Returns true if `optionalNestedMessage` has been explicitly set.
@@ -334,11 +334,11 @@ struct ProtobufUnittest_TestProto3OptionalMessage: Sendable {
 
   init() {}
 
-  fileprivate var _nestedMessage: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage? = nil
-  fileprivate var _optionalNestedMessage: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage? = nil
+  fileprivate var _nestedMessage: Proto2Unittest_TestProto3OptionalMessage.NestedMessage? = nil
+  fileprivate var _optionalNestedMessage: Proto2Unittest_TestProto3OptionalMessage.NestedMessage? = nil
 }
 
-struct ProtobufUnittest_Proto3OptionalExtensions: Sendable {
+struct Proto2Unittest_Proto3OptionalExtensions: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -359,72 +359,72 @@ struct ProtobufUnittest_Proto3OptionalExtensions: Sendable {
 
 extension SwiftProtobuf.Google_Protobuf_MessageOptions {
 
-  var ProtobufUnittest_Proto3OptionalExtensions_extNoOptional: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional, value: newValue)}
+  var Proto2Unittest_Proto3OptionalExtensions_extNoOptional: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional`
+  /// Returns true if extension `Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional`
   /// has been explicitly set.
-  var hasProtobufUnittest_Proto3OptionalExtensions_extNoOptional: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional)
+  var hasProto2Unittest_Proto3OptionalExtensions_extNoOptional: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional)
   }
-  /// Clears the value of extension `ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional`.
+  /// Clears the value of extension `Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_Proto3OptionalExtensions_extNoOptional() {
-    clearExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional)
+  mutating func clearProto2Unittest_Proto3OptionalExtensions_extNoOptional() {
+    clearExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional)
   }
 
-  var ProtobufUnittest_Proto3OptionalExtensions_extWithOptional: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional, value: newValue)}
+  var Proto2Unittest_Proto3OptionalExtensions_extWithOptional: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional`
+  /// Returns true if extension `Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional`
   /// has been explicitly set.
-  var hasProtobufUnittest_Proto3OptionalExtensions_extWithOptional: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional)
+  var hasProto2Unittest_Proto3OptionalExtensions_extWithOptional: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional)
   }
-  /// Clears the value of extension `ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional`.
+  /// Clears the value of extension `Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_Proto3OptionalExtensions_extWithOptional() {
-    clearExtensionValue(ext: ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional)
+  mutating func clearProto2Unittest_Proto3OptionalExtensions_extWithOptional() {
+    clearExtensionValue(ext: Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestProto3Optional_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestProto3Optional_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestProto3Optional_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_no_optional,
-  ProtobufUnittest_Proto3OptionalExtensions.Extensions.ext_with_optional
+let Proto2Unittest_UnittestProto3Optional_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_no_optional,
+  Proto2Unittest_Proto3OptionalExtensions.Extensions.ext_with_optional
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-extension ProtobufUnittest_Proto3OptionalExtensions {
+extension Proto2Unittest_Proto3OptionalExtensions {
   enum Extensions {
     static let ext_no_optional = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
       _protobuf_fieldNumber: 355886728,
-      fieldName: "protobuf_unittest.Proto3OptionalExtensions.ext_no_optional"
+      fieldName: "proto2_unittest.Proto3OptionalExtensions.ext_no_optional"
     )
 
     static let ext_with_optional = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
       _protobuf_fieldNumber: 355886729,
-      fieldName: "protobuf_unittest.Proto3OptionalExtensions.ext_with_optional"
+      fieldName: "proto2_unittest.Proto3OptionalExtensions.ext_with_optional"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestProto3Optional"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "optional_int32"),
@@ -467,9 +467,9 @@ extension ProtobufUnittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProto
     var _optionalString: String? = nil
     var _optionalBytes: Data? = nil
     var _optionalCord: String? = nil
-    var _optionalNestedMessage: ProtobufUnittest_TestProto3Optional.NestedMessage? = nil
-    var _lazyNestedMessage: ProtobufUnittest_TestProto3Optional.NestedMessage? = nil
-    var _optionalNestedEnum: ProtobufUnittest_TestProto3Optional.NestedEnum? = nil
+    var _optionalNestedMessage: Proto2Unittest_TestProto3Optional.NestedMessage? = nil
+    var _lazyNestedMessage: Proto2Unittest_TestProto3Optional.NestedMessage? = nil
+    var _optionalNestedEnum: Proto2Unittest_TestProto3Optional.NestedEnum? = nil
     var _singularInt32: Int32 = 0
     var _singularInt64: Int64 = 0
 
@@ -625,7 +625,7 @@ extension ProtobufUnittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestProto3Optional, rhs: ProtobufUnittest_TestProto3Optional) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestProto3Optional, rhs: Proto2Unittest_TestProto3Optional) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -660,7 +660,7 @@ extension ProtobufUnittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_TestProto3Optional.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestProto3Optional.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1: .same(proto: "NEG"),
     0: .same(proto: "UNSPECIFIED"),
@@ -670,8 +670,8 @@ extension ProtobufUnittest_TestProto3Optional.NestedEnum: SwiftProtobuf._ProtoNa
   ]
 }
 
-extension ProtobufUnittest_TestProto3Optional.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestProto3Optional.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestProto3Optional.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestProto3Optional.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "bb"),
   ]
@@ -699,14 +699,14 @@ extension ProtobufUnittest_TestProto3Optional.NestedMessage: SwiftProtobuf.Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestProto3Optional.NestedMessage, rhs: ProtobufUnittest_TestProto3Optional.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestProto3Optional.NestedMessage, rhs: Proto2Unittest_TestProto3Optional.NestedMessage) -> Bool {
     if lhs._bb != rhs._bb {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TestProto3OptionalMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestProto3OptionalMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestProto3OptionalMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "nested_message"),
@@ -740,7 +740,7 @@ extension ProtobufUnittest_TestProto3OptionalMessage: SwiftProtobuf.Message, Swi
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestProto3OptionalMessage, rhs: ProtobufUnittest_TestProto3OptionalMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestProto3OptionalMessage, rhs: Proto2Unittest_TestProto3OptionalMessage) -> Bool {
     if lhs._nestedMessage != rhs._nestedMessage {return false}
     if lhs._optionalNestedMessage != rhs._optionalNestedMessage {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -748,8 +748,8 @@ extension ProtobufUnittest_TestProto3OptionalMessage: SwiftProtobuf.Message, Swi
   }
 }
 
-extension ProtobufUnittest_TestProto3OptionalMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TestProto3OptionalMessage.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TestProto3OptionalMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TestProto3OptionalMessage.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "s"),
   ]
@@ -773,14 +773,14 @@ extension ProtobufUnittest_TestProto3OptionalMessage.NestedMessage: SwiftProtobu
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage, rhs: ProtobufUnittest_TestProto3OptionalMessage.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestProto3OptionalMessage.NestedMessage, rhs: Proto2Unittest_TestProto3OptionalMessage.NestedMessage) -> Bool {
     if lhs.s != rhs.s {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_Proto3OptionalExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Proto3OptionalExtensions: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Proto3OptionalExtensions"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -793,7 +793,7 @@ extension ProtobufUnittest_Proto3OptionalExtensions: SwiftProtobuf.Message, Swif
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Proto3OptionalExtensions, rhs: ProtobufUnittest_Proto3OptionalExtensions) -> Bool {
+  static func ==(lhs: Proto2Unittest_Proto3OptionalExtensions, rhs: Proto2Unittest_Proto3OptionalExtensions) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
diff --git a/Reference/upstream/google/protobuf/unittest_redaction.pb.swift b/Reference/upstream/google/protobuf/unittest_redaction.pb.swift
new file mode 100644
index 000000000..cb5f7712b
--- /dev/null
+++ b/Reference/upstream/google/protobuf/unittest_redaction.pb.swift
@@ -0,0 +1,603 @@
+// DO NOT EDIT.
+// swift-format-ignore-file
+// swiftlint:disable all
+//
+// Generated by the Swift generator plugin for the protocol buffer compiler.
+// Source: google/protobuf/unittest_redaction.proto
+//
+// For information on using the generated types, please see the documentation:
+//   https://github.com/apple/swift-protobuf/
+
+/// Test proto for redaction
+
+import SwiftProtobuf
+
+// If the compiler emits an error on this type, it is because this file
+// was generated by a version of the `protoc` Swift plug-in that is
+// incompatible with the version of SwiftProtobuf to which you are linking.
+// Please ensure that you are building against the same version of the API
+// that was used to generate this file.
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
+  struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {}
+  typealias Version = _2
+}
+
+enum Proto2Unittest_MetaAnnotatedEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+  typealias RawValue = Int
+  case testNull // = 0
+  case testRedactable // = 1
+  case testNoRedact // = 2
+  case testNoRedactAgain // = 3
+  case testRedactableFalse // = 4
+  case UNRECOGNIZED(Int)
+
+  init() {
+    self = .testNull
+  }
+
+  init?(rawValue: Int) {
+    switch rawValue {
+    case 0: self = .testNull
+    case 1: self = .testRedactable
+    case 2: self = .testNoRedact
+    case 3: self = .testNoRedactAgain
+    case 4: self = .testRedactableFalse
+    default: self = .UNRECOGNIZED(rawValue)
+    }
+  }
+
+  var rawValue: Int {
+    switch self {
+    case .testNull: return 0
+    case .testRedactable: return 1
+    case .testNoRedact: return 2
+    case .testNoRedactAgain: return 3
+    case .testRedactableFalse: return 4
+    case .UNRECOGNIZED(let i): return i
+    }
+  }
+
+  // The compiler won't synthesize support with the UNRECOGNIZED case.
+  static let allCases: [Proto2Unittest_MetaAnnotatedEnum] = [
+    .testNull,
+    .testRedactable,
+    .testNoRedact,
+    .testNoRedactAgain,
+    .testRedactableFalse,
+  ]
+
+}
+
+struct Proto2Unittest_TestRedactedNestMessage: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var foo: String {
+    get {return _foo ?? String()}
+    set {_foo = newValue}
+  }
+  /// Returns true if `foo` has been explicitly set.
+  var hasFoo: Bool {return self._foo != nil}
+  /// Clears the value of `foo`. Subsequent reads from it will return its default value.
+  mutating func clearFoo() {self._foo = nil}
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  init() {}
+
+  fileprivate var _foo: String? = nil
+}
+
+struct Proto2Unittest_TestRepeatedRedactedNestMessage: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var bar: String {
+    get {return _bar ?? String()}
+    set {_bar = newValue}
+  }
+  /// Returns true if `bar` has been explicitly set.
+  var hasBar: Bool {return self._bar != nil}
+  /// Clears the value of `bar`. Subsequent reads from it will return its default value.
+  mutating func clearBar() {self._bar = nil}
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  init() {}
+
+  fileprivate var _bar: String? = nil
+}
+
+struct Proto2Unittest_TestMessageEnum: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var redactableEnum: [Proto2Unittest_MetaAnnotatedEnum] = []
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  init() {}
+}
+
+struct Proto2Unittest_TestNestedMessageEnum: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var directEnum: [Proto2Unittest_MetaAnnotatedEnum] = []
+
+  var nestedEnum: Proto2Unittest_TestMessageEnum {
+    get {return _nestedEnum ?? Proto2Unittest_TestMessageEnum()}
+    set {_nestedEnum = newValue}
+  }
+  /// Returns true if `nestedEnum` has been explicitly set.
+  var hasNestedEnum: Bool {return self._nestedEnum != nil}
+  /// Clears the value of `nestedEnum`. Subsequent reads from it will return its default value.
+  mutating func clearNestedEnum() {self._nestedEnum = nil}
+
+  var redactedString: String {
+    get {return _redactedString ?? String()}
+    set {_redactedString = newValue}
+  }
+  /// Returns true if `redactedString` has been explicitly set.
+  var hasRedactedString: Bool {return self._redactedString != nil}
+  /// Clears the value of `redactedString`. Subsequent reads from it will return its default value.
+  mutating func clearRedactedString() {self._redactedString = nil}
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  init() {}
+
+  fileprivate var _nestedEnum: Proto2Unittest_TestMessageEnum? = nil
+  fileprivate var _redactedString: String? = nil
+}
+
+struct Proto2Unittest_TestRedactedMessage: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  /// NOTE: This field was marked as deprecated in the .proto file.
+  var textField: String {
+    get {return _textField ?? String()}
+    set {_textField = newValue}
+  }
+  /// Returns true if `textField` has been explicitly set.
+  var hasTextField: Bool {return self._textField != nil}
+  /// Clears the value of `textField`. Subsequent reads from it will return its default value.
+  mutating func clearTextField() {self._textField = nil}
+
+  var metaAnnotated: String {
+    get {return _metaAnnotated ?? String()}
+    set {_metaAnnotated = newValue}
+  }
+  /// Returns true if `metaAnnotated` has been explicitly set.
+  var hasMetaAnnotated: Bool {return self._metaAnnotated != nil}
+  /// Clears the value of `metaAnnotated`. Subsequent reads from it will return its default value.
+  mutating func clearMetaAnnotated() {self._metaAnnotated = nil}
+
+  var repeatedMetaAnnotated: String {
+    get {return _repeatedMetaAnnotated ?? String()}
+    set {_repeatedMetaAnnotated = newValue}
+  }
+  /// Returns true if `repeatedMetaAnnotated` has been explicitly set.
+  var hasRepeatedMetaAnnotated: Bool {return self._repeatedMetaAnnotated != nil}
+  /// Clears the value of `repeatedMetaAnnotated`. Subsequent reads from it will return its default value.
+  mutating func clearRepeatedMetaAnnotated() {self._repeatedMetaAnnotated = nil}
+
+  var unredactedRepeatedAnnotations: String {
+    get {return _unredactedRepeatedAnnotations ?? String()}
+    set {_unredactedRepeatedAnnotations = newValue}
+  }
+  /// Returns true if `unredactedRepeatedAnnotations` has been explicitly set.
+  var hasUnredactedRepeatedAnnotations: Bool {return self._unredactedRepeatedAnnotations != nil}
+  /// Clears the value of `unredactedRepeatedAnnotations`. Subsequent reads from it will return its default value.
+  mutating func clearUnredactedRepeatedAnnotations() {self._unredactedRepeatedAnnotations = nil}
+
+  var unreportedNonMetaDebugRedactField: String {
+    get {return _unreportedNonMetaDebugRedactField ?? String()}
+    set {_unreportedNonMetaDebugRedactField = newValue}
+  }
+  /// Returns true if `unreportedNonMetaDebugRedactField` has been explicitly set.
+  var hasUnreportedNonMetaDebugRedactField: Bool {return self._unreportedNonMetaDebugRedactField != nil}
+  /// Clears the value of `unreportedNonMetaDebugRedactField`. Subsequent reads from it will return its default value.
+  mutating func clearUnreportedNonMetaDebugRedactField() {self._unreportedNonMetaDebugRedactField = nil}
+
+  var anyField: SwiftProtobuf.Google_Protobuf_Any {
+    get {return _anyField ?? SwiftProtobuf.Google_Protobuf_Any()}
+    set {_anyField = newValue}
+  }
+  /// Returns true if `anyField` has been explicitly set.
+  var hasAnyField: Bool {return self._anyField != nil}
+  /// Clears the value of `anyField`. Subsequent reads from it will return its default value.
+  mutating func clearAnyField() {self._anyField = nil}
+
+  var redactableFalse: String {
+    get {return _redactableFalse ?? String()}
+    set {_redactableFalse = newValue}
+  }
+  /// Returns true if `redactableFalse` has been explicitly set.
+  var hasRedactableFalse: Bool {return self._redactableFalse != nil}
+  /// Clears the value of `redactableFalse`. Subsequent reads from it will return its default value.
+  mutating func clearRedactableFalse() {self._redactableFalse = nil}
+
+  var testDirectMessageEnum: String {
+    get {return _testDirectMessageEnum ?? String()}
+    set {_testDirectMessageEnum = newValue}
+  }
+  /// Returns true if `testDirectMessageEnum` has been explicitly set.
+  var hasTestDirectMessageEnum: Bool {return self._testDirectMessageEnum != nil}
+  /// Clears the value of `testDirectMessageEnum`. Subsequent reads from it will return its default value.
+  mutating func clearTestDirectMessageEnum() {self._testDirectMessageEnum = nil}
+
+  var testNestedMessageEnum: String {
+    get {return _testNestedMessageEnum ?? String()}
+    set {_testNestedMessageEnum = newValue}
+  }
+  /// Returns true if `testNestedMessageEnum` has been explicitly set.
+  var hasTestNestedMessageEnum: Bool {return self._testNestedMessageEnum != nil}
+  /// Clears the value of `testNestedMessageEnum`. Subsequent reads from it will return its default value.
+  mutating func clearTestNestedMessageEnum() {self._testNestedMessageEnum = nil}
+
+  var testRedactedMessageEnum: String {
+    get {return _testRedactedMessageEnum ?? String()}
+    set {_testRedactedMessageEnum = newValue}
+  }
+  /// Returns true if `testRedactedMessageEnum` has been explicitly set.
+  var hasTestRedactedMessageEnum: Bool {return self._testRedactedMessageEnum != nil}
+  /// Clears the value of `testRedactedMessageEnum`. Subsequent reads from it will return its default value.
+  mutating func clearTestRedactedMessageEnum() {self._testRedactedMessageEnum = nil}
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  init() {}
+
+  fileprivate var _textField: String? = nil
+  fileprivate var _metaAnnotated: String? = nil
+  fileprivate var _repeatedMetaAnnotated: String? = nil
+  fileprivate var _unredactedRepeatedAnnotations: String? = nil
+  fileprivate var _unreportedNonMetaDebugRedactField: String? = nil
+  fileprivate var _anyField: SwiftProtobuf.Google_Protobuf_Any? = nil
+  fileprivate var _redactableFalse: String? = nil
+  fileprivate var _testDirectMessageEnum: String? = nil
+  fileprivate var _testNestedMessageEnum: String? = nil
+  fileprivate var _testRedactedMessageEnum: String? = nil
+}
+
+// MARK: - Extension support defined in unittest_redaction.proto.
+
+// MARK: - Extension Properties
+
+// Swift Extensions on the extended Messages to add easy access to the declared
+// extension fields. The names are based on the extension field name from the proto
+// declaration. To avoid naming collisions, the names are prefixed with the name of
+// the scope where the extend directive occurs.
+
+extension SwiftProtobuf.Google_Protobuf_FieldOptions {
+
+  var Proto2Unittest_metaAnnotatedEnum: Proto2Unittest_MetaAnnotatedEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_meta_annotated_enum) ?? .testNull}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_meta_annotated_enum, value: newValue)}
+  }
+  /// Returns true if extension `Proto2Unittest_Extensions_meta_annotated_enum`
+  /// has been explicitly set.
+  var hasProto2Unittest_metaAnnotatedEnum: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_meta_annotated_enum)
+  }
+  /// Clears the value of extension `Proto2Unittest_Extensions_meta_annotated_enum`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProto2Unittest_metaAnnotatedEnum() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_meta_annotated_enum)
+  }
+
+  var Proto2Unittest_repeatedMetaAnnotatedEnum: [Proto2Unittest_MetaAnnotatedEnum] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_meta_annotated_enum) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_meta_annotated_enum, value: newValue)}
+  }
+
+  var Proto2Unittest_testNestedMessageEnum: Proto2Unittest_TestNestedMessageEnum {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_test_nested_message_enum) ?? Proto2Unittest_TestNestedMessageEnum()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_test_nested_message_enum, value: newValue)}
+  }
+  /// Returns true if extension `Proto2Unittest_Extensions_test_nested_message_enum`
+  /// has been explicitly set.
+  var hasProto2Unittest_testNestedMessageEnum: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_test_nested_message_enum)
+  }
+  /// Clears the value of extension `Proto2Unittest_Extensions_test_nested_message_enum`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProto2Unittest_testNestedMessageEnum() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_test_nested_message_enum)
+  }
+
+}
+
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestRedaction_Extensions
+
+/// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
+/// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
+/// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
+/// a larger `SwiftProtobuf.SimpleExtensionMap`.
+let Proto2Unittest_UnittestRedaction_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_meta_annotated_enum,
+  Proto2Unittest_Extensions_repeated_meta_annotated_enum,
+  Proto2Unittest_Extensions_test_nested_message_enum
+]
+
+// Extension Objects - The only reason these might be needed is when manually
+// constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
+// accessors for the extension fields on the messages directly.
+
+let Proto2Unittest_Extensions_meta_annotated_enum = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalEnumExtensionField<Proto2Unittest_MetaAnnotatedEnum>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+  _protobuf_fieldNumber: 535801413,
+  fieldName: "proto2_unittest.meta_annotated_enum"
+)
+
+let Proto2Unittest_Extensions_repeated_meta_annotated_enum = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedEnumExtensionField<Proto2Unittest_MetaAnnotatedEnum>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+  _protobuf_fieldNumber: 535801414,
+  fieldName: "proto2_unittest.repeated_meta_annotated_enum"
+)
+
+let Proto2Unittest_Extensions_test_nested_message_enum = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_TestNestedMessageEnum>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+  _protobuf_fieldNumber: 535801415,
+  fieldName: "proto2_unittest.test_nested_message_enum"
+)
+
+// MARK: - Code below here is support for the SwiftProtobuf runtime.
+
+fileprivate let _protobuf_package = "proto2_unittest"
+
+extension Proto2Unittest_MetaAnnotatedEnum: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "TEST_NULL"),
+    1: .same(proto: "TEST_REDACTABLE"),
+    2: .same(proto: "TEST_NO_REDACT"),
+    3: .same(proto: "TEST_NO_REDACT_AGAIN"),
+    4: .same(proto: "TEST_REDACTABLE_FALSE"),
+  ]
+}
+
+extension Proto2Unittest_TestRedactedNestMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestRedactedNestMessage"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "foo"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularStringField(value: &self._foo) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    try { if let v = self._foo {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 1)
+    } }()
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: Proto2Unittest_TestRedactedNestMessage, rhs: Proto2Unittest_TestRedactedNestMessage) -> Bool {
+    if lhs._foo != rhs._foo {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension Proto2Unittest_TestRepeatedRedactedNestMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestRepeatedRedactedNestMessage"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "bar"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularStringField(value: &self._bar) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    try { if let v = self._bar {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 1)
+    } }()
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: Proto2Unittest_TestRepeatedRedactedNestMessage, rhs: Proto2Unittest_TestRepeatedRedactedNestMessage) -> Bool {
+    if lhs._bar != rhs._bar {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension Proto2Unittest_TestMessageEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestMessageEnum"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .standard(proto: "redactable_enum"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeRepeatedEnumField(value: &self.redactableEnum) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if !self.redactableEnum.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.redactableEnum, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: Proto2Unittest_TestMessageEnum, rhs: Proto2Unittest_TestMessageEnum) -> Bool {
+    if lhs.redactableEnum != rhs.redactableEnum {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension Proto2Unittest_TestNestedMessageEnum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestNestedMessageEnum"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .standard(proto: "direct_enum"),
+    2: .standard(proto: "nested_enum"),
+    3: .standard(proto: "redacted_string"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeRepeatedEnumField(value: &self.directEnum) }()
+      case 2: try { try decoder.decodeSingularMessageField(value: &self._nestedEnum) }()
+      case 3: try { try decoder.decodeSingularStringField(value: &self._redactedString) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    if !self.directEnum.isEmpty {
+      try visitor.visitRepeatedEnumField(value: self.directEnum, fieldNumber: 1)
+    }
+    try { if let v = self._nestedEnum {
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    } }()
+    try { if let v = self._redactedString {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 3)
+    } }()
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: Proto2Unittest_TestNestedMessageEnum, rhs: Proto2Unittest_TestNestedMessageEnum) -> Bool {
+    if lhs.directEnum != rhs.directEnum {return false}
+    if lhs._nestedEnum != rhs._nestedEnum {return false}
+    if lhs._redactedString != rhs._redactedString {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension Proto2Unittest_TestRedactedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestRedactedMessage"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .standard(proto: "text_field"),
+    8: .standard(proto: "meta_annotated"),
+    9: .standard(proto: "repeated_meta_annotated"),
+    10: .standard(proto: "unredacted_repeated_annotations"),
+    17: .standard(proto: "unreported_non_meta_debug_redact_field"),
+    18: .standard(proto: "any_field"),
+    19: .standard(proto: "redactable_false"),
+    22: .standard(proto: "test_direct_message_enum"),
+    23: .standard(proto: "test_nested_message_enum"),
+    24: .standard(proto: "test_redacted_message_enum"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularStringField(value: &self._textField) }()
+      case 8: try { try decoder.decodeSingularStringField(value: &self._metaAnnotated) }()
+      case 9: try { try decoder.decodeSingularStringField(value: &self._repeatedMetaAnnotated) }()
+      case 10: try { try decoder.decodeSingularStringField(value: &self._unredactedRepeatedAnnotations) }()
+      case 17: try { try decoder.decodeSingularStringField(value: &self._unreportedNonMetaDebugRedactField) }()
+      case 18: try { try decoder.decodeSingularMessageField(value: &self._anyField) }()
+      case 19: try { try decoder.decodeSingularStringField(value: &self._redactableFalse) }()
+      case 22: try { try decoder.decodeSingularStringField(value: &self._testDirectMessageEnum) }()
+      case 23: try { try decoder.decodeSingularStringField(value: &self._testNestedMessageEnum) }()
+      case 24: try { try decoder.decodeSingularStringField(value: &self._testRedactedMessageEnum) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    try { if let v = self._textField {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 1)
+    } }()
+    try { if let v = self._metaAnnotated {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 8)
+    } }()
+    try { if let v = self._repeatedMetaAnnotated {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 9)
+    } }()
+    try { if let v = self._unredactedRepeatedAnnotations {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 10)
+    } }()
+    try { if let v = self._unreportedNonMetaDebugRedactField {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 17)
+    } }()
+    try { if let v = self._anyField {
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 18)
+    } }()
+    try { if let v = self._redactableFalse {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 19)
+    } }()
+    try { if let v = self._testDirectMessageEnum {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 22)
+    } }()
+    try { if let v = self._testNestedMessageEnum {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 23)
+    } }()
+    try { if let v = self._testRedactedMessageEnum {
+      try visitor.visitSingularStringField(value: v, fieldNumber: 24)
+    } }()
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: Proto2Unittest_TestRedactedMessage, rhs: Proto2Unittest_TestRedactedMessage) -> Bool {
+    if lhs._textField != rhs._textField {return false}
+    if lhs._metaAnnotated != rhs._metaAnnotated {return false}
+    if lhs._repeatedMetaAnnotated != rhs._repeatedMetaAnnotated {return false}
+    if lhs._unredactedRepeatedAnnotations != rhs._unredactedRepeatedAnnotations {return false}
+    if lhs._unreportedNonMetaDebugRedactField != rhs._unreportedNonMetaDebugRedactField {return false}
+    if lhs._anyField != rhs._anyField {return false}
+    if lhs._redactableFalse != rhs._redactableFalse {return false}
+    if lhs._testDirectMessageEnum != rhs._testDirectMessageEnum {return false}
+    if lhs._testNestedMessageEnum != rhs._testNestedMessageEnum {return false}
+    if lhs._testRedactedMessageEnum != rhs._testRedactedMessageEnum {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Reference/upstream/google/protobuf/unittest_retention.pb.swift b/Reference/upstream/google/protobuf/unittest_retention.pb.swift
index 10d12cbda..c25f8be98 100644
--- a/Reference/upstream/google/protobuf/unittest_retention.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_retention.pb.swift
@@ -27,7 +27,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-enum ProtobufUnittest_TopLevelEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
+enum Proto2Unittest_TopLevelEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable {
   case topLevelUnknown = 0
 
   init() {
@@ -37,7 +37,7 @@ enum ProtobufUnittest_TopLevelEnum: Int, SwiftProtobuf.Enum, Swift.CaseIterable
 }
 
 /// Retention attributes set on fields nested within a message
-struct ProtobufUnittest_OptionsMessage: Sendable {
+struct Proto2Unittest_OptionsMessage: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -78,7 +78,7 @@ struct ProtobufUnittest_OptionsMessage: Sendable {
   fileprivate var _sourceRetentionField: Int32? = nil
 }
 
-struct ProtobufUnittest_Extendee: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_Extendee: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -90,7 +90,7 @@ struct ProtobufUnittest_Extendee: SwiftProtobuf.ExtensibleMessage, Sendable {
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
 }
 
-struct ProtobufUnittest_TopLevelMessage: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TopLevelMessage: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -104,7 +104,7 @@ struct ProtobufUnittest_TopLevelMessage: SwiftProtobuf.ExtensibleMessage, Sendab
   /// Clears the value of `f`. Subsequent reads from it will return its default value.
   mutating func clearF() {self._f = nil}
 
-  var o: ProtobufUnittest_TopLevelMessage.OneOf_O? = nil
+  var o: Proto2Unittest_TopLevelMessage.OneOf_O? = nil
 
   var i: Int64 {
     get {
@@ -155,370 +155,370 @@ struct ProtobufUnittest_TopLevelMessage: SwiftProtobuf.ExtensibleMessage, Sendab
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_Extendee {
+extension Proto2Unittest_Extendee {
 
-  var ProtobufUnittest_i: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_i) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_i, value: newValue)}
+  var Proto2Unittest_i: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_i) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_i, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_i`
+  /// Returns true if extension `Proto2Unittest_Extensions_i`
   /// has been explicitly set.
-  var hasProtobufUnittest_i: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_i)
+  var hasProto2Unittest_i: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_i)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_i`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_i`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_i() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_i)
+  mutating func clearProto2Unittest_i() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_i)
   }
 
-  var ProtobufUnittest_TopLevelMessage_s: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_TopLevelMessage.Extensions.s) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_TopLevelMessage.Extensions.s, value: newValue)}
+  var Proto2Unittest_TopLevelMessage_s: String {
+    get {return getExtensionValue(ext: Proto2Unittest_TopLevelMessage.Extensions.s) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_TopLevelMessage.Extensions.s, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_TopLevelMessage.Extensions.s`
+  /// Returns true if extension `Proto2Unittest_TopLevelMessage.Extensions.s`
   /// has been explicitly set.
-  var hasProtobufUnittest_TopLevelMessage_s: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_TopLevelMessage.Extensions.s)
+  var hasProto2Unittest_TopLevelMessage_s: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_TopLevelMessage.Extensions.s)
   }
-  /// Clears the value of extension `ProtobufUnittest_TopLevelMessage.Extensions.s`.
+  /// Clears the value of extension `Proto2Unittest_TopLevelMessage.Extensions.s`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_TopLevelMessage_s() {
-    clearExtensionValue(ext: ProtobufUnittest_TopLevelMessage.Extensions.s)
+  mutating func clearProto2Unittest_TopLevelMessage_s() {
+    clearExtensionValue(ext: Proto2Unittest_TopLevelMessage.Extensions.s)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_EnumOptions {
 
-  var ProtobufUnittest_enumOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enum_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enum_option, value: newValue)}
+  var Proto2Unittest_enumOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enum_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enum_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enum_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_enum_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enum_option)
+  var hasProto2Unittest_enumOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enum_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enum_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enum_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enum_option)
+  mutating func clearProto2Unittest_enumOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enum_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_EnumValueOptions {
 
-  var ProtobufUnittest_enumEntryOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_enum_entry_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_enum_entry_option, value: newValue)}
+  var Proto2Unittest_enumEntryOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_enum_entry_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_enum_entry_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_enum_entry_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_enum_entry_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_enumEntryOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_enum_entry_option)
+  var hasProto2Unittest_enumEntryOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_enum_entry_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_enum_entry_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_enum_entry_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_enumEntryOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_enum_entry_option)
+  mutating func clearProto2Unittest_enumEntryOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_enum_entry_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_ExtensionRangeOptions {
 
-  var ProtobufUnittest_extensionRangeOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_extension_range_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_extension_range_option, value: newValue)}
+  var Proto2Unittest_extensionRangeOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_extension_range_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_extension_range_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_extension_range_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_extension_range_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_extensionRangeOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_extension_range_option)
+  var hasProto2Unittest_extensionRangeOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_extension_range_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_extension_range_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_extension_range_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_extensionRangeOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_extension_range_option)
+  mutating func clearProto2Unittest_extensionRangeOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_extension_range_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_FieldOptions {
 
-  var ProtobufUnittest_fieldOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_field_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_field_option, value: newValue)}
+  var Proto2Unittest_fieldOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_field_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_field_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_field_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_field_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_fieldOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_field_option)
+  var hasProto2Unittest_fieldOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_field_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_field_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_field_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fieldOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_field_option)
+  mutating func clearProto2Unittest_fieldOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_field_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_FileOptions {
 
-  var ProtobufUnittest_plainOption: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_plain_option) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_plain_option, value: newValue)}
+  var Proto2Unittest_plainOption: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_plain_option) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_plain_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_plain_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_plain_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_plainOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_plain_option)
+  var hasProto2Unittest_plainOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_plain_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_plain_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_plain_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_plainOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_plain_option)
+  mutating func clearProto2Unittest_plainOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_plain_option)
   }
 
-  var ProtobufUnittest_runtimeRetentionOption: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_runtime_retention_option) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_runtime_retention_option, value: newValue)}
+  var Proto2Unittest_runtimeRetentionOption: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_runtime_retention_option) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_runtime_retention_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_runtime_retention_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_runtime_retention_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_runtimeRetentionOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_runtime_retention_option)
+  var hasProto2Unittest_runtimeRetentionOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_runtime_retention_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_runtime_retention_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_runtime_retention_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_runtimeRetentionOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_runtime_retention_option)
+  mutating func clearProto2Unittest_runtimeRetentionOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_runtime_retention_option)
   }
 
-  var ProtobufUnittest_sourceRetentionOption: Int32 {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_source_retention_option) ?? 0}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_source_retention_option, value: newValue)}
+  var Proto2Unittest_sourceRetentionOption: Int32 {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_source_retention_option) ?? 0}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_source_retention_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_source_retention_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_source_retention_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_sourceRetentionOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_source_retention_option)
+  var hasProto2Unittest_sourceRetentionOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_source_retention_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_source_retention_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_source_retention_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_sourceRetentionOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_source_retention_option)
+  mutating func clearProto2Unittest_sourceRetentionOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_source_retention_option)
   }
 
-  var ProtobufUnittest_fileOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_file_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_file_option, value: newValue)}
+  var Proto2Unittest_fileOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_file_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_file_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_file_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_file_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_fileOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_file_option)
+  var hasProto2Unittest_fileOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_file_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_file_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_file_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_fileOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_file_option)
+  mutating func clearProto2Unittest_fileOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_file_option)
   }
 
-  var ProtobufUnittest_repeatedOptions: [ProtobufUnittest_OptionsMessage] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_options) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_options, value: newValue)}
+  var Proto2Unittest_repeatedOptions: [Proto2Unittest_OptionsMessage] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_options) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_options, value: newValue)}
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_MessageOptions {
 
-  var ProtobufUnittest_messageOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_message_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_message_option, value: newValue)}
+  var Proto2Unittest_messageOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_message_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_message_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_message_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_message_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_messageOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_message_option)
+  var hasProto2Unittest_messageOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_message_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_message_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_message_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_messageOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_message_option)
+  mutating func clearProto2Unittest_messageOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_message_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_MethodOptions {
 
-  var ProtobufUnittest_methodOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_method_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_method_option, value: newValue)}
+  var Proto2Unittest_methodOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_method_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_method_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_method_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_method_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_methodOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_method_option)
+  var hasProto2Unittest_methodOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_method_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_method_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_method_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_methodOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_method_option)
+  mutating func clearProto2Unittest_methodOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_method_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_OneofOptions {
 
-  var ProtobufUnittest_oneofOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_oneof_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_oneof_option, value: newValue)}
+  var Proto2Unittest_oneofOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_oneof_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_oneof_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_oneof_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_oneof_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_oneofOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_oneof_option)
+  var hasProto2Unittest_oneofOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_oneof_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_oneof_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_oneof_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_oneofOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_oneof_option)
+  mutating func clearProto2Unittest_oneofOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_oneof_option)
   }
 }
 
 extension SwiftProtobuf.Google_Protobuf_ServiceOptions {
 
-  var ProtobufUnittest_serviceOption: ProtobufUnittest_OptionsMessage {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_service_option) ?? ProtobufUnittest_OptionsMessage()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_service_option, value: newValue)}
+  var Proto2Unittest_serviceOption: Proto2Unittest_OptionsMessage {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_service_option) ?? Proto2Unittest_OptionsMessage()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_service_option, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_service_option`
+  /// Returns true if extension `Proto2Unittest_Extensions_service_option`
   /// has been explicitly set.
-  var hasProtobufUnittest_serviceOption: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_service_option)
+  var hasProto2Unittest_serviceOption: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_service_option)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_service_option`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_service_option`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_serviceOption() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_service_option)
+  mutating func clearProto2Unittest_serviceOption() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_service_option)
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestRetention_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestRetention_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestRetention_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Extensions_plain_option,
-  ProtobufUnittest_Extensions_runtime_retention_option,
-  ProtobufUnittest_Extensions_source_retention_option,
-  ProtobufUnittest_Extensions_file_option,
-  ProtobufUnittest_Extensions_repeated_options,
-  ProtobufUnittest_Extensions_extension_range_option,
-  ProtobufUnittest_Extensions_message_option,
-  ProtobufUnittest_Extensions_field_option,
-  ProtobufUnittest_Extensions_oneof_option,
-  ProtobufUnittest_Extensions_enum_option,
-  ProtobufUnittest_Extensions_enum_entry_option,
-  ProtobufUnittest_Extensions_service_option,
-  ProtobufUnittest_Extensions_method_option,
-  ProtobufUnittest_Extensions_i,
-  ProtobufUnittest_TopLevelMessage.Extensions.s
+let Proto2Unittest_UnittestRetention_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_plain_option,
+  Proto2Unittest_Extensions_runtime_retention_option,
+  Proto2Unittest_Extensions_source_retention_option,
+  Proto2Unittest_Extensions_file_option,
+  Proto2Unittest_Extensions_repeated_options,
+  Proto2Unittest_Extensions_extension_range_option,
+  Proto2Unittest_Extensions_message_option,
+  Proto2Unittest_Extensions_field_option,
+  Proto2Unittest_Extensions_oneof_option,
+  Proto2Unittest_Extensions_enum_option,
+  Proto2Unittest_Extensions_enum_entry_option,
+  Proto2Unittest_Extensions_service_option,
+  Proto2Unittest_Extensions_method_option,
+  Proto2Unittest_Extensions_i,
+  Proto2Unittest_TopLevelMessage.Extensions.s
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufUnittest_Extensions_plain_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_plain_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 505092806,
-  fieldName: "protobuf_unittest.plain_option"
+  fieldName: "proto2_unittest.plain_option"
 )
 
-let ProtobufUnittest_Extensions_runtime_retention_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_runtime_retention_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 505039132,
-  fieldName: "protobuf_unittest.runtime_retention_option"
+  fieldName: "proto2_unittest.runtime_retention_option"
 )
 
-let ProtobufUnittest_Extensions_source_retention_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_source_retention_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 504878676,
-  fieldName: "protobuf_unittest.source_retention_option"
+  fieldName: "proto2_unittest.source_retention_option"
 )
 
-let ProtobufUnittest_Extensions_file_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_file_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 504871168,
-  fieldName: "protobuf_unittest.file_option"
+  fieldName: "proto2_unittest.file_option"
 )
 
-let ProtobufUnittest_Extensions_repeated_options = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FileOptions>(
+let Proto2Unittest_Extensions_repeated_options = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FileOptions>(
   _protobuf_fieldNumber: 504823570,
-  fieldName: "protobuf_unittest.repeated_options"
+  fieldName: "proto2_unittest.repeated_options"
 )
 
-let ProtobufUnittest_Extensions_extension_range_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_ExtensionRangeOptions>(
+let Proto2Unittest_Extensions_extension_range_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_ExtensionRangeOptions>(
   _protobuf_fieldNumber: 504822148,
-  fieldName: "protobuf_unittest.extension_range_option"
+  fieldName: "proto2_unittest.extension_range_option"
 )
 
-let ProtobufUnittest_Extensions_message_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
+let Proto2Unittest_Extensions_message_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_MessageOptions>(
   _protobuf_fieldNumber: 504820819,
-  fieldName: "protobuf_unittest.message_option"
+  fieldName: "proto2_unittest.message_option"
 )
 
-let ProtobufUnittest_Extensions_field_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
+let Proto2Unittest_Extensions_field_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_FieldOptions>(
   _protobuf_fieldNumber: 504589219,
-  fieldName: "protobuf_unittest.field_option"
+  fieldName: "proto2_unittest.field_option"
 )
 
-let ProtobufUnittest_Extensions_oneof_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_OneofOptions>(
+let Proto2Unittest_Extensions_oneof_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_OneofOptions>(
   _protobuf_fieldNumber: 504479153,
-  fieldName: "protobuf_unittest.oneof_option"
+  fieldName: "proto2_unittest.oneof_option"
 )
 
-let ProtobufUnittest_Extensions_enum_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
+let Proto2Unittest_Extensions_enum_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_EnumOptions>(
   _protobuf_fieldNumber: 504451567,
-  fieldName: "protobuf_unittest.enum_option"
+  fieldName: "proto2_unittest.enum_option"
 )
 
-let ProtobufUnittest_Extensions_enum_entry_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
+let Proto2Unittest_Extensions_enum_entry_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_EnumValueOptions>(
   _protobuf_fieldNumber: 504450522,
-  fieldName: "protobuf_unittest.enum_entry_option"
+  fieldName: "proto2_unittest.enum_entry_option"
 )
 
-let ProtobufUnittest_Extensions_service_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
+let Proto2Unittest_Extensions_service_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_ServiceOptions>(
   _protobuf_fieldNumber: 504387709,
-  fieldName: "protobuf_unittest.service_option"
+  fieldName: "proto2_unittest.service_option"
 )
 
-let ProtobufUnittest_Extensions_method_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufUnittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
+let Proto2Unittest_Extensions_method_option = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<Proto2Unittest_OptionsMessage>, SwiftProtobuf.Google_Protobuf_MethodOptions>(
   _protobuf_fieldNumber: 504349420,
-  fieldName: "protobuf_unittest.method_option"
+  fieldName: "proto2_unittest.method_option"
 )
 
-let ProtobufUnittest_Extensions_i = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufUnittest_Extendee>(
+let Proto2Unittest_Extensions_i = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, Proto2Unittest_Extendee>(
   _protobuf_fieldNumber: 1,
-  fieldName: "protobuf_unittest.i"
+  fieldName: "proto2_unittest.i"
 )
 
-extension ProtobufUnittest_TopLevelMessage {
+extension Proto2Unittest_TopLevelMessage {
   enum Extensions {
-    static let s = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_Extendee>(
+    static let s = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_Extendee>(
       _protobuf_fieldNumber: 2,
-      fieldName: "protobuf_unittest.TopLevelMessage.s"
+      fieldName: "proto2_unittest.TopLevelMessage.s"
     )
   }
 }
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TopLevelEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TopLevelEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "TOP_LEVEL_UNKNOWN"),
   ]
 }
 
-extension ProtobufUnittest_OptionsMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OptionsMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OptionsMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "plain_field"),
@@ -557,7 +557,7 @@ extension ProtobufUnittest_OptionsMessage: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OptionsMessage, rhs: ProtobufUnittest_OptionsMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_OptionsMessage, rhs: Proto2Unittest_OptionsMessage) -> Bool {
     if lhs._plainField != rhs._plainField {return false}
     if lhs._runtimeRetentionField != rhs._runtimeRetentionField {return false}
     if lhs._sourceRetentionField != rhs._sourceRetentionField {return false}
@@ -566,7 +566,7 @@ extension ProtobufUnittest_OptionsMessage: SwiftProtobuf.Message, SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_Extendee: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_Extendee: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".Extendee"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -578,7 +578,7 @@ extension ProtobufUnittest_Extendee: SwiftProtobuf.Message, SwiftProtobuf._Messa
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 3) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_Extendee.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_Extendee.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -588,14 +588,14 @@ extension ProtobufUnittest_Extendee: SwiftProtobuf.Message, SwiftProtobuf._Messa
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_Extendee, rhs: ProtobufUnittest_Extendee) -> Bool {
+  static func ==(lhs: Proto2Unittest_Extendee, rhs: Proto2Unittest_Extendee) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_TopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TopLevelMessage"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "f"),
@@ -623,7 +623,7 @@ extension ProtobufUnittest_TopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf
         }
       }()
       case 10..<101:
-        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TopLevelMessage.self, fieldNumber: fieldNumber) }()
+        try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TopLevelMessage.self, fieldNumber: fieldNumber) }()
       default: break
       }
     }
@@ -644,7 +644,7 @@ extension ProtobufUnittest_TopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TopLevelMessage, rhs: ProtobufUnittest_TopLevelMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TopLevelMessage, rhs: Proto2Unittest_TopLevelMessage) -> Bool {
     if lhs._f != rhs._f {return false}
     if lhs.o != rhs.o {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
@@ -653,14 +653,14 @@ extension ProtobufUnittest_TopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf
   }
 }
 
-extension ProtobufUnittest_TopLevelMessage.NestedEnum: SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TopLevelMessage.NestedEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NESTED_UNKNOWN"),
   ]
 }
 
-extension ProtobufUnittest_TopLevelMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = ProtobufUnittest_TopLevelMessage.protoMessageName + ".NestedMessage"
+extension Proto2Unittest_TopLevelMessage.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = Proto2Unittest_TopLevelMessage.protoMessageName + ".NestedMessage"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -672,7 +672,7 @@ extension ProtobufUnittest_TopLevelMessage.NestedMessage: SwiftProtobuf.Message,
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TopLevelMessage.NestedMessage, rhs: ProtobufUnittest_TopLevelMessage.NestedMessage) -> Bool {
+  static func ==(lhs: Proto2Unittest_TopLevelMessage.NestedMessage, rhs: Proto2Unittest_TopLevelMessage.NestedMessage) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
diff --git a/Reference/upstream/google/protobuf/unittest_string_type.pb.swift b/Reference/upstream/google/protobuf/unittest_string_type.pb.swift
index a963389a8..55632f123 100644
--- a/Reference/upstream/google/protobuf/unittest_string_type.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_string_type.pb.swift
@@ -28,7 +28,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
   typealias Version = _2
 }
 
-struct ProtobufUnittest_EntryProto: @unchecked Sendable {
+struct Proto2Unittest_EntryProto: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -51,9 +51,9 @@ struct ProtobufUnittest_EntryProto: @unchecked Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_EntryProto: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_EntryProto: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".EntryProto"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     3: .same(proto: "value"),
@@ -82,7 +82,7 @@ extension ProtobufUnittest_EntryProto: SwiftProtobuf.Message, SwiftProtobuf._Mes
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_EntryProto, rhs: ProtobufUnittest_EntryProto) -> Bool {
+  static func ==(lhs: Proto2Unittest_EntryProto, rhs: Proto2Unittest_EntryProto) -> Bool {
     if lhs._value != rhs._value {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_string_view.pb.swift b/Reference/upstream/google/protobuf/unittest_string_view.pb.swift
index d163c59fa..75c79c912 100644
--- a/Reference/upstream/google/protobuf/unittest_string_view.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_string_view.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 }
 
 /// NEXT_TAG = 5;
-struct ProtobufUnittest_TestStringView: @unchecked Sendable {
+struct Proto2Unittest_TestStringView: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -57,7 +57,7 @@ struct ProtobufUnittest_TestStringView: @unchecked Sendable {
   fileprivate var _singularBytes: Data? = nil
 }
 
-struct ProtobufUnittest_TestStringViewExtension: SwiftProtobuf.ExtensibleMessage, Sendable {
+struct Proto2Unittest_TestStringViewExtension: SwiftProtobuf.ExtensibleMessage, Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -78,92 +78,92 @@ struct ProtobufUnittest_TestStringViewExtension: SwiftProtobuf.ExtensibleMessage
 // declaration. To avoid naming collisions, the names are prefixed with the name of
 // the scope where the extend directive occurs.
 
-extension ProtobufUnittest_TestStringViewExtension {
+extension Proto2Unittest_TestStringViewExtension {
 
-  var ProtobufUnittest_singularStringViewExtension: String {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_singular_string_view_extension) ?? String()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_singular_string_view_extension, value: newValue)}
+  var Proto2Unittest_singularStringViewExtension: String {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_singular_string_view_extension) ?? String()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_singular_string_view_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_singular_string_view_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_singular_string_view_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_singularStringViewExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_singular_string_view_extension)
+  var hasProto2Unittest_singularStringViewExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_singular_string_view_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_singular_string_view_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_singular_string_view_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_singularStringViewExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_singular_string_view_extension)
+  mutating func clearProto2Unittest_singularStringViewExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_singular_string_view_extension)
   }
 
-  var ProtobufUnittest_singularBytesViewExtension: Data {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_singular_bytes_view_extension) ?? Data()}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_singular_bytes_view_extension, value: newValue)}
+  var Proto2Unittest_singularBytesViewExtension: Data {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_singular_bytes_view_extension) ?? Data()}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_singular_bytes_view_extension, value: newValue)}
   }
-  /// Returns true if extension `ProtobufUnittest_Extensions_singular_bytes_view_extension`
+  /// Returns true if extension `Proto2Unittest_Extensions_singular_bytes_view_extension`
   /// has been explicitly set.
-  var hasProtobufUnittest_singularBytesViewExtension: Bool {
-    return hasExtensionValue(ext: ProtobufUnittest_Extensions_singular_bytes_view_extension)
+  var hasProto2Unittest_singularBytesViewExtension: Bool {
+    return hasExtensionValue(ext: Proto2Unittest_Extensions_singular_bytes_view_extension)
   }
-  /// Clears the value of extension `ProtobufUnittest_Extensions_singular_bytes_view_extension`.
+  /// Clears the value of extension `Proto2Unittest_Extensions_singular_bytes_view_extension`.
   /// Subsequent reads from it will return its default value.
-  mutating func clearProtobufUnittest_singularBytesViewExtension() {
-    clearExtensionValue(ext: ProtobufUnittest_Extensions_singular_bytes_view_extension)
+  mutating func clearProto2Unittest_singularBytesViewExtension() {
+    clearExtensionValue(ext: Proto2Unittest_Extensions_singular_bytes_view_extension)
   }
 
-  var ProtobufUnittest_repeatedStringViewExtension: [String] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_view_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_string_view_extension, value: newValue)}
+  var Proto2Unittest_repeatedStringViewExtension: [String] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_view_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_string_view_extension, value: newValue)}
   }
 
-  var ProtobufUnittest_repeatedBytesViewExtension: [Data] {
-    get {return getExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_view_extension) ?? []}
-    set {setExtensionValue(ext: ProtobufUnittest_Extensions_repeated_bytes_view_extension, value: newValue)}
+  var Proto2Unittest_repeatedBytesViewExtension: [Data] {
+    get {return getExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_view_extension) ?? []}
+    set {setExtensionValue(ext: Proto2Unittest_Extensions_repeated_bytes_view_extension, value: newValue)}
   }
 
 }
 
-// MARK: - File's ExtensionMap: ProtobufUnittest_UnittestStringView_Extensions
+// MARK: - File's ExtensionMap: Proto2Unittest_UnittestStringView_Extensions
 
 /// A `SwiftProtobuf.SimpleExtensionMap` that includes all of the extensions defined by
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufUnittest_UnittestStringView_Extensions: SwiftProtobuf.SimpleExtensionMap = [
-  ProtobufUnittest_Extensions_singular_string_view_extension,
-  ProtobufUnittest_Extensions_singular_bytes_view_extension,
-  ProtobufUnittest_Extensions_repeated_string_view_extension,
-  ProtobufUnittest_Extensions_repeated_bytes_view_extension
+let Proto2Unittest_UnittestStringView_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+  Proto2Unittest_Extensions_singular_string_view_extension,
+  Proto2Unittest_Extensions_singular_bytes_view_extension,
+  Proto2Unittest_Extensions_repeated_string_view_extension,
+  Proto2Unittest_Extensions_repeated_bytes_view_extension
 ]
 
 // Extension Objects - The only reason these might be needed is when manually
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufUnittest_Extensions_singular_string_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestStringViewExtension>(
+let Proto2Unittest_Extensions_singular_string_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestStringViewExtension>(
   _protobuf_fieldNumber: 1,
-  fieldName: "protobuf_unittest.singular_string_view_extension"
+  fieldName: "proto2_unittest.singular_string_view_extension"
 )
 
-let ProtobufUnittest_Extensions_singular_bytes_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestStringViewExtension>(
+let Proto2Unittest_Extensions_singular_bytes_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestStringViewExtension>(
   _protobuf_fieldNumber: 2,
-  fieldName: "protobuf_unittest.singular_bytes_view_extension"
+  fieldName: "proto2_unittest.singular_bytes_view_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_string_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, ProtobufUnittest_TestStringViewExtension>(
+let Proto2Unittest_Extensions_repeated_string_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufString>, Proto2Unittest_TestStringViewExtension>(
   _protobuf_fieldNumber: 3,
-  fieldName: "protobuf_unittest.repeated_string_view_extension"
+  fieldName: "proto2_unittest.repeated_string_view_extension"
 )
 
-let ProtobufUnittest_Extensions_repeated_bytes_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, ProtobufUnittest_TestStringViewExtension>(
+let Proto2Unittest_Extensions_repeated_bytes_view_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.RepeatedExtensionField<SwiftProtobuf.ProtobufBytes>, Proto2Unittest_TestStringViewExtension>(
   _protobuf_fieldNumber: 4,
-  fieldName: "protobuf_unittest.repeated_bytes_view_extension"
+  fieldName: "proto2_unittest.repeated_bytes_view_extension"
 )
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestStringView: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestStringView: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestStringView"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "singular_string"),
@@ -207,7 +207,7 @@ extension ProtobufUnittest_TestStringView: SwiftProtobuf.Message, SwiftProtobuf.
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestStringView, rhs: ProtobufUnittest_TestStringView) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestStringView, rhs: Proto2Unittest_TestStringView) -> Bool {
     if lhs._singularString != rhs._singularString {return false}
     if lhs._singularBytes != rhs._singularBytes {return false}
     if lhs.repeatedString != rhs.repeatedString {return false}
@@ -217,7 +217,7 @@ extension ProtobufUnittest_TestStringView: SwiftProtobuf.Message, SwiftProtobuf.
   }
 }
 
-extension ProtobufUnittest_TestStringViewExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestStringViewExtension: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestStringViewExtension"
   static let _protobuf_nameMap = SwiftProtobuf._NameMap()
 
@@ -229,7 +229,7 @@ extension ProtobufUnittest_TestStringViewExtension: SwiftProtobuf.Message, Swift
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       if (1 <= fieldNumber && fieldNumber < 536870912) {
-        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufUnittest_TestStringViewExtension.self, fieldNumber: fieldNumber)
+        try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Proto2Unittest_TestStringViewExtension.self, fieldNumber: fieldNumber)
       }
     }
   }
@@ -239,7 +239,7 @@ extension ProtobufUnittest_TestStringViewExtension: SwiftProtobuf.Message, Swift
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestStringViewExtension, rhs: ProtobufUnittest_TestStringViewExtension) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestStringViewExtension, rhs: Proto2Unittest_TestStringViewExtension) -> Bool {
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
diff --git a/Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift b/Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift
index 27565190d..bbe7008a8 100644
--- a/Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift
+++ b/Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift
@@ -30,7 +30,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// Test that we can include all well-known types.
 /// Each wrapper type is included separately, as languages
 /// map handle different wrappers in different ways.
-struct ProtobufUnittest_TestWellKnownTypes: @unchecked Sendable {
+struct Proto2Unittest_TestWellKnownTypes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -215,7 +215,7 @@ struct ProtobufUnittest_TestWellKnownTypes: @unchecked Sendable {
 }
 
 /// A repeated field for each well-known type.
-struct ProtobufUnittest_RepeatedWellKnownTypes: @unchecked Sendable {
+struct Proto2Unittest_RepeatedWellKnownTypes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -318,12 +318,12 @@ struct ProtobufUnittest_RepeatedWellKnownTypes: @unchecked Sendable {
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
-struct ProtobufUnittest_OneofWellKnownTypes: Sendable {
+struct Proto2Unittest_OneofWellKnownTypes: Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var oneofField: ProtobufUnittest_OneofWellKnownTypes.OneOf_OneofField? = nil
+  var oneofField: Proto2Unittest_OneofWellKnownTypes.OneOf_OneofField? = nil
 
   var anyField: SwiftProtobuf.Google_Protobuf_Any {
     get {
@@ -499,7 +499,7 @@ struct ProtobufUnittest_OneofWellKnownTypes: Sendable {
 /// A map field for each well-known type. We only
 /// need to worry about the value part of the map being the
 /// well-known types, as messages can't be map keys.
-struct ProtobufUnittest_MapWellKnownTypes: @unchecked Sendable {
+struct Proto2Unittest_MapWellKnownTypes: @unchecked Sendable {
   // SwiftProtobuf.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
@@ -603,9 +603,9 @@ struct ProtobufUnittest_MapWellKnownTypes: @unchecked Sendable {
 
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
-fileprivate let _protobuf_package = "protobuf_unittest"
+fileprivate let _protobuf_package = "proto2_unittest"
 
-extension ProtobufUnittest_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestWellKnownTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "any_field"),
@@ -792,7 +792,7 @@ extension ProtobufUnittest_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProto
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_TestWellKnownTypes, rhs: ProtobufUnittest_TestWellKnownTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_TestWellKnownTypes, rhs: Proto2Unittest_TestWellKnownTypes) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -825,7 +825,7 @@ extension ProtobufUnittest_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProto
   }
 }
 
-extension ProtobufUnittest_RepeatedWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_RepeatedWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".RepeatedWellKnownTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "any_field"),
@@ -1001,7 +1001,7 @@ extension ProtobufUnittest_RepeatedWellKnownTypes: SwiftProtobuf.Message, SwiftP
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_RepeatedWellKnownTypes, rhs: ProtobufUnittest_RepeatedWellKnownTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_RepeatedWellKnownTypes, rhs: Proto2Unittest_RepeatedWellKnownTypes) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
@@ -1033,7 +1033,7 @@ extension ProtobufUnittest_RepeatedWellKnownTypes: SwiftProtobuf.Message, SwiftP
   }
 }
 
-extension ProtobufUnittest_OneofWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_OneofWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OneofWellKnownTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "any_field"),
@@ -1384,14 +1384,14 @@ extension ProtobufUnittest_OneofWellKnownTypes: SwiftProtobuf.Message, SwiftProt
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_OneofWellKnownTypes, rhs: ProtobufUnittest_OneofWellKnownTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_OneofWellKnownTypes, rhs: Proto2Unittest_OneofWellKnownTypes) -> Bool {
     if lhs.oneofField != rhs.oneofField {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
   }
 }
 
-extension ProtobufUnittest_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Proto2Unittest_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".MapWellKnownTypes"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .standard(proto: "any_field"),
@@ -1567,7 +1567,7 @@ extension ProtobufUnittest_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProtob
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: ProtobufUnittest_MapWellKnownTypes, rhs: ProtobufUnittest_MapWellKnownTypes) -> Bool {
+  static func ==(lhs: Proto2Unittest_MapWellKnownTypes, rhs: Proto2Unittest_MapWellKnownTypes) -> Bool {
     if lhs._storage !== rhs._storage {
       let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
         let _storage = _args.0
diff --git a/Sources/Conformance/failure_list_swift.txt b/Sources/Conformance/failure_list_swift.txt
index a2f881b47..e53e57508 100644
--- a/Sources/Conformance/failure_list_swift.txt
+++ b/Sources/Conformance/failure_list_swift.txt
@@ -1 +1 @@
-# No known failures.
+Recommended.Proto2.ProtobufInput.ValidMessageSetEncoding.SubmessageEncoding.NotUnknown.ProtobufOutput # Output was not equivalent to reference message: added: message_set_correct.(protobuf_test_messages.proto2.TestAllTypesProto2.Ext
diff --git a/Sources/Conformance/test_messages_proto2.pb.swift b/Sources/Conformance/test_messages_proto2.pb.swift
index b8c2c3801..604e98632 100644
--- a/Sources/Conformance/test_messages_proto2.pb.swift
+++ b/Sources/Conformance/test_messages_proto2.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.Ext
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
     clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobuf.Sim
   ProtobufTestMessages_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorre
     return true
   }
 }
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Sources/Conformance/test_messages_proto2_editions.pb.swift b/Sources/Conformance/test_messages_proto2_editions.pb.swift
index 2edf5f19a..91a2433cb 100644
--- a/Sources/Conformance/test_messages_proto2_editions.pb.swift
+++ b/Sources/Conformance/test_messages_proto2_editions.pb.swift
@@ -995,6 +995,15 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
+  var messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect {
+    get {return _storage._messageSetCorrect ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect()}
+    set {_uniqueStorage()._messageSetCorrect = newValue}
+  }
+  /// Returns true if `messageSetCorrect` has been explicitly set.
+  var hasMessageSetCorrect: Bool {return _storage._messageSetCorrect != nil}
+  /// Clears the value of `messageSetCorrect`. Subsequent reads from it will return its default value.
+  mutating func clearMessageSetCorrect() {_uniqueStorage()._messageSetCorrect = nil}
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   enum OneOf_OneofField: Equatable, @unchecked Sendable {
@@ -1177,6 +1186,40 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf.Ex
     fileprivate var _i: Int32? = nil
   }
 
+  struct ExtensionWithOneof: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var oneofField: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.OneOf_OneofField? = nil
+
+    var a: Int32 {
+      get {
+        if case .a(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .a(newValue)}
+    }
+
+    var b: Int32 {
+      get {
+        if case .b(let v)? = oneofField {return v}
+        return 0
+      }
+      set {oneofField = .b(newValue)}
+    }
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    enum OneOf_OneofField: Equatable, Sendable {
+      case a(Int32)
+      case b(Int32)
+
+    }
+
+    init() {}
+  }
+
   init() {}
 
   var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
@@ -1909,6 +1952,117 @@ struct ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: SwiftPro
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
+struct ProtobufTestMessages_Editions_Proto2_TestLargeOneof: Sendable {
+  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+  // methods supported on all messages.
+
+  var largeOneof: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.OneOf_LargeOneof? = nil
+
+  var a1: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1 {
+    get {
+      if case .a1(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1()
+    }
+    set {largeOneof = .a1(newValue)}
+  }
+
+  var a2: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2 {
+    get {
+      if case .a2(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2()
+    }
+    set {largeOneof = .a2(newValue)}
+  }
+
+  var a3: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3 {
+    get {
+      if case .a3(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3()
+    }
+    set {largeOneof = .a3(newValue)}
+  }
+
+  var a4: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4 {
+    get {
+      if case .a4(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4()
+    }
+    set {largeOneof = .a4(newValue)}
+  }
+
+  var a5: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5 {
+    get {
+      if case .a5(let v)? = largeOneof {return v}
+      return ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5()
+    }
+    set {largeOneof = .a5(newValue)}
+  }
+
+  var unknownFields = SwiftProtobuf.UnknownStorage()
+
+  enum OneOf_LargeOneof: Equatable, Sendable {
+    case a1(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1)
+    case a2(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2)
+    case a3(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3)
+    case a4(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4)
+    case a5(ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5)
+
+  }
+
+  struct A1: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A2: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A3: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A4: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  struct A5: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
+  init() {}
+}
+
 // MARK: - Extension support defined in test_messages_proto2_editions.proto.
 
 // MARK: - Extension Properties
@@ -2016,6 +2170,21 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
     clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension)
   }
 
+  var ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+    get {return getExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof) ?? ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof()}
+    set {setExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof, value: newValue)}
+  }
+  /// Returns true if extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`
+  /// has been explicitly set.
+  var hasProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof: Bool {
+    return hasExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+  /// Clears the value of extension `ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof`.
+  /// Subsequent reads from it will return its default value.
+  mutating func clearProtobufTestMessages_Editions_Proto2_TestAllTypesProto2_ExtensionWithOneof_extensionWithOneof() {
+    clearExtensionValue(ext: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof)
+  }
+
 }
 
 // MARK: - File's ExtensionMap: ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions
@@ -2029,6 +2198,7 @@ let ProtobufTestMessages_Editions_Proto2_TestMessagesProto2Editions_Extensions:
   ProtobufTestMessages_Editions_Proto2_Extensions_GroupField,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension,
+  ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof.Extensions.extension_with_oneof,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
 ]
@@ -2065,6 +2235,15 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof {
+  enum Extensions {
+    static let extension_with_oneof = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof>, ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+      _protobuf_fieldNumber: 123456789,
+      fieldName: "protobuf_test_messages.editions.proto2.TestAllTypesProto2.ExtensionWithOneof"
+    )
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
     static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.MessageSetCorrect>(
@@ -2234,6 +2413,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     416: .standard(proto: "field__Name16"),
     417: .standard(proto: "field_name17__"),
     418: .standard(proto: "Field_name18__"),
+    500: .standard(proto: "message_set_correct"),
   ]
 
   fileprivate class _StorageClass {
@@ -2363,6 +2543,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _field_Name16: Int32? = nil
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
+    var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
     #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
@@ -2503,6 +2684,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       _field_Name16 = source._field_Name16
       _fieldName17__ = source._fieldName17__
       _fieldName18__ = source._fieldName18__
+      _messageSetCorrect = source._messageSetCorrect
     }
   }
 
@@ -2521,6 +2703,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
       if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
+      if let v = _storage._messageSetCorrect, !v.isInitialized {return false}
       return true
     }
   }
@@ -2735,6 +2918,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._field_Name16) }()
         case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName17__) }()
         case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName18__) }()
+        case 500: try { try decoder.decodeSingularMessageField(value: &_storage._messageSetCorrect) }()
         case 120..<201:
           try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.self, fieldNumber: fieldNumber) }()
         default: break
@@ -3164,6 +3348,9 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
       try { if let v = _storage._fieldName18__ {
         try visitor.visitSingularInt32Field(value: v, fieldNumber: 418)
       } }()
+      try { if let v = _storage._messageSetCorrect {
+        try visitor.visitSingularMessageField(value: v, fieldNumber: 500)
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -3299,6 +3486,7 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
         if _storage._field_Name16 != rhs_storage._field_Name16 {return false}
         if _storage._fieldName17__ != rhs_storage._fieldName17__ {return false}
         if _storage._fieldName18__ != rhs_storage._fieldName18__ {return false}
+        if _storage._messageSetCorrect != rhs_storage._messageSetCorrect {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3590,6 +3778,66 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorr
   }
 }
 
+extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.protoMessageName + ".ExtensionWithOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a"),
+    2: .same(proto: "b"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .a(v)
+        }
+      }()
+      case 2: try {
+        var v: Int32?
+        try decoder.decodeSingularInt32Field(value: &v)
+        if let v = v {
+          if self.oneofField != nil {try decoder.handleConflictingOneOf()}
+          self.oneofField = .b(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.oneofField {
+    case .a?: try {
+      guard case .a(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+    }()
+    case .b?: try {
+      guard case .b(let v)? = self.oneofField else { preconditionFailure() }
+      try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.ExtensionWithOneof) -> Bool {
+    if lhs.oneofField != rhs.oneofField {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension ProtobufTestMessages_Editions_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -4599,3 +4847,222 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Messag
     return true
   }
 }
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = _protobuf_package + ".TestLargeOneof"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "a1"),
+    2: .same(proto: "a2"),
+    3: .same(proto: "a3"),
+    4: .same(proto: "a4"),
+    5: .same(proto: "a5"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a1(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a1(v)
+        }
+      }()
+      case 2: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a2(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a2(v)
+        }
+      }()
+      case 3: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a3(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a3(v)
+        }
+      }()
+      case 4: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a4(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a4(v)
+        }
+      }()
+      case 5: try {
+        var v: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5?
+        var hadOneofValue = false
+        if let current = self.largeOneof {
+          hadOneofValue = true
+          if case .a5(let m) = current {v = m}
+        }
+        try decoder.decodeSingularMessageField(value: &v)
+        if let v = v {
+          if hadOneofValue {try decoder.handleConflictingOneOf()}
+          self.largeOneof = .a5(v)
+        }
+      }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
+    switch self.largeOneof {
+    case .a1?: try {
+      guard case .a1(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
+    }()
+    case .a2?: try {
+      guard case .a2(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
+    }()
+    case .a3?: try {
+      guard case .a3(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
+    }()
+    case .a4?: try {
+      guard case .a4(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
+    }()
+    case .a5?: try {
+      guard case .a5(let v)? = self.largeOneof else { preconditionFailure() }
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
+    }()
+    case nil: break
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof) -> Bool {
+    if lhs.largeOneof != rhs.largeOneof {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A1"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A1) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A2"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A2) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A3"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A3) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A4"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A4) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
+extension ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = ProtobufTestMessages_Editions_Proto2_TestLargeOneof.protoMessageName + ".A5"
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    // Load everything into unknown fields
+    while try decoder.nextFieldNumber() != nil {}
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5, rhs: ProtobufTestMessages_Editions_Proto2_TestLargeOneof.A5) -> Bool {
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
diff --git a/Sources/SwiftProtobuf/descriptor.pb.swift b/Sources/SwiftProtobuf/descriptor.pb.swift
index 5fad618a0..2954a17b6 100644
--- a/Sources/SwiftProtobuf/descriptor.pb.swift
+++ b/Sources/SwiftProtobuf/descriptor.pb.swift
@@ -2244,6 +2244,15 @@ public struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   /// Clears the value of `jsonFormat`. Subsequent reads from it will return its default value.
   public mutating func clearJsonFormat() {self._jsonFormat = nil}
 
+  public var enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle {
+    get {return _enforceNamingStyle ?? .unknown}
+    set {_enforceNamingStyle = newValue}
+  }
+  /// Returns true if `enforceNamingStyle` has been explicitly set.
+  public var hasEnforceNamingStyle: Bool {return self._enforceNamingStyle != nil}
+  /// Clears the value of `enforceNamingStyle`. Subsequent reads from it will return its default value.
+  public mutating func clearEnforceNamingStyle() {self._enforceNamingStyle = nil}
+
   public var unknownFields = UnknownStorage()
 
   public enum FieldPresence: Int, Enum, Swift.CaseIterable {
@@ -2313,6 +2322,17 @@ public struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
 
   }
 
+  public enum EnforceNamingStyle: Int, Enum, Swift.CaseIterable {
+    case unknown = 0
+    case style2024 = 1
+    case styleLegacy = 2
+
+    public init() {
+      self = .unknown
+    }
+
+  }
+
   public init() {}
 
   public var _protobuf_extensionFieldValues = ExtensionFieldValueSet()
@@ -2322,6 +2342,7 @@ public struct Google_Protobuf_FeatureSet: ExtensibleMessage, Sendable {
   fileprivate var _utf8Validation: Google_Protobuf_FeatureSet.Utf8Validation? = nil
   fileprivate var _messageEncoding: Google_Protobuf_FeatureSet.MessageEncoding? = nil
   fileprivate var _jsonFormat: Google_Protobuf_FeatureSet.JsonFormat? = nil
+  fileprivate var _enforceNamingStyle: Google_Protobuf_FeatureSet.EnforceNamingStyle? = nil
 }
 
 /// A compiled specification for the defaults of a set of features.  These
@@ -4843,6 +4864,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     4: .standard(proto: "utf8_validation"),
     5: .standard(proto: "message_encoding"),
     6: .standard(proto: "json_format"),
+    7: .standard(proto: "enforce_naming_style"),
   ]
 
   public var isInitialized: Bool {
@@ -4862,6 +4884,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
       case 4: try { try decoder.decodeSingularEnumField(value: &self._utf8Validation) }()
       case 5: try { try decoder.decodeSingularEnumField(value: &self._messageEncoding) }()
       case 6: try { try decoder.decodeSingularEnumField(value: &self._jsonFormat) }()
+      case 7: try { try decoder.decodeSingularEnumField(value: &self._enforceNamingStyle) }()
       case 1000..<10001:
         try { try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Google_Protobuf_FeatureSet.self, fieldNumber: fieldNumber) }()
       default: break
@@ -4892,6 +4915,9 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     try { if let v = self._jsonFormat {
       try visitor.visitSingularEnumField(value: v, fieldNumber: 6)
     } }()
+    try { if let v = self._enforceNamingStyle {
+      try visitor.visitSingularEnumField(value: v, fieldNumber: 7)
+    } }()
     try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 1000, end: 10001)
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -4903,6 +4929,7 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
     if lhs._utf8Validation != rhs._utf8Validation {return false}
     if lhs._messageEncoding != rhs._messageEncoding {return false}
     if lhs._jsonFormat != rhs._jsonFormat {return false}
+    if lhs._enforceNamingStyle != rhs._enforceNamingStyle {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     if lhs._protobuf_extensionFieldValues != rhs._protobuf_extensionFieldValues {return false}
     return true
@@ -4958,6 +4985,14 @@ extension Google_Protobuf_FeatureSet.JsonFormat: _ProtoNameProviding {
   ]
 }
 
+extension Google_Protobuf_FeatureSet.EnforceNamingStyle: _ProtoNameProviding {
+  public static let _protobuf_nameMap: _NameMap = [
+    0: .same(proto: "ENFORCE_NAMING_STYLE_UNKNOWN"),
+    1: .same(proto: "STYLE2024"),
+    2: .same(proto: "STYLE_LEGACY"),
+  ]
+}
+
 extension Google_Protobuf_FeatureSetDefaults: Message, _MessageImplementationBase, _ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".FeatureSetDefaults"
   public static let _protobuf_nameMap: _NameMap = [
diff --git a/Sources/SwiftProtobufPluginLibrary/PluginLibEditionDefaults.swift b/Sources/SwiftProtobufPluginLibrary/PluginLibEditionDefaults.swift
index 2b60e3479..093a0558d 100644
--- a/Sources/SwiftProtobufPluginLibrary/PluginLibEditionDefaults.swift
+++ b/Sources/SwiftProtobufPluginLibrary/PluginLibEditionDefaults.swift
@@ -2,10 +2,11 @@
 // swift-format-ignore-file
 import Foundation
 let bundledFeatureSetDefaultBytes: [UInt8] = [
-  0x0a, 0x13, 0x18, 0x84, 0x07, 0x22, 0x00, 0x2a, 0x0c, 0x08, 0x01, 0x10,
-  0x02, 0x18, 0x02, 0x20, 0x03, 0x28, 0x01, 0x30, 0x02, 0x0a, 0x13, 0x18,
-  0xe7, 0x07, 0x22, 0x00, 0x2a, 0x0c, 0x08, 0x02, 0x10, 0x01, 0x18, 0x01,
-  0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x0a, 0x13, 0x18, 0xe8, 0x07, 0x22,
-  0x0c, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30,
-  0x01, 0x2a, 0x00, 0x20, 0xe6, 0x07, 0x28, 0xe8, 0x07
+  0x0a, 0x15, 0x18, 0x84, 0x07, 0x22, 0x00, 0x2a, 0x0e, 0x08, 0x01, 0x10,
+  0x02, 0x18, 0x02, 0x20, 0x03, 0x28, 0x01, 0x30, 0x02, 0x38, 0x02, 0x0a,
+  0x15, 0x18, 0xe7, 0x07, 0x22, 0x00, 0x2a, 0x0e, 0x08, 0x02, 0x10, 0x01,
+  0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x38, 0x02, 0x0a, 0x15,
+  0x18, 0xe8, 0x07, 0x22, 0x0c, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20,
+  0x02, 0x28, 0x01, 0x30, 0x01, 0x2a, 0x02, 0x38, 0x02, 0x20, 0xe6, 0x07,
+  0x28, 0xe8, 0x07
 ]
diff --git a/Tests/SwiftProtobufPluginLibraryTests/PluginLibTestingEditionDefaults.swift b/Tests/SwiftProtobufPluginLibraryTests/PluginLibTestingEditionDefaults.swift
index 78fae304a..9c95245d3 100644
--- a/Tests/SwiftProtobufPluginLibraryTests/PluginLibTestingEditionDefaults.swift
+++ b/Tests/SwiftProtobufPluginLibraryTests/PluginLibTestingEditionDefaults.swift
@@ -2,15 +2,15 @@
 // swift-format-ignore-file
 import Foundation
 let testFeatureSetDefaultBytes: [UInt8] = [
-  0x0a, 0x25, 0x18, 0x84, 0x07, 0x22, 0x04, 0xfa, 0xf0, 0x04, 0x00, 0x2a,
-  0x1a, 0x08, 0x01, 0x10, 0x02, 0x18, 0x02, 0x20, 0x03, 0x28, 0x01, 0x30,
-  0x02, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20,
-  0x01, 0x28, 0x01, 0x0a, 0x25, 0x18, 0xe7, 0x07, 0x22, 0x04, 0xfa, 0xf0,
-  0x04, 0x00, 0x2a, 0x1a, 0x08, 0x02, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02,
-  0x28, 0x01, 0x30, 0x01, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10, 0x01,
-  0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x0a, 0x25, 0x18, 0xe8, 0x07, 0x22,
-  0x1a, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30,
-  0x01, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20,
-  0x01, 0x28, 0x01, 0x2a, 0x04, 0xfa, 0xf0, 0x04, 0x00, 0x20, 0xe6, 0x07,
-  0x28, 0xe8, 0x07
+  0x0a, 0x27, 0x18, 0x84, 0x07, 0x22, 0x04, 0xfa, 0xf0, 0x04, 0x00, 0x2a,
+  0x1c, 0x08, 0x01, 0x10, 0x02, 0x18, 0x02, 0x20, 0x03, 0x28, 0x01, 0x30,
+  0x02, 0x38, 0x02, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10, 0x01, 0x18,
+  0x01, 0x20, 0x01, 0x28, 0x01, 0x0a, 0x27, 0x18, 0xe7, 0x07, 0x22, 0x04,
+  0xfa, 0xf0, 0x04, 0x00, 0x2a, 0x1c, 0x08, 0x02, 0x10, 0x01, 0x18, 0x01,
+  0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x38, 0x02, 0xfa, 0xf0, 0x04, 0x0a,
+  0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x0a, 0x27,
+  0x18, 0xe8, 0x07, 0x22, 0x1a, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20,
+  0x02, 0x28, 0x01, 0x30, 0x01, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10,
+  0x01, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x2a, 0x06, 0x38, 0x02, 0xfa,
+  0xf0, 0x04, 0x00, 0x20, 0xe6, 0x07, 0x28, 0xe8, 0x07
 ]
diff --git a/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift b/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
index 80e0fee97..d9aea26cf 100644
--- a/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
+++ b/Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
@@ -123,926 +123,933 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case clearEditionIntroduced // = 94
   case clearEditionRemoved // = 95
   case clearEnd // = 96
-  case clearEnumType // = 97
-  case clearExtendee // = 98
-  case clearExtensionValue // = 99
-  case clearFeatures // = 100
-  case clearFeatureSupport // = 101
-  case clearFieldPresence // = 102
-  case clearFixedFeatures // = 103
-  case clearFullName // = 104
-  case clearGoPackage // = 105
-  case clearIdempotencyLevel // = 106
-  case clearIdentifierValue // = 107
-  case clearInputType // = 108
-  case clearIsExtension // = 109
-  case clearJavaGenerateEqualsAndHash // = 110
-  case clearJavaGenericServices // = 111
-  case clearJavaMultipleFiles // = 112
-  case clearJavaOuterClassname // = 113
-  case clearJavaPackage // = 114
-  case clearJavaStringCheckUtf8 // = 115
-  case clearJsonFormat // = 116
-  case clearJsonName // = 117
-  case clearJstype // = 118
-  case clearLabel // = 119
-  case clearLazy // = 120
-  case clearLeadingComments // = 121
-  case clearMapEntry // = 122
-  case clearMaximumEdition // = 123
-  case clearMessageEncoding // = 124
-  case clearMessageSetWireFormat // = 125
-  case clearMinimumEdition // = 126
-  case clearName // = 127
-  case clearNamePart // = 128
-  case clearNegativeIntValue // = 129
-  case clearNoStandardDescriptorAccessor // = 130
-  case clearNumber // = 131
-  case clearObjcClassPrefix // = 132
-  case clearOneofIndex // = 133
-  case clearOptimizeFor // = 134
-  case clearOptions // = 135
-  case clearOutputType // = 136
-  case clearOverridableFeatures // = 137
-  case clearPackage // = 138
-  case clearPacked // = 139
-  case clearPhpClassPrefix // = 140
-  case clearPhpMetadataNamespace // = 141
-  case clearPhpNamespace // = 142
-  case clearPositiveIntValue // = 143
-  case clearProto3Optional // = 144
-  case clearPyGenericServices // = 145
-  case clearRepeated // = 146
-  case clearRepeatedFieldEncoding // = 147
-  case clearReserved // = 148
-  case clearRetention // = 149
-  case clearRubyPackage // = 150
-  case clearSemantic // = 151
-  case clearServerStreaming // = 152
-  case clearSourceCodeInfo // = 153
-  case clearSourceContext // = 154
-  case clearSourceFile // = 155
-  case clearStart // = 156
-  case clearStringValue // = 157
-  case clearSwiftPrefix // = 158
-  case clearSyntax // = 159
-  case clearTrailingComments // = 160
-  case clearType // = 161
-  case clearTypeName // = 162
-  case clearUnverifiedLazy // = 163
-  case clearUtf8Validation // = 164
-  case clearValue // = 165
-  case clearVerification // = 166
-  case clearWeak // = 167
-  case clientStreaming // = 168
-  case code // = 169
-  case codePoint // = 170
-  case codeUnits // = 171
-  case collection // = 172
-  case com // = 173
-  case comma // = 174
-  case consumedBytes // = 175
-  case contains // = 176
-  case contentsOf // = 177
-  case contiguousBytes // = 178
-  case copy // = 179
-  case count // = 180
-  case countVarintsInBuffer // = 181
-  case csharpNamespace // = 182
-  case ctype // = 183
-  case customCodable // = 184
-  case customDebugStringConvertible // = 185
-  case customStringConvertible // = 186
-  case d // = 187
-  case data // = 188
-  case dataResult // = 189
-  case date // = 190
-  case daySec // = 191
-  case daysSinceEpoch // = 192
-  case debugDescription_ // = 193
-  case debugRedact // = 194
-  case declaration // = 195
-  case decoded // = 196
-  case decodedFromJsonnull // = 197
-  case decodeExtensionField // = 198
-  case decodeExtensionFieldsAsMessageSet // = 199
-  case decodeJson // = 200
-  case decodeMapField // = 201
-  case decodeMessage // = 202
-  case decoder // = 203
-  case decodeRepeated // = 204
-  case decodeRepeatedBoolField // = 205
-  case decodeRepeatedBytesField // = 206
-  case decodeRepeatedDoubleField // = 207
-  case decodeRepeatedEnumField // = 208
-  case decodeRepeatedFixed32Field // = 209
-  case decodeRepeatedFixed64Field // = 210
-  case decodeRepeatedFloatField // = 211
-  case decodeRepeatedGroupField // = 212
-  case decodeRepeatedInt32Field // = 213
-  case decodeRepeatedInt64Field // = 214
-  case decodeRepeatedMessageField // = 215
-  case decodeRepeatedSfixed32Field // = 216
-  case decodeRepeatedSfixed64Field // = 217
-  case decodeRepeatedSint32Field // = 218
-  case decodeRepeatedSint64Field // = 219
-  case decodeRepeatedStringField // = 220
-  case decodeRepeatedUint32Field // = 221
-  case decodeRepeatedUint64Field // = 222
-  case decodeSingular // = 223
-  case decodeSingularBoolField // = 224
-  case decodeSingularBytesField // = 225
-  case decodeSingularDoubleField // = 226
-  case decodeSingularEnumField // = 227
-  case decodeSingularFixed32Field // = 228
-  case decodeSingularFixed64Field // = 229
-  case decodeSingularFloatField // = 230
-  case decodeSingularGroupField // = 231
-  case decodeSingularInt32Field // = 232
-  case decodeSingularInt64Field // = 233
-  case decodeSingularMessageField // = 234
-  case decodeSingularSfixed32Field // = 235
-  case decodeSingularSfixed64Field // = 236
-  case decodeSingularSint32Field // = 237
-  case decodeSingularSint64Field // = 238
-  case decodeSingularStringField // = 239
-  case decodeSingularUint32Field // = 240
-  case decodeSingularUint64Field // = 241
-  case decodeTextFormat // = 242
-  case defaultAnyTypeUrlprefix // = 243
-  case defaults // = 244
-  case defaultValue // = 245
-  case dependency // = 246
-  case deprecated // = 247
-  case deprecatedLegacyJsonFieldConflicts // = 248
-  case deprecationWarning // = 249
-  case description_ // = 250
-  case descriptorProto // = 251
-  case dictionary // = 252
-  case dictionaryLiteral // = 253
-  case digit // = 254
-  case digit0 // = 255
-  case digit1 // = 256
-  case digitCount // = 257
-  case digits // = 258
-  case digitValue // = 259
-  case discardableResult // = 260
-  case discardUnknownFields // = 261
-  case double // = 262
-  case doubleValue // = 263
-  case duration // = 264
-  case e // = 265
-  case edition // = 266
-  case editionDefault // = 267
-  case editionDefaults // = 268
-  case editionDeprecated // = 269
-  case editionIntroduced // = 270
-  case editionRemoved // = 271
-  case element // = 272
-  case elements // = 273
-  case `else` // = 274
-  case emitExtensionFieldName // = 275
-  case emitFieldName // = 276
-  case emitFieldNumber // = 277
-  case empty // = 278
-  case emptyData // = 279
-  case encodeAsBytes // = 280
-  case encoded // = 281
-  case encodedJsonstring // = 282
-  case encodedSize // = 283
-  case encodeField // = 284
-  case encoder // = 285
-  case end // = 286
-  case endArray // = 287
-  case endMessageField // = 288
-  case endObject // = 289
-  case endRegularField // = 290
-  case `enum` // = 291
-  case enumDescriptorProto // = 292
-  case enumOptions // = 293
-  case enumReservedRange // = 294
-  case enumType // = 295
-  case enumvalue // = 296
-  case enumValueDescriptorProto // = 297
-  case enumValueOptions // = 298
-  case equatable // = 299
-  case error // = 300
-  case expressibleByArrayLiteral // = 301
-  case expressibleByDictionaryLiteral // = 302
-  case ext // = 303
-  case extDecoder // = 304
-  case extendedGraphemeClusterLiteral // = 305
-  case extendedGraphemeClusterLiteralType // = 306
-  case extendee // = 307
-  case extensibleMessage // = 308
-  case `extension` // = 309
-  case extensionField // = 310
-  case extensionFieldNumber // = 311
-  case extensionFieldValueSet // = 312
-  case extensionMap // = 313
-  case extensionRange // = 314
-  case extensionRangeOptions // = 315
-  case extensions // = 316
-  case extras // = 317
-  case f // = 318
-  case `false` // = 319
-  case features // = 320
-  case featureSet // = 321
-  case featureSetDefaults // = 322
-  case featureSetEditionDefault // = 323
-  case featureSupport // = 324
-  case field // = 325
-  case fieldData // = 326
-  case fieldDescriptorProto // = 327
-  case fieldMask // = 328
-  case fieldMaskError // = 329
-  case fieldName // = 330
-  case fieldNameCount // = 331
-  case fieldNum // = 332
-  case fieldNumber // = 333
-  case fieldNumberForProto // = 334
-  case fieldOptions // = 335
-  case fieldPresence // = 336
-  case fields // = 337
-  case fieldSize // = 338
-  case fieldTag // = 339
-  case fieldType // = 340
-  case file // = 341
-  case fileDescriptorProto // = 342
-  case fileDescriptorSet // = 343
-  case fileName // = 344
-  case fileOptions // = 345
-  case filter // = 346
-  case final // = 347
-  case finiteOnly // = 348
-  case first // = 349
-  case firstItem // = 350
-  case fixedFeatures // = 351
-  case float // = 352
-  case floatLiteral // = 353
-  case floatLiteralType // = 354
-  case floatValue // = 355
-  case `for` // = 356
-  case forMessageName // = 357
-  case formUnion // = 358
-  case forReadingFrom // = 359
-  case forTypeURL // = 360
-  case forwardParser // = 361
-  case forWritingInto // = 362
-  case from // = 363
-  case fromAscii2 // = 364
-  case fromAscii4 // = 365
-  case fromByteOffset // = 366
-  case fromHexDigit // = 367
-  case fullName // = 368
-  case `func` // = 369
-  case function // = 370
-  case g // = 371
-  case generatedCodeInfo // = 372
-  case get // = 373
-  case getExtensionValue // = 374
-  case googleapis // = 375
-  case googleProtobufAny // = 376
-  case googleProtobufApi // = 377
-  case googleProtobufBoolValue // = 378
-  case googleProtobufBytesValue // = 379
-  case googleProtobufDescriptorProto // = 380
-  case googleProtobufDoubleValue // = 381
-  case googleProtobufDuration // = 382
-  case googleProtobufEdition // = 383
-  case googleProtobufEmpty // = 384
-  case googleProtobufEnum // = 385
-  case googleProtobufEnumDescriptorProto // = 386
-  case googleProtobufEnumOptions // = 387
-  case googleProtobufEnumValue // = 388
-  case googleProtobufEnumValueDescriptorProto // = 389
-  case googleProtobufEnumValueOptions // = 390
-  case googleProtobufExtensionRangeOptions // = 391
-  case googleProtobufFeatureSet // = 392
-  case googleProtobufFeatureSetDefaults // = 393
-  case googleProtobufField // = 394
-  case googleProtobufFieldDescriptorProto // = 395
-  case googleProtobufFieldMask // = 396
-  case googleProtobufFieldOptions // = 397
-  case googleProtobufFileDescriptorProto // = 398
-  case googleProtobufFileDescriptorSet // = 399
-  case googleProtobufFileOptions // = 400
-  case googleProtobufFloatValue // = 401
-  case googleProtobufGeneratedCodeInfo // = 402
-  case googleProtobufInt32Value // = 403
-  case googleProtobufInt64Value // = 404
-  case googleProtobufListValue // = 405
-  case googleProtobufMessageOptions // = 406
-  case googleProtobufMethod // = 407
-  case googleProtobufMethodDescriptorProto // = 408
-  case googleProtobufMethodOptions // = 409
-  case googleProtobufMixin // = 410
-  case googleProtobufNullValue // = 411
-  case googleProtobufOneofDescriptorProto // = 412
-  case googleProtobufOneofOptions // = 413
-  case googleProtobufOption // = 414
-  case googleProtobufServiceDescriptorProto // = 415
-  case googleProtobufServiceOptions // = 416
-  case googleProtobufSourceCodeInfo // = 417
-  case googleProtobufSourceContext // = 418
-  case googleProtobufStringValue // = 419
-  case googleProtobufStruct // = 420
-  case googleProtobufSyntax // = 421
-  case googleProtobufTimestamp // = 422
-  case googleProtobufType // = 423
-  case googleProtobufUint32Value // = 424
-  case googleProtobufUint64Value // = 425
-  case googleProtobufUninterpretedOption // = 426
-  case googleProtobufValue // = 427
-  case goPackage // = 428
-  case group // = 429
-  case groupFieldNumberStack // = 430
-  case groupSize // = 431
-  case `guard` // = 432
-  case hadOneofValue // = 433
-  case handleConflictingOneOf // = 434
-  case hasAggregateValue // = 435
-  case hasAllowAlias // = 436
-  case hasBegin // = 437
-  case hasCcEnableArenas // = 438
-  case hasCcGenericServices // = 439
-  case hasClientStreaming // = 440
-  case hasCsharpNamespace // = 441
-  case hasCtype // = 442
-  case hasDebugRedact // = 443
-  case hasDefaultValue // = 444
-  case hasDeprecated // = 445
-  case hasDeprecatedLegacyJsonFieldConflicts // = 446
-  case hasDeprecationWarning // = 447
-  case hasDoubleValue // = 448
-  case hasEdition // = 449
-  case hasEditionDeprecated // = 450
-  case hasEditionIntroduced // = 451
-  case hasEditionRemoved // = 452
-  case hasEnd // = 453
-  case hasEnumType // = 454
-  case hasExtendee // = 455
-  case hasExtensionValue // = 456
-  case hasFeatures // = 457
-  case hasFeatureSupport // = 458
-  case hasFieldPresence // = 459
-  case hasFixedFeatures // = 460
-  case hasFullName // = 461
-  case hasGoPackage // = 462
-  case hash // = 463
-  case hashable // = 464
-  case hasher // = 465
-  case hashVisitor // = 466
-  case hasIdempotencyLevel // = 467
-  case hasIdentifierValue // = 468
-  case hasInputType // = 469
-  case hasIsExtension // = 470
-  case hasJavaGenerateEqualsAndHash // = 471
-  case hasJavaGenericServices // = 472
-  case hasJavaMultipleFiles // = 473
-  case hasJavaOuterClassname // = 474
-  case hasJavaPackage // = 475
-  case hasJavaStringCheckUtf8 // = 476
-  case hasJsonFormat // = 477
-  case hasJsonName // = 478
-  case hasJstype // = 479
-  case hasLabel // = 480
-  case hasLazy // = 481
-  case hasLeadingComments // = 482
-  case hasMapEntry // = 483
-  case hasMaximumEdition // = 484
-  case hasMessageEncoding // = 485
-  case hasMessageSetWireFormat // = 486
-  case hasMinimumEdition // = 487
-  case hasName // = 488
-  case hasNamePart // = 489
-  case hasNegativeIntValue // = 490
-  case hasNoStandardDescriptorAccessor // = 491
-  case hasNumber // = 492
-  case hasObjcClassPrefix // = 493
-  case hasOneofIndex // = 494
-  case hasOptimizeFor // = 495
-  case hasOptions // = 496
-  case hasOutputType // = 497
-  case hasOverridableFeatures // = 498
-  case hasPackage // = 499
-  case hasPacked // = 500
-  case hasPhpClassPrefix // = 501
-  case hasPhpMetadataNamespace // = 502
-  case hasPhpNamespace // = 503
-  case hasPositiveIntValue // = 504
-  case hasProto3Optional // = 505
-  case hasPyGenericServices // = 506
-  case hasRepeated // = 507
-  case hasRepeatedFieldEncoding // = 508
-  case hasReserved // = 509
-  case hasRetention // = 510
-  case hasRubyPackage // = 511
-  case hasSemantic // = 512
-  case hasServerStreaming // = 513
-  case hasSourceCodeInfo // = 514
-  case hasSourceContext // = 515
-  case hasSourceFile // = 516
-  case hasStart // = 517
-  case hasStringValue // = 518
-  case hasSwiftPrefix // = 519
-  case hasSyntax // = 520
-  case hasTrailingComments // = 521
-  case hasType // = 522
-  case hasTypeName // = 523
-  case hasUnverifiedLazy // = 524
-  case hasUtf8Validation // = 525
-  case hasValue // = 526
-  case hasVerification // = 527
-  case hasWeak // = 528
-  case hour // = 529
-  case i // = 530
-  case idempotencyLevel // = 531
-  case identifierValue // = 532
-  case `if` // = 533
-  case ignoreUnknownExtensionFields // = 534
-  case ignoreUnknownFields // = 535
-  case index // = 536
-  case init_ // = 537
-  case `inout` // = 538
-  case inputType // = 539
-  case insert // = 540
-  case int // = 541
-  case int32 // = 542
-  case int32Value // = 543
-  case int64 // = 544
-  case int64Value // = 545
-  case int8 // = 546
-  case integerLiteral // = 547
-  case integerLiteralType // = 548
-  case intern // = 549
-  case `internal` // = 550
-  case internalState // = 551
-  case intersect // = 552
-  case into // = 553
-  case ints // = 554
-  case isA // = 555
-  case isEqual // = 556
-  case isEqualTo // = 557
-  case isExtension // = 558
-  case isInitialized // = 559
-  case isNegative // = 560
-  case isPathValid // = 561
-  case isValid // = 562
-  case itemTagsEncodedSize // = 563
-  case iterator // = 564
-  case javaGenerateEqualsAndHash // = 565
-  case javaGenericServices // = 566
-  case javaMultipleFiles // = 567
-  case javaOuterClassname // = 568
-  case javaPackage // = 569
-  case javaStringCheckUtf8 // = 570
-  case jsondecoder // = 571
-  case jsondecodingError // = 572
-  case jsondecodingOptions // = 573
-  case jsonEncoder // = 574
-  case jsonencodingError // = 575
-  case jsonencodingOptions // = 576
-  case jsonencodingVisitor // = 577
-  case jsonFormat // = 578
-  case jsonmapEncodingVisitor // = 579
-  case jsonName // = 580
-  case jsonPath // = 581
-  case jsonPaths // = 582
-  case jsonscanner // = 583
-  case jsonString // = 584
-  case jsonText // = 585
-  case jsonUtf8Bytes // = 586
-  case jsonUtf8Data // = 587
-  case jstype // = 588
-  case k // = 589
-  case kChunkSize // = 590
-  case key // = 591
-  case keyField // = 592
-  case keyFieldOpt // = 593
-  case keyType // = 594
-  case kind // = 595
-  case l // = 596
-  case label // = 597
-  case lazy // = 598
-  case leadingComments // = 599
-  case leadingDetachedComments // = 600
-  case length // = 601
-  case lessThan // = 602
-  case `let` // = 603
-  case lhs // = 604
-  case line // = 605
-  case list // = 606
-  case listOfMessages // = 607
-  case listValue // = 608
-  case littleEndian // = 609
-  case load // = 610
-  case localHasher // = 611
-  case location // = 612
-  case m // = 613
-  case major // = 614
-  case makeAsyncIterator // = 615
-  case makeIterator // = 616
-  case malformedLength // = 617
-  case mapEntry // = 618
-  case mapKeyType // = 619
-  case mapToMessages // = 620
-  case mapValueType // = 621
-  case mapVisitor // = 622
-  case mask // = 623
-  case maximumEdition // = 624
-  case mdayStart // = 625
-  case merge // = 626
-  case mergeOptions // = 627
-  case message // = 628
-  case messageDepthLimit // = 629
-  case messageEncoding // = 630
-  case messageExtension // = 631
-  case messageImplementationBase // = 632
-  case messageOptions // = 633
-  case messageSet // = 634
-  case messageSetWireFormat // = 635
-  case messageSize // = 636
-  case messageType // = 637
-  case method // = 638
-  case methodDescriptorProto // = 639
-  case methodOptions // = 640
-  case methods // = 641
-  case min // = 642
-  case minimumEdition // = 643
-  case minor // = 644
-  case mixin // = 645
-  case mixins // = 646
-  case modify // = 647
-  case month // = 648
-  case msgExtension // = 649
-  case mutating // = 650
-  case n // = 651
-  case name // = 652
-  case nameDescription // = 653
-  case nameMap // = 654
-  case namePart // = 655
-  case names // = 656
-  case nanos // = 657
-  case negativeIntValue // = 658
-  case nestedType // = 659
-  case newExtensible // = 660
-  case newL // = 661
-  case newList // = 662
-  case newMessage // = 663
-  case newValue // = 664
-  case next // = 665
-  case nextByte // = 666
-  case nextFieldNumber // = 667
-  case nextVarInt // = 668
-  case `nil` // = 669
-  case nilLiteral // = 670
-  case noBytesAvailable // = 671
-  case noStandardDescriptorAccessor // = 672
-  case nullValue // = 673
-  case number // = 674
-  case numberValue // = 675
-  case objcClassPrefix // = 676
-  case of // = 677
-  case oneofDecl // = 678
-  case oneofDescriptorProto // = 679
-  case oneofIndex // = 680
-  case oneofOptions // = 681
-  case oneofs // = 682
-  case oneOfKind // = 683
-  case optimizeFor // = 684
-  case optimizeMode // = 685
-  case option // = 686
-  case optionalEnumExtensionField // = 687
-  case optionalExtensionField // = 688
-  case optionalGroupExtensionField // = 689
-  case optionalMessageExtensionField // = 690
-  case optionRetention // = 691
-  case options // = 692
-  case optionTargetType // = 693
-  case other // = 694
-  case others // = 695
-  case out // = 696
-  case outputType // = 697
-  case overridableFeatures // = 698
-  case p // = 699
-  case package // = 700
-  case packed // = 701
-  case packedEnumExtensionField // = 702
-  case packedExtensionField // = 703
-  case padding // = 704
-  case parent // = 705
-  case parse // = 706
-  case partial // = 707
-  case path // = 708
-  case pathDecoder // = 709
-  case pathDecodingError // = 710
-  case paths // = 711
-  case pathVisitor // = 712
-  case payload // = 713
-  case payloadSize // = 714
-  case phpClassPrefix // = 715
-  case phpMetadataNamespace // = 716
-  case phpNamespace // = 717
-  case pos // = 718
-  case positiveIntValue // = 719
-  case prefix // = 720
-  case preserveProtoFieldNames // = 721
-  case preTraverse // = 722
-  case prevPath // = 723
-  case printUnknownFields // = 724
-  case proto2 // = 725
-  case proto3DefaultValue // = 726
-  case proto3Optional // = 727
-  case protobufApiversionCheck // = 728
-  case protobufApiversion2 // = 729
-  case protobufBool // = 730
-  case protobufBytes // = 731
-  case protobufDouble // = 732
-  case protobufEnumMap // = 733
-  case protobufExtension // = 734
-  case protobufFixed32 // = 735
-  case protobufFixed64 // = 736
-  case protobufFloat // = 737
-  case protobufInt32 // = 738
-  case protobufInt64 // = 739
-  case protobufMap // = 740
-  case protobufMessageMap // = 741
-  case protobufSfixed32 // = 742
-  case protobufSfixed64 // = 743
-  case protobufSint32 // = 744
-  case protobufSint64 // = 745
-  case protobufString // = 746
-  case protobufUint32 // = 747
-  case protobufUint64 // = 748
-  case protobufExtensionFieldValues // = 749
-  case protobufFieldNumber // = 750
-  case protobufGeneratedIsEqualTo // = 751
-  case protobufNameMap // = 752
-  case protobufNewField // = 753
-  case protobufPackage // = 754
-  case `protocol` // = 755
-  case protoFieldName // = 756
-  case protoMessageName // = 757
-  case protoNameProviding // = 758
-  case protoPaths // = 759
-  case `public` // = 760
-  case publicDependency // = 761
-  case putBoolValue // = 762
-  case putBytesValue // = 763
-  case putDoubleValue // = 764
-  case putEnumValue // = 765
-  case putFixedUint32 // = 766
-  case putFixedUint64 // = 767
-  case putFloatValue // = 768
-  case putInt64 // = 769
-  case putStringValue // = 770
-  case putUint64 // = 771
-  case putUint64Hex // = 772
-  case putVarInt // = 773
-  case putZigZagVarInt // = 774
-  case pyGenericServices // = 775
-  case r // = 776
-  case rawChars // = 777
-  case rawRepresentable // = 778
-  case rawValue_ // = 779
-  case read4HexDigits // = 780
-  case readBytes // = 781
-  case register // = 782
-  case removingAllFieldsOf // = 783
-  case repeated // = 784
-  case repeatedEnumExtensionField // = 785
-  case repeatedExtensionField // = 786
-  case repeatedFieldEncoding // = 787
-  case repeatedGroupExtensionField // = 788
-  case repeatedMessageExtensionField // = 789
-  case repeating // = 790
-  case replaceRepeatedFields // = 791
-  case requestStreaming // = 792
-  case requestTypeURL // = 793
-  case requiredSize // = 794
-  case responseStreaming // = 795
-  case responseTypeURL // = 796
-  case result // = 797
-  case retention // = 798
-  case `rethrows` // = 799
-  case `return` // = 800
-  case returnType // = 801
-  case revision // = 802
-  case rhs // = 803
-  case root // = 804
-  case rubyPackage // = 805
-  case s // = 806
-  case sawBackslash // = 807
-  case sawSection4Characters // = 808
-  case sawSection5Characters // = 809
-  case scan // = 810
-  case scanner // = 811
-  case seconds // = 812
-  case self_ // = 813
-  case semantic // = 814
-  case sendable // = 815
-  case separator // = 816
-  case serialize // = 817
-  case serializedBytes // = 818
-  case serializedData // = 819
-  case serializedSize // = 820
-  case serverStreaming // = 821
-  case service // = 822
-  case serviceDescriptorProto // = 823
-  case serviceOptions // = 824
-  case set // = 825
-  case setExtensionValue // = 826
-  case shift // = 827
-  case simpleExtensionMap // = 828
-  case size // = 829
-  case sizer // = 830
-  case source // = 831
-  case sourceCodeInfo // = 832
-  case sourceContext // = 833
-  case sourceEncoding // = 834
-  case sourceFile // = 835
-  case sourceLocation // = 836
-  case span // = 837
-  case split // = 838
-  case start // = 839
-  case startArray // = 840
-  case startArrayObject // = 841
-  case startField // = 842
-  case startIndex // = 843
-  case startMessageField // = 844
-  case startObject // = 845
-  case startRegularField // = 846
-  case state // = 847
-  case `static` // = 848
-  case staticString // = 849
-  case storage // = 850
-  case string // = 851
-  case stringLiteral // = 852
-  case stringLiteralType // = 853
-  case stringResult // = 854
-  case stringValue // = 855
-  case `struct` // = 856
-  case structValue // = 857
-  case subDecoder // = 858
-  case `subscript` // = 859
-  case subtract // = 860
-  case subVisitor // = 861
-  case swift // = 862
-  case swiftPrefix // = 863
-  case swiftProtobufContiguousBytes // = 864
-  case swiftProtobufError // = 865
-  case syntax // = 866
-  case t // = 867
-  case tag // = 868
-  case targets // = 869
-  case terminator // = 870
-  case testDecoder // = 871
-  case text // = 872
-  case textDecoder // = 873
-  case textFormatDecoder // = 874
-  case textFormatDecodingError // = 875
-  case textFormatDecodingOptions // = 876
-  case textFormatEncodingOptions // = 877
-  case textFormatEncodingVisitor // = 878
-  case textFormatString // = 879
-  case throwOrIgnore // = 880
-  case `throws` // = 881
-  case timeInterval // = 882
-  case timeIntervalSince1970 // = 883
-  case timeIntervalSinceReferenceDate // = 884
-  case timestamp // = 885
-  case tmp // = 886
-  case tooLarge // = 887
-  case total // = 888
-  case totalArrayDepth // = 889
-  case totalSize // = 890
-  case trailingComments // = 891
-  case traverse // = 892
-  case trim // = 893
-  case `true` // = 894
-  case `try` // = 895
-  case type // = 896
-  case `typealias` // = 897
-  case typeEnum // = 898
-  case typeName // = 899
-  case typePrefix // = 900
-  case typeStart // = 901
-  case typeUnknown // = 902
-  case typeURL // = 903
-  case uint32 // = 904
-  case uint32Value // = 905
-  case uint64 // = 906
-  case uint64Value // = 907
-  case uint8 // = 908
-  case unchecked // = 909
-  case unicodeScalarLiteral // = 910
-  case unicodeScalarLiteralType // = 911
-  case unicodeScalars // = 912
-  case unicodeScalarView // = 913
-  case uninterpretedOption // = 914
-  case union // = 915
-  case uniqueStorage // = 916
-  case unknown // = 917
-  case unknownFields // = 918
-  case unknownStorage // = 919
-  case unpackTo // = 920
-  case unsafeBufferPointer // = 921
-  case unsafeMutablePointer // = 922
-  case unsafeMutableRawBufferPointer // = 923
-  case unsafeRawBufferPointer // = 924
-  case unsafeRawPointer // = 925
-  case unverifiedLazy // = 926
-  case updatedOptions // = 927
-  case url // = 928
-  case useDeterministicOrdering // = 929
-  case utf8 // = 930
-  case utf8Ptr // = 931
-  case utf8ToDouble // = 932
-  case utf8Validation // = 933
-  case utf8View // = 934
-  case v // = 935
-  case value // = 936
-  case valueField // = 937
-  case values // = 938
-  case valueType // = 939
-  case `var` // = 940
-  case verification // = 941
-  case verificationState // = 942
-  case version // = 943
-  case versionString // = 944
-  case visitExtensionFields // = 945
-  case visitExtensionFieldsAsMessageSet // = 946
-  case visitMapField // = 947
-  case visitor // = 948
-  case visitPacked // = 949
-  case visitPackedBoolField // = 950
-  case visitPackedDoubleField // = 951
-  case visitPackedEnumField // = 952
-  case visitPackedFixed32Field // = 953
-  case visitPackedFixed64Field // = 954
-  case visitPackedFloatField // = 955
-  case visitPackedInt32Field // = 956
-  case visitPackedInt64Field // = 957
-  case visitPackedSfixed32Field // = 958
-  case visitPackedSfixed64Field // = 959
-  case visitPackedSint32Field // = 960
-  case visitPackedSint64Field // = 961
-  case visitPackedUint32Field // = 962
-  case visitPackedUint64Field // = 963
-  case visitRepeated // = 964
-  case visitRepeatedBoolField // = 965
-  case visitRepeatedBytesField // = 966
-  case visitRepeatedDoubleField // = 967
-  case visitRepeatedEnumField // = 968
-  case visitRepeatedFixed32Field // = 969
-  case visitRepeatedFixed64Field // = 970
-  case visitRepeatedFloatField // = 971
-  case visitRepeatedGroupField // = 972
-  case visitRepeatedInt32Field // = 973
-  case visitRepeatedInt64Field // = 974
-  case visitRepeatedMessageField // = 975
-  case visitRepeatedSfixed32Field // = 976
-  case visitRepeatedSfixed64Field // = 977
-  case visitRepeatedSint32Field // = 978
-  case visitRepeatedSint64Field // = 979
-  case visitRepeatedStringField // = 980
-  case visitRepeatedUint32Field // = 981
-  case visitRepeatedUint64Field // = 982
-  case visitSingular // = 983
-  case visitSingularBoolField // = 984
-  case visitSingularBytesField // = 985
-  case visitSingularDoubleField // = 986
-  case visitSingularEnumField // = 987
-  case visitSingularFixed32Field // = 988
-  case visitSingularFixed64Field // = 989
-  case visitSingularFloatField // = 990
-  case visitSingularGroupField // = 991
-  case visitSingularInt32Field // = 992
-  case visitSingularInt64Field // = 993
-  case visitSingularMessageField // = 994
-  case visitSingularSfixed32Field // = 995
-  case visitSingularSfixed64Field // = 996
-  case visitSingularSint32Field // = 997
-  case visitSingularSint64Field // = 998
-  case visitSingularStringField // = 999
-  case visitSingularUint32Field // = 1000
-  case visitSingularUint64Field // = 1001
-  case visitUnknown // = 1002
-  case wasDecoded // = 1003
-  case weak // = 1004
-  case weakDependency // = 1005
-  case `where` // = 1006
-  case wireFormat // = 1007
-  case with // = 1008
-  case withUnsafeBytes // = 1009
-  case withUnsafeMutableBytes // = 1010
-  case work // = 1011
-  case wrapped // = 1012
-  case wrappedType // = 1013
-  case wrappedValue // = 1014
-  case written // = 1015
-  case yday // = 1016
+  case clearEnforceNamingStyle // = 97
+  case clearEnumType // = 98
+  case clearExtendee // = 99
+  case clearExtensionValue // = 100
+  case clearFeatures // = 101
+  case clearFeatureSupport // = 102
+  case clearFieldPresence // = 103
+  case clearFixedFeatures // = 104
+  case clearFullName // = 105
+  case clearGoPackage // = 106
+  case clearIdempotencyLevel // = 107
+  case clearIdentifierValue // = 108
+  case clearInputType // = 109
+  case clearIsExtension // = 110
+  case clearJavaGenerateEqualsAndHash // = 111
+  case clearJavaGenericServices // = 112
+  case clearJavaMultipleFiles // = 113
+  case clearJavaOuterClassname // = 114
+  case clearJavaPackage // = 115
+  case clearJavaStringCheckUtf8 // = 116
+  case clearJsonFormat // = 117
+  case clearJsonName // = 118
+  case clearJstype // = 119
+  case clearLabel // = 120
+  case clearLazy // = 121
+  case clearLeadingComments // = 122
+  case clearMapEntry // = 123
+  case clearMaximumEdition // = 124
+  case clearMessageEncoding // = 125
+  case clearMessageSetWireFormat // = 126
+  case clearMinimumEdition // = 127
+  case clearName // = 128
+  case clearNamePart // = 129
+  case clearNegativeIntValue // = 130
+  case clearNoStandardDescriptorAccessor // = 131
+  case clearNumber // = 132
+  case clearObjcClassPrefix // = 133
+  case clearOneofIndex // = 134
+  case clearOptimizeFor // = 135
+  case clearOptions // = 136
+  case clearOutputType // = 137
+  case clearOverridableFeatures // = 138
+  case clearPackage // = 139
+  case clearPacked // = 140
+  case clearPhpClassPrefix // = 141
+  case clearPhpMetadataNamespace // = 142
+  case clearPhpNamespace // = 143
+  case clearPositiveIntValue // = 144
+  case clearProto3Optional // = 145
+  case clearPyGenericServices // = 146
+  case clearRepeated // = 147
+  case clearRepeatedFieldEncoding // = 148
+  case clearReserved // = 149
+  case clearRetention // = 150
+  case clearRubyPackage // = 151
+  case clearSemantic // = 152
+  case clearServerStreaming // = 153
+  case clearSourceCodeInfo // = 154
+  case clearSourceContext // = 155
+  case clearSourceFile // = 156
+  case clearStart // = 157
+  case clearStringValue // = 158
+  case clearSwiftPrefix // = 159
+  case clearSyntax // = 160
+  case clearTrailingComments // = 161
+  case clearType // = 162
+  case clearTypeName // = 163
+  case clearUnverifiedLazy // = 164
+  case clearUtf8Validation // = 165
+  case clearValue // = 166
+  case clearVerification // = 167
+  case clearWeak // = 168
+  case clientStreaming // = 169
+  case code // = 170
+  case codePoint // = 171
+  case codeUnits // = 172
+  case collection // = 173
+  case com // = 174
+  case comma // = 175
+  case consumedBytes // = 176
+  case contains // = 177
+  case contentsOf // = 178
+  case contiguousBytes // = 179
+  case copy // = 180
+  case count // = 181
+  case countVarintsInBuffer // = 182
+  case csharpNamespace // = 183
+  case ctype // = 184
+  case customCodable // = 185
+  case customDebugStringConvertible // = 186
+  case customStringConvertible // = 187
+  case d // = 188
+  case data // = 189
+  case dataResult // = 190
+  case date // = 191
+  case daySec // = 192
+  case daysSinceEpoch // = 193
+  case debugDescription_ // = 194
+  case debugRedact // = 195
+  case declaration // = 196
+  case decoded // = 197
+  case decodedFromJsonnull // = 198
+  case decodeExtensionField // = 199
+  case decodeExtensionFieldsAsMessageSet // = 200
+  case decodeJson // = 201
+  case decodeMapField // = 202
+  case decodeMessage // = 203
+  case decoder // = 204
+  case decodeRepeated // = 205
+  case decodeRepeatedBoolField // = 206
+  case decodeRepeatedBytesField // = 207
+  case decodeRepeatedDoubleField // = 208
+  case decodeRepeatedEnumField // = 209
+  case decodeRepeatedFixed32Field // = 210
+  case decodeRepeatedFixed64Field // = 211
+  case decodeRepeatedFloatField // = 212
+  case decodeRepeatedGroupField // = 213
+  case decodeRepeatedInt32Field // = 214
+  case decodeRepeatedInt64Field // = 215
+  case decodeRepeatedMessageField // = 216
+  case decodeRepeatedSfixed32Field // = 217
+  case decodeRepeatedSfixed64Field // = 218
+  case decodeRepeatedSint32Field // = 219
+  case decodeRepeatedSint64Field // = 220
+  case decodeRepeatedStringField // = 221
+  case decodeRepeatedUint32Field // = 222
+  case decodeRepeatedUint64Field // = 223
+  case decodeSingular // = 224
+  case decodeSingularBoolField // = 225
+  case decodeSingularBytesField // = 226
+  case decodeSingularDoubleField // = 227
+  case decodeSingularEnumField // = 228
+  case decodeSingularFixed32Field // = 229
+  case decodeSingularFixed64Field // = 230
+  case decodeSingularFloatField // = 231
+  case decodeSingularGroupField // = 232
+  case decodeSingularInt32Field // = 233
+  case decodeSingularInt64Field // = 234
+  case decodeSingularMessageField // = 235
+  case decodeSingularSfixed32Field // = 236
+  case decodeSingularSfixed64Field // = 237
+  case decodeSingularSint32Field // = 238
+  case decodeSingularSint64Field // = 239
+  case decodeSingularStringField // = 240
+  case decodeSingularUint32Field // = 241
+  case decodeSingularUint64Field // = 242
+  case decodeTextFormat // = 243
+  case defaultAnyTypeUrlprefix // = 244
+  case defaults // = 245
+  case defaultValue // = 246
+  case dependency // = 247
+  case deprecated // = 248
+  case deprecatedLegacyJsonFieldConflicts // = 249
+  case deprecationWarning // = 250
+  case description_ // = 251
+  case descriptorProto // = 252
+  case dictionary // = 253
+  case dictionaryLiteral // = 254
+  case digit // = 255
+  case digit0 // = 256
+  case digit1 // = 257
+  case digitCount // = 258
+  case digits // = 259
+  case digitValue // = 260
+  case discardableResult // = 261
+  case discardUnknownFields // = 262
+  case double // = 263
+  case doubleValue // = 264
+  case duration // = 265
+  case e // = 266
+  case edition // = 267
+  case editionDefault // = 268
+  case editionDefaults // = 269
+  case editionDeprecated // = 270
+  case editionIntroduced // = 271
+  case editionRemoved // = 272
+  case element // = 273
+  case elements // = 274
+  case `else` // = 275
+  case emitExtensionFieldName // = 276
+  case emitFieldName // = 277
+  case emitFieldNumber // = 278
+  case empty // = 279
+  case emptyAnyTypeURL // = 280
+  case emptyData // = 281
+  case encodeAsBytes // = 282
+  case encoded // = 283
+  case encodedJsonstring // = 284
+  case encodedSize // = 285
+  case encodeField // = 286
+  case encoder // = 287
+  case end // = 288
+  case endArray // = 289
+  case endMessageField // = 290
+  case endObject // = 291
+  case endRegularField // = 292
+  case enforceNamingStyle // = 293
+  case `enum` // = 294
+  case enumDescriptorProto // = 295
+  case enumOptions // = 296
+  case enumReservedRange // = 297
+  case enumType // = 298
+  case enumvalue // = 299
+  case enumValueDescriptorProto // = 300
+  case enumValueOptions // = 301
+  case equatable // = 302
+  case error // = 303
+  case expressibleByArrayLiteral // = 304
+  case expressibleByDictionaryLiteral // = 305
+  case ext // = 306
+  case extDecoder // = 307
+  case extendedGraphemeClusterLiteral // = 308
+  case extendedGraphemeClusterLiteralType // = 309
+  case extendee // = 310
+  case extensibleMessage // = 311
+  case `extension` // = 312
+  case extensionField // = 313
+  case extensionFieldNumber // = 314
+  case extensionFieldValueSet // = 315
+  case extensionMap // = 316
+  case extensionRange // = 317
+  case extensionRangeOptions // = 318
+  case extensions // = 319
+  case extras // = 320
+  case f // = 321
+  case `false` // = 322
+  case features // = 323
+  case featureSet // = 324
+  case featureSetDefaults // = 325
+  case featureSetEditionDefault // = 326
+  case featureSupport // = 327
+  case field // = 328
+  case fieldData // = 329
+  case fieldDescriptorProto // = 330
+  case fieldMask // = 331
+  case fieldMaskError // = 332
+  case fieldName // = 333
+  case fieldNameCount // = 334
+  case fieldNum // = 335
+  case fieldNumber // = 336
+  case fieldNumberForProto // = 337
+  case fieldOptions // = 338
+  case fieldPresence // = 339
+  case fields // = 340
+  case fieldSize // = 341
+  case fieldTag // = 342
+  case fieldType // = 343
+  case file // = 344
+  case fileDescriptorProto // = 345
+  case fileDescriptorSet // = 346
+  case fileName // = 347
+  case fileOptions // = 348
+  case filter // = 349
+  case final // = 350
+  case finiteOnly // = 351
+  case first // = 352
+  case firstItem // = 353
+  case fixedFeatures // = 354
+  case float // = 355
+  case floatLiteral // = 356
+  case floatLiteralType // = 357
+  case floatValue // = 358
+  case `for` // = 359
+  case forMessageName // = 360
+  case formUnion // = 361
+  case forReadingFrom // = 362
+  case forTypeURL // = 363
+  case forwardParser // = 364
+  case forWritingInto // = 365
+  case from // = 366
+  case fromAscii2 // = 367
+  case fromAscii4 // = 368
+  case fromByteOffset // = 369
+  case fromHexDigit // = 370
+  case fullName // = 371
+  case `func` // = 372
+  case function // = 373
+  case g // = 374
+  case generatedCodeInfo // = 375
+  case get // = 376
+  case getExtensionValue // = 377
+  case googleapis // = 378
+  case googleProtobufAny // = 379
+  case googleProtobufApi // = 380
+  case googleProtobufBoolValue // = 381
+  case googleProtobufBytesValue // = 382
+  case googleProtobufDescriptorProto // = 383
+  case googleProtobufDoubleValue // = 384
+  case googleProtobufDuration // = 385
+  case googleProtobufEdition // = 386
+  case googleProtobufEmpty // = 387
+  case googleProtobufEnum // = 388
+  case googleProtobufEnumDescriptorProto // = 389
+  case googleProtobufEnumOptions // = 390
+  case googleProtobufEnumValue // = 391
+  case googleProtobufEnumValueDescriptorProto // = 392
+  case googleProtobufEnumValueOptions // = 393
+  case googleProtobufExtensionRangeOptions // = 394
+  case googleProtobufFeatureSet // = 395
+  case googleProtobufFeatureSetDefaults // = 396
+  case googleProtobufField // = 397
+  case googleProtobufFieldDescriptorProto // = 398
+  case googleProtobufFieldMask // = 399
+  case googleProtobufFieldOptions // = 400
+  case googleProtobufFileDescriptorProto // = 401
+  case googleProtobufFileDescriptorSet // = 402
+  case googleProtobufFileOptions // = 403
+  case googleProtobufFloatValue // = 404
+  case googleProtobufGeneratedCodeInfo // = 405
+  case googleProtobufInt32Value // = 406
+  case googleProtobufInt64Value // = 407
+  case googleProtobufListValue // = 408
+  case googleProtobufMessageOptions // = 409
+  case googleProtobufMethod // = 410
+  case googleProtobufMethodDescriptorProto // = 411
+  case googleProtobufMethodOptions // = 412
+  case googleProtobufMixin // = 413
+  case googleProtobufNullValue // = 414
+  case googleProtobufOneofDescriptorProto // = 415
+  case googleProtobufOneofOptions // = 416
+  case googleProtobufOption // = 417
+  case googleProtobufServiceDescriptorProto // = 418
+  case googleProtobufServiceOptions // = 419
+  case googleProtobufSourceCodeInfo // = 420
+  case googleProtobufSourceContext // = 421
+  case googleProtobufStringValue // = 422
+  case googleProtobufStruct // = 423
+  case googleProtobufSyntax // = 424
+  case googleProtobufTimestamp // = 425
+  case googleProtobufType // = 426
+  case googleProtobufUint32Value // = 427
+  case googleProtobufUint64Value // = 428
+  case googleProtobufUninterpretedOption // = 429
+  case googleProtobufValue // = 430
+  case goPackage // = 431
+  case group // = 432
+  case groupFieldNumberStack // = 433
+  case groupSize // = 434
+  case `guard` // = 435
+  case hadOneofValue // = 436
+  case handleConflictingOneOf // = 437
+  case hasAggregateValue // = 438
+  case hasAllowAlias // = 439
+  case hasBegin // = 440
+  case hasCcEnableArenas // = 441
+  case hasCcGenericServices // = 442
+  case hasClientStreaming // = 443
+  case hasCsharpNamespace // = 444
+  case hasCtype // = 445
+  case hasDebugRedact // = 446
+  case hasDefaultValue // = 447
+  case hasDeprecated // = 448
+  case hasDeprecatedLegacyJsonFieldConflicts // = 449
+  case hasDeprecationWarning // = 450
+  case hasDoubleValue // = 451
+  case hasEdition // = 452
+  case hasEditionDeprecated // = 453
+  case hasEditionIntroduced // = 454
+  case hasEditionRemoved // = 455
+  case hasEnd // = 456
+  case hasEnforceNamingStyle // = 457
+  case hasEnumType // = 458
+  case hasExtendee // = 459
+  case hasExtensionValue // = 460
+  case hasFeatures // = 461
+  case hasFeatureSupport // = 462
+  case hasFieldPresence // = 463
+  case hasFixedFeatures // = 464
+  case hasFullName // = 465
+  case hasGoPackage // = 466
+  case hash // = 467
+  case hashable // = 468
+  case hasher // = 469
+  case hashVisitor // = 470
+  case hasIdempotencyLevel // = 471
+  case hasIdentifierValue // = 472
+  case hasInputType // = 473
+  case hasIsExtension // = 474
+  case hasJavaGenerateEqualsAndHash // = 475
+  case hasJavaGenericServices // = 476
+  case hasJavaMultipleFiles // = 477
+  case hasJavaOuterClassname // = 478
+  case hasJavaPackage // = 479
+  case hasJavaStringCheckUtf8 // = 480
+  case hasJsonFormat // = 481
+  case hasJsonName // = 482
+  case hasJstype // = 483
+  case hasLabel // = 484
+  case hasLazy // = 485
+  case hasLeadingComments // = 486
+  case hasMapEntry // = 487
+  case hasMaximumEdition // = 488
+  case hasMessageEncoding // = 489
+  case hasMessageSetWireFormat // = 490
+  case hasMinimumEdition // = 491
+  case hasName // = 492
+  case hasNamePart // = 493
+  case hasNegativeIntValue // = 494
+  case hasNoStandardDescriptorAccessor // = 495
+  case hasNumber // = 496
+  case hasObjcClassPrefix // = 497
+  case hasOneofIndex // = 498
+  case hasOptimizeFor // = 499
+  case hasOptions // = 500
+  case hasOutputType // = 501
+  case hasOverridableFeatures // = 502
+  case hasPackage // = 503
+  case hasPacked // = 504
+  case hasPhpClassPrefix // = 505
+  case hasPhpMetadataNamespace // = 506
+  case hasPhpNamespace // = 507
+  case hasPositiveIntValue // = 508
+  case hasProto3Optional // = 509
+  case hasPyGenericServices // = 510
+  case hasRepeated // = 511
+  case hasRepeatedFieldEncoding // = 512
+  case hasReserved // = 513
+  case hasRetention // = 514
+  case hasRubyPackage // = 515
+  case hasSemantic // = 516
+  case hasServerStreaming // = 517
+  case hasSourceCodeInfo // = 518
+  case hasSourceContext // = 519
+  case hasSourceFile // = 520
+  case hasStart // = 521
+  case hasStringValue // = 522
+  case hasSwiftPrefix // = 523
+  case hasSyntax // = 524
+  case hasTrailingComments // = 525
+  case hasType // = 526
+  case hasTypeName // = 527
+  case hasUnverifiedLazy // = 528
+  case hasUtf8Validation // = 529
+  case hasValue // = 530
+  case hasVerification // = 531
+  case hasWeak // = 532
+  case hour // = 533
+  case i // = 534
+  case idempotencyLevel // = 535
+  case identifierValue // = 536
+  case `if` // = 537
+  case ignoreUnknownExtensionFields // = 538
+  case ignoreUnknownFields // = 539
+  case index // = 540
+  case init_ // = 541
+  case `inout` // = 542
+  case inputType // = 543
+  case insert // = 544
+  case int // = 545
+  case int32 // = 546
+  case int32Value // = 547
+  case int64 // = 548
+  case int64Value // = 549
+  case int8 // = 550
+  case integerLiteral // = 551
+  case integerLiteralType // = 552
+  case intern // = 553
+  case `internal` // = 554
+  case internalState // = 555
+  case intersect // = 556
+  case into // = 557
+  case ints // = 558
+  case invalidAnyTypeURL // = 559
+  case isA // = 560
+  case isEqual // = 561
+  case isEqualTo // = 562
+  case isExtension // = 563
+  case isInitialized // = 564
+  case isNegative // = 565
+  case isPathValid // = 566
+  case isValid // = 567
+  case itemTagsEncodedSize // = 568
+  case iterator // = 569
+  case javaGenerateEqualsAndHash // = 570
+  case javaGenericServices // = 571
+  case javaMultipleFiles // = 572
+  case javaOuterClassname // = 573
+  case javaPackage // = 574
+  case javaStringCheckUtf8 // = 575
+  case jsondecoder // = 576
+  case jsondecoding // = 577
+  case jsondecodingError // = 578
+  case jsondecodingOptions // = 579
+  case jsonEncoder // = 580
+  case jsonencoding // = 581
+  case jsonencodingError // = 582
+  case jsonencodingOptions // = 583
+  case jsonencodingVisitor // = 584
+  case jsonFormat // = 585
+  case jsonmapEncodingVisitor // = 586
+  case jsonName // = 587
+  case jsonPath // = 588
+  case jsonPaths // = 589
+  case jsonscanner // = 590
+  case jsonString // = 591
+  case jsonText // = 592
+  case jsonUtf8Bytes // = 593
+  case jsonUtf8Data // = 594
+  case jstype // = 595
+  case k // = 596
+  case kChunkSize // = 597
+  case key // = 598
+  case keyField // = 599
+  case keyFieldOpt // = 600
+  case keyType // = 601
+  case kind // = 602
+  case l // = 603
+  case label // = 604
+  case lazy // = 605
+  case leadingComments // = 606
+  case leadingDetachedComments // = 607
+  case length // = 608
+  case lessThan // = 609
+  case `let` // = 610
+  case lhs // = 611
+  case line // = 612
+  case list // = 613
+  case listOfMessages // = 614
+  case listValue // = 615
+  case littleEndian // = 616
+  case load // = 617
+  case localHasher // = 618
+  case location // = 619
+  case m // = 620
+  case major // = 621
+  case makeAsyncIterator // = 622
+  case makeIterator // = 623
+  case malformedLength // = 624
+  case mapEntry // = 625
+  case mapKeyType // = 626
+  case mapToMessages // = 627
+  case mapValueType // = 628
+  case mapVisitor // = 629
+  case mask // = 630
+  case maximumEdition // = 631
+  case mdayStart // = 632
+  case merge // = 633
+  case mergeOptions // = 634
+  case message // = 635
+  case messageDepthLimit // = 636
+  case messageEncoding // = 637
+  case messageExtension // = 638
+  case messageImplementationBase // = 639
+  case messageOptions // = 640
+  case messageSet // = 641
+  case messageSetWireFormat // = 642
+  case messageSize // = 643
+  case messageType // = 644
+  case method // = 645
+  case methodDescriptorProto // = 646
+  case methodOptions // = 647
+  case methods // = 648
+  case min // = 649
+  case minimumEdition // = 650
+  case minor // = 651
+  case mixin // = 652
+  case mixins // = 653
+  case modify // = 654
+  case month // = 655
+  case msgExtension // = 656
+  case mutating // = 657
+  case n // = 658
+  case name // = 659
+  case nameDescription // = 660
+  case nameMap // = 661
+  case namePart // = 662
+  case names // = 663
+  case nanos // = 664
+  case negativeIntValue // = 665
+  case nestedType // = 666
+  case newExtensible // = 667
+  case newL // = 668
+  case newList // = 669
+  case newMessage // = 670
+  case newValue // = 671
+  case next // = 672
+  case nextByte // = 673
+  case nextFieldNumber // = 674
+  case nextVarInt // = 675
+  case `nil` // = 676
+  case nilLiteral // = 677
+  case noBytesAvailable // = 678
+  case noStandardDescriptorAccessor // = 679
+  case nullValue // = 680
+  case number // = 681
+  case numberValue // = 682
+  case objcClassPrefix // = 683
+  case of // = 684
+  case oneofDecl // = 685
+  case oneofDescriptorProto // = 686
+  case oneofIndex // = 687
+  case oneofOptions // = 688
+  case oneofs // = 689
+  case oneOfKind // = 690
+  case optimizeFor // = 691
+  case optimizeMode // = 692
+  case option // = 693
+  case optionalEnumExtensionField // = 694
+  case optionalExtensionField // = 695
+  case optionalGroupExtensionField // = 696
+  case optionalMessageExtensionField // = 697
+  case optionRetention // = 698
+  case options // = 699
+  case optionTargetType // = 700
+  case other // = 701
+  case others // = 702
+  case out // = 703
+  case outputType // = 704
+  case overridableFeatures // = 705
+  case p // = 706
+  case package // = 707
+  case packed // = 708
+  case packedEnumExtensionField // = 709
+  case packedExtensionField // = 710
+  case padding // = 711
+  case parent // = 712
+  case parse // = 713
+  case partial // = 714
+  case path // = 715
+  case pathDecoder // = 716
+  case pathDecodingError // = 717
+  case paths // = 718
+  case pathVisitor // = 719
+  case payload // = 720
+  case payloadSize // = 721
+  case phpClassPrefix // = 722
+  case phpMetadataNamespace // = 723
+  case phpNamespace // = 724
+  case pos // = 725
+  case positiveIntValue // = 726
+  case prefix // = 727
+  case preserveProtoFieldNames // = 728
+  case preTraverse // = 729
+  case prevPath // = 730
+  case printUnknownFields // = 731
+  case proto2 // = 732
+  case proto3DefaultValue // = 733
+  case proto3Optional // = 734
+  case protobufApiversionCheck // = 735
+  case protobufApiversion2 // = 736
+  case protobufBool // = 737
+  case protobufBytes // = 738
+  case protobufDouble // = 739
+  case protobufEnumMap // = 740
+  case protobufExtension // = 741
+  case protobufFixed32 // = 742
+  case protobufFixed64 // = 743
+  case protobufFloat // = 744
+  case protobufInt32 // = 745
+  case protobufInt64 // = 746
+  case protobufMap // = 747
+  case protobufMessageMap // = 748
+  case protobufSfixed32 // = 749
+  case protobufSfixed64 // = 750
+  case protobufSint32 // = 751
+  case protobufSint64 // = 752
+  case protobufString // = 753
+  case protobufUint32 // = 754
+  case protobufUint64 // = 755
+  case protobufExtensionFieldValues // = 756
+  case protobufFieldNumber // = 757
+  case protobufGeneratedIsEqualTo // = 758
+  case protobufNameMap // = 759
+  case protobufNewField // = 760
+  case protobufPackage // = 761
+  case `protocol` // = 762
+  case protoFieldName // = 763
+  case protoMessageName // = 764
+  case protoNameProviding // = 765
+  case protoPaths // = 766
+  case `public` // = 767
+  case publicDependency // = 768
+  case putBoolValue // = 769
+  case putBytesValue // = 770
+  case putDoubleValue // = 771
+  case putEnumValue // = 772
+  case putFixedUint32 // = 773
+  case putFixedUint64 // = 774
+  case putFloatValue // = 775
+  case putInt64 // = 776
+  case putStringValue // = 777
+  case putUint64 // = 778
+  case putUint64Hex // = 779
+  case putVarInt // = 780
+  case putZigZagVarInt // = 781
+  case pyGenericServices // = 782
+  case r // = 783
+  case rawChars // = 784
+  case rawRepresentable // = 785
+  case rawValue_ // = 786
+  case read4HexDigits // = 787
+  case readBytes // = 788
+  case register // = 789
+  case removingAllFieldsOf // = 790
+  case repeated // = 791
+  case repeatedEnumExtensionField // = 792
+  case repeatedExtensionField // = 793
+  case repeatedFieldEncoding // = 794
+  case repeatedGroupExtensionField // = 795
+  case repeatedMessageExtensionField // = 796
+  case repeating // = 797
+  case replaceRepeatedFields // = 798
+  case requestStreaming // = 799
+  case requestTypeURL // = 800
+  case requiredSize // = 801
+  case responseStreaming // = 802
+  case responseTypeURL // = 803
+  case result // = 804
+  case retention // = 805
+  case `rethrows` // = 806
+  case `return` // = 807
+  case returnType // = 808
+  case revision // = 809
+  case rhs // = 810
+  case root // = 811
+  case rubyPackage // = 812
+  case s // = 813
+  case sawBackslash // = 814
+  case sawSection4Characters // = 815
+  case sawSection5Characters // = 816
+  case scan // = 817
+  case scanner // = 818
+  case seconds // = 819
+  case self_ // = 820
+  case semantic // = 821
+  case sendable // = 822
+  case separator // = 823
+  case serialize // = 824
+  case serializedBytes // = 825
+  case serializedData // = 826
+  case serializedSize // = 827
+  case serverStreaming // = 828
+  case service // = 829
+  case serviceDescriptorProto // = 830
+  case serviceOptions // = 831
+  case set // = 832
+  case setExtensionValue // = 833
+  case shift // = 834
+  case simpleExtensionMap // = 835
+  case size // = 836
+  case sizer // = 837
+  case source // = 838
+  case sourceCodeInfo // = 839
+  case sourceContext // = 840
+  case sourceEncoding // = 841
+  case sourceFile // = 842
+  case sourceLocation // = 843
+  case span // = 844
+  case split // = 845
+  case start // = 846
+  case startArray // = 847
+  case startArrayObject // = 848
+  case startField // = 849
+  case startIndex // = 850
+  case startMessageField // = 851
+  case startObject // = 852
+  case startRegularField // = 853
+  case state // = 854
+  case `static` // = 855
+  case staticString // = 856
+  case storage // = 857
+  case string // = 858
+  case stringLiteral // = 859
+  case stringLiteralType // = 860
+  case stringResult // = 861
+  case stringValue // = 862
+  case `struct` // = 863
+  case structValue // = 864
+  case subDecoder // = 865
+  case `subscript` // = 866
+  case subtract // = 867
+  case subVisitor // = 868
+  case swift // = 869
+  case swiftPrefix // = 870
+  case swiftProtobufContiguousBytes // = 871
+  case swiftProtobufError // = 872
+  case syntax // = 873
+  case t // = 874
+  case tag // = 875
+  case targets // = 876
+  case terminator // = 877
+  case testDecoder // = 878
+  case text // = 879
+  case textDecoder // = 880
+  case textFormatDecoder // = 881
+  case textFormatDecodingError // = 882
+  case textFormatDecodingOptions // = 883
+  case textFormatEncodingOptions // = 884
+  case textFormatEncodingVisitor // = 885
+  case textFormatString // = 886
+  case throwOrIgnore // = 887
+  case `throws` // = 888
+  case timeInterval // = 889
+  case timeIntervalSince1970 // = 890
+  case timeIntervalSinceReferenceDate // = 891
+  case timestamp // = 892
+  case tmp // = 893
+  case tooLarge // = 894
+  case total // = 895
+  case totalArrayDepth // = 896
+  case totalSize // = 897
+  case trailingComments // = 898
+  case traverse // = 899
+  case trim // = 900
+  case `true` // = 901
+  case `try` // = 902
+  case type // = 903
+  case `typealias` // = 904
+  case typeEnum // = 905
+  case typeName // = 906
+  case typePrefix // = 907
+  case typeStart // = 908
+  case typeUnknown // = 909
+  case typeURL // = 910
+  case uint32 // = 911
+  case uint32Value // = 912
+  case uint64 // = 913
+  case uint64Value // = 914
+  case uint8 // = 915
+  case unchecked // = 916
+  case unicodeScalarLiteral // = 917
+  case unicodeScalarLiteralType // = 918
+  case unicodeScalars // = 919
+  case unicodeScalarView // = 920
+  case uninterpretedOption // = 921
+  case union // = 922
+  case uniqueStorage // = 923
+  case unknown // = 924
+  case unknownFields // = 925
+  case unknownStorage // = 926
+  case unpackTo // = 927
+  case unsafeBufferPointer // = 928
+  case unsafeMutablePointer // = 929
+  case unsafeMutableRawBufferPointer // = 930
+  case unsafeRawBufferPointer // = 931
+  case unsafeRawPointer // = 932
+  case unverifiedLazy // = 933
+  case updatedOptions // = 934
+  case url // = 935
+  case useDeterministicOrdering // = 936
+  case utf8 // = 937
+  case utf8Ptr // = 938
+  case utf8ToDouble // = 939
+  case utf8Validation // = 940
+  case utf8View // = 941
+  case v // = 942
+  case value // = 943
+  case valueField // = 944
+  case values // = 945
+  case valueType // = 946
+  case `var` // = 947
+  case verification // = 948
+  case verificationState // = 949
+  case version // = 950
+  case versionString // = 951
+  case visitExtensionFields // = 952
+  case visitExtensionFieldsAsMessageSet // = 953
+  case visitMapField // = 954
+  case visitor // = 955
+  case visitPacked // = 956
+  case visitPackedBoolField // = 957
+  case visitPackedDoubleField // = 958
+  case visitPackedEnumField // = 959
+  case visitPackedFixed32Field // = 960
+  case visitPackedFixed64Field // = 961
+  case visitPackedFloatField // = 962
+  case visitPackedInt32Field // = 963
+  case visitPackedInt64Field // = 964
+  case visitPackedSfixed32Field // = 965
+  case visitPackedSfixed64Field // = 966
+  case visitPackedSint32Field // = 967
+  case visitPackedSint64Field // = 968
+  case visitPackedUint32Field // = 969
+  case visitPackedUint64Field // = 970
+  case visitRepeated // = 971
+  case visitRepeatedBoolField // = 972
+  case visitRepeatedBytesField // = 973
+  case visitRepeatedDoubleField // = 974
+  case visitRepeatedEnumField // = 975
+  case visitRepeatedFixed32Field // = 976
+  case visitRepeatedFixed64Field // = 977
+  case visitRepeatedFloatField // = 978
+  case visitRepeatedGroupField // = 979
+  case visitRepeatedInt32Field // = 980
+  case visitRepeatedInt64Field // = 981
+  case visitRepeatedMessageField // = 982
+  case visitRepeatedSfixed32Field // = 983
+  case visitRepeatedSfixed64Field // = 984
+  case visitRepeatedSint32Field // = 985
+  case visitRepeatedSint64Field // = 986
+  case visitRepeatedStringField // = 987
+  case visitRepeatedUint32Field // = 988
+  case visitRepeatedUint64Field // = 989
+  case visitSingular // = 990
+  case visitSingularBoolField // = 991
+  case visitSingularBytesField // = 992
+  case visitSingularDoubleField // = 993
+  case visitSingularEnumField // = 994
+  case visitSingularFixed32Field // = 995
+  case visitSingularFixed64Field // = 996
+  case visitSingularFloatField // = 997
+  case visitSingularGroupField // = 998
+  case visitSingularInt32Field // = 999
+  case visitSingularInt64Field // = 1000
+  case visitSingularMessageField // = 1001
+  case visitSingularSfixed32Field // = 1002
+  case visitSingularSfixed64Field // = 1003
+  case visitSingularSint32Field // = 1004
+  case visitSingularSint64Field // = 1005
+  case visitSingularStringField // = 1006
+  case visitSingularUint32Field // = 1007
+  case visitSingularUint64Field // = 1008
+  case visitUnknown // = 1009
+  case wasDecoded // = 1010
+  case weak // = 1011
+  case weakDependency // = 1012
+  case `where` // = 1013
+  case wireFormat // = 1014
+  case with // = 1015
+  case withUnsafeBytes // = 1016
+  case withUnsafeMutableBytes // = 1017
+  case work // = 1018
+  case wrapped // = 1019
+  case wrappedType // = 1020
+  case wrappedValue // = 1021
+  case written // = 1022
+  case yday // = 1023
   case UNRECOGNIZED(Int)
 
   init() {
@@ -1148,926 +1155,933 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 94: self = .clearEditionIntroduced
     case 95: self = .clearEditionRemoved
     case 96: self = .clearEnd
-    case 97: self = .clearEnumType
-    case 98: self = .clearExtendee
-    case 99: self = .clearExtensionValue
-    case 100: self = .clearFeatures
-    case 101: self = .clearFeatureSupport
-    case 102: self = .clearFieldPresence
-    case 103: self = .clearFixedFeatures
-    case 104: self = .clearFullName
-    case 105: self = .clearGoPackage
-    case 106: self = .clearIdempotencyLevel
-    case 107: self = .clearIdentifierValue
-    case 108: self = .clearInputType
-    case 109: self = .clearIsExtension
-    case 110: self = .clearJavaGenerateEqualsAndHash
-    case 111: self = .clearJavaGenericServices
-    case 112: self = .clearJavaMultipleFiles
-    case 113: self = .clearJavaOuterClassname
-    case 114: self = .clearJavaPackage
-    case 115: self = .clearJavaStringCheckUtf8
-    case 116: self = .clearJsonFormat
-    case 117: self = .clearJsonName
-    case 118: self = .clearJstype
-    case 119: self = .clearLabel
-    case 120: self = .clearLazy
-    case 121: self = .clearLeadingComments
-    case 122: self = .clearMapEntry
-    case 123: self = .clearMaximumEdition
-    case 124: self = .clearMessageEncoding
-    case 125: self = .clearMessageSetWireFormat
-    case 126: self = .clearMinimumEdition
-    case 127: self = .clearName
-    case 128: self = .clearNamePart
-    case 129: self = .clearNegativeIntValue
-    case 130: self = .clearNoStandardDescriptorAccessor
-    case 131: self = .clearNumber
-    case 132: self = .clearObjcClassPrefix
-    case 133: self = .clearOneofIndex
-    case 134: self = .clearOptimizeFor
-    case 135: self = .clearOptions
-    case 136: self = .clearOutputType
-    case 137: self = .clearOverridableFeatures
-    case 138: self = .clearPackage
-    case 139: self = .clearPacked
-    case 140: self = .clearPhpClassPrefix
-    case 141: self = .clearPhpMetadataNamespace
-    case 142: self = .clearPhpNamespace
-    case 143: self = .clearPositiveIntValue
-    case 144: self = .clearProto3Optional
-    case 145: self = .clearPyGenericServices
-    case 146: self = .clearRepeated
-    case 147: self = .clearRepeatedFieldEncoding
-    case 148: self = .clearReserved
-    case 149: self = .clearRetention
-    case 150: self = .clearRubyPackage
-    case 151: self = .clearSemantic
-    case 152: self = .clearServerStreaming
-    case 153: self = .clearSourceCodeInfo
-    case 154: self = .clearSourceContext
-    case 155: self = .clearSourceFile
-    case 156: self = .clearStart
-    case 157: self = .clearStringValue
-    case 158: self = .clearSwiftPrefix
-    case 159: self = .clearSyntax
-    case 160: self = .clearTrailingComments
-    case 161: self = .clearType
-    case 162: self = .clearTypeName
-    case 163: self = .clearUnverifiedLazy
-    case 164: self = .clearUtf8Validation
-    case 165: self = .clearValue
-    case 166: self = .clearVerification
-    case 167: self = .clearWeak
-    case 168: self = .clientStreaming
-    case 169: self = .code
-    case 170: self = .codePoint
-    case 171: self = .codeUnits
-    case 172: self = .collection
-    case 173: self = .com
-    case 174: self = .comma
-    case 175: self = .consumedBytes
-    case 176: self = .contains
-    case 177: self = .contentsOf
-    case 178: self = .contiguousBytes
-    case 179: self = .copy
-    case 180: self = .count
-    case 181: self = .countVarintsInBuffer
-    case 182: self = .csharpNamespace
-    case 183: self = .ctype
-    case 184: self = .customCodable
-    case 185: self = .customDebugStringConvertible
-    case 186: self = .customStringConvertible
-    case 187: self = .d
-    case 188: self = .data
-    case 189: self = .dataResult
-    case 190: self = .date
-    case 191: self = .daySec
-    case 192: self = .daysSinceEpoch
-    case 193: self = .debugDescription_
-    case 194: self = .debugRedact
-    case 195: self = .declaration
-    case 196: self = .decoded
-    case 197: self = .decodedFromJsonnull
-    case 198: self = .decodeExtensionField
-    case 199: self = .decodeExtensionFieldsAsMessageSet
-    case 200: self = .decodeJson
-    case 201: self = .decodeMapField
-    case 202: self = .decodeMessage
-    case 203: self = .decoder
-    case 204: self = .decodeRepeated
-    case 205: self = .decodeRepeatedBoolField
-    case 206: self = .decodeRepeatedBytesField
-    case 207: self = .decodeRepeatedDoubleField
-    case 208: self = .decodeRepeatedEnumField
-    case 209: self = .decodeRepeatedFixed32Field
-    case 210: self = .decodeRepeatedFixed64Field
-    case 211: self = .decodeRepeatedFloatField
-    case 212: self = .decodeRepeatedGroupField
-    case 213: self = .decodeRepeatedInt32Field
-    case 214: self = .decodeRepeatedInt64Field
-    case 215: self = .decodeRepeatedMessageField
-    case 216: self = .decodeRepeatedSfixed32Field
-    case 217: self = .decodeRepeatedSfixed64Field
-    case 218: self = .decodeRepeatedSint32Field
-    case 219: self = .decodeRepeatedSint64Field
-    case 220: self = .decodeRepeatedStringField
-    case 221: self = .decodeRepeatedUint32Field
-    case 222: self = .decodeRepeatedUint64Field
-    case 223: self = .decodeSingular
-    case 224: self = .decodeSingularBoolField
-    case 225: self = .decodeSingularBytesField
-    case 226: self = .decodeSingularDoubleField
-    case 227: self = .decodeSingularEnumField
-    case 228: self = .decodeSingularFixed32Field
-    case 229: self = .decodeSingularFixed64Field
-    case 230: self = .decodeSingularFloatField
-    case 231: self = .decodeSingularGroupField
-    case 232: self = .decodeSingularInt32Field
-    case 233: self = .decodeSingularInt64Field
-    case 234: self = .decodeSingularMessageField
-    case 235: self = .decodeSingularSfixed32Field
-    case 236: self = .decodeSingularSfixed64Field
-    case 237: self = .decodeSingularSint32Field
-    case 238: self = .decodeSingularSint64Field
-    case 239: self = .decodeSingularStringField
-    case 240: self = .decodeSingularUint32Field
-    case 241: self = .decodeSingularUint64Field
-    case 242: self = .decodeTextFormat
-    case 243: self = .defaultAnyTypeUrlprefix
-    case 244: self = .defaults
-    case 245: self = .defaultValue
-    case 246: self = .dependency
-    case 247: self = .deprecated
-    case 248: self = .deprecatedLegacyJsonFieldConflicts
-    case 249: self = .deprecationWarning
-    case 250: self = .description_
-    case 251: self = .descriptorProto
-    case 252: self = .dictionary
-    case 253: self = .dictionaryLiteral
-    case 254: self = .digit
-    case 255: self = .digit0
-    case 256: self = .digit1
-    case 257: self = .digitCount
-    case 258: self = .digits
-    case 259: self = .digitValue
-    case 260: self = .discardableResult
-    case 261: self = .discardUnknownFields
-    case 262: self = .double
-    case 263: self = .doubleValue
-    case 264: self = .duration
-    case 265: self = .e
-    case 266: self = .edition
-    case 267: self = .editionDefault
-    case 268: self = .editionDefaults
-    case 269: self = .editionDeprecated
-    case 270: self = .editionIntroduced
-    case 271: self = .editionRemoved
-    case 272: self = .element
-    case 273: self = .elements
-    case 274: self = .else
-    case 275: self = .emitExtensionFieldName
-    case 276: self = .emitFieldName
-    case 277: self = .emitFieldNumber
-    case 278: self = .empty
-    case 279: self = .emptyData
-    case 280: self = .encodeAsBytes
-    case 281: self = .encoded
-    case 282: self = .encodedJsonstring
-    case 283: self = .encodedSize
-    case 284: self = .encodeField
-    case 285: self = .encoder
-    case 286: self = .end
-    case 287: self = .endArray
-    case 288: self = .endMessageField
-    case 289: self = .endObject
-    case 290: self = .endRegularField
-    case 291: self = .enum
-    case 292: self = .enumDescriptorProto
-    case 293: self = .enumOptions
-    case 294: self = .enumReservedRange
-    case 295: self = .enumType
-    case 296: self = .enumvalue
-    case 297: self = .enumValueDescriptorProto
-    case 298: self = .enumValueOptions
-    case 299: self = .equatable
-    case 300: self = .error
-    case 301: self = .expressibleByArrayLiteral
-    case 302: self = .expressibleByDictionaryLiteral
-    case 303: self = .ext
-    case 304: self = .extDecoder
-    case 305: self = .extendedGraphemeClusterLiteral
-    case 306: self = .extendedGraphemeClusterLiteralType
-    case 307: self = .extendee
-    case 308: self = .extensibleMessage
-    case 309: self = .extension
-    case 310: self = .extensionField
-    case 311: self = .extensionFieldNumber
-    case 312: self = .extensionFieldValueSet
-    case 313: self = .extensionMap
-    case 314: self = .extensionRange
-    case 315: self = .extensionRangeOptions
-    case 316: self = .extensions
-    case 317: self = .extras
-    case 318: self = .f
-    case 319: self = .false
-    case 320: self = .features
-    case 321: self = .featureSet
-    case 322: self = .featureSetDefaults
-    case 323: self = .featureSetEditionDefault
-    case 324: self = .featureSupport
-    case 325: self = .field
-    case 326: self = .fieldData
-    case 327: self = .fieldDescriptorProto
-    case 328: self = .fieldMask
-    case 329: self = .fieldMaskError
-    case 330: self = .fieldName
-    case 331: self = .fieldNameCount
-    case 332: self = .fieldNum
-    case 333: self = .fieldNumber
-    case 334: self = .fieldNumberForProto
-    case 335: self = .fieldOptions
-    case 336: self = .fieldPresence
-    case 337: self = .fields
-    case 338: self = .fieldSize
-    case 339: self = .fieldTag
-    case 340: self = .fieldType
-    case 341: self = .file
-    case 342: self = .fileDescriptorProto
-    case 343: self = .fileDescriptorSet
-    case 344: self = .fileName
-    case 345: self = .fileOptions
-    case 346: self = .filter
-    case 347: self = .final
-    case 348: self = .finiteOnly
-    case 349: self = .first
-    case 350: self = .firstItem
-    case 351: self = .fixedFeatures
-    case 352: self = .float
-    case 353: self = .floatLiteral
-    case 354: self = .floatLiteralType
-    case 355: self = .floatValue
-    case 356: self = .for
-    case 357: self = .forMessageName
-    case 358: self = .formUnion
-    case 359: self = .forReadingFrom
-    case 360: self = .forTypeURL
-    case 361: self = .forwardParser
-    case 362: self = .forWritingInto
-    case 363: self = .from
-    case 364: self = .fromAscii2
-    case 365: self = .fromAscii4
-    case 366: self = .fromByteOffset
-    case 367: self = .fromHexDigit
-    case 368: self = .fullName
-    case 369: self = .func
-    case 370: self = .function
-    case 371: self = .g
-    case 372: self = .generatedCodeInfo
-    case 373: self = .get
-    case 374: self = .getExtensionValue
-    case 375: self = .googleapis
-    case 376: self = .googleProtobufAny
-    case 377: self = .googleProtobufApi
-    case 378: self = .googleProtobufBoolValue
-    case 379: self = .googleProtobufBytesValue
-    case 380: self = .googleProtobufDescriptorProto
-    case 381: self = .googleProtobufDoubleValue
-    case 382: self = .googleProtobufDuration
-    case 383: self = .googleProtobufEdition
-    case 384: self = .googleProtobufEmpty
-    case 385: self = .googleProtobufEnum
-    case 386: self = .googleProtobufEnumDescriptorProto
-    case 387: self = .googleProtobufEnumOptions
-    case 388: self = .googleProtobufEnumValue
-    case 389: self = .googleProtobufEnumValueDescriptorProto
-    case 390: self = .googleProtobufEnumValueOptions
-    case 391: self = .googleProtobufExtensionRangeOptions
-    case 392: self = .googleProtobufFeatureSet
-    case 393: self = .googleProtobufFeatureSetDefaults
-    case 394: self = .googleProtobufField
-    case 395: self = .googleProtobufFieldDescriptorProto
-    case 396: self = .googleProtobufFieldMask
-    case 397: self = .googleProtobufFieldOptions
-    case 398: self = .googleProtobufFileDescriptorProto
-    case 399: self = .googleProtobufFileDescriptorSet
-    case 400: self = .googleProtobufFileOptions
-    case 401: self = .googleProtobufFloatValue
-    case 402: self = .googleProtobufGeneratedCodeInfo
-    case 403: self = .googleProtobufInt32Value
-    case 404: self = .googleProtobufInt64Value
-    case 405: self = .googleProtobufListValue
-    case 406: self = .googleProtobufMessageOptions
-    case 407: self = .googleProtobufMethod
-    case 408: self = .googleProtobufMethodDescriptorProto
-    case 409: self = .googleProtobufMethodOptions
-    case 410: self = .googleProtobufMixin
-    case 411: self = .googleProtobufNullValue
-    case 412: self = .googleProtobufOneofDescriptorProto
-    case 413: self = .googleProtobufOneofOptions
-    case 414: self = .googleProtobufOption
-    case 415: self = .googleProtobufServiceDescriptorProto
-    case 416: self = .googleProtobufServiceOptions
-    case 417: self = .googleProtobufSourceCodeInfo
-    case 418: self = .googleProtobufSourceContext
-    case 419: self = .googleProtobufStringValue
-    case 420: self = .googleProtobufStruct
-    case 421: self = .googleProtobufSyntax
-    case 422: self = .googleProtobufTimestamp
-    case 423: self = .googleProtobufType
-    case 424: self = .googleProtobufUint32Value
-    case 425: self = .googleProtobufUint64Value
-    case 426: self = .googleProtobufUninterpretedOption
-    case 427: self = .googleProtobufValue
-    case 428: self = .goPackage
-    case 429: self = .group
-    case 430: self = .groupFieldNumberStack
-    case 431: self = .groupSize
-    case 432: self = .guard
-    case 433: self = .hadOneofValue
-    case 434: self = .handleConflictingOneOf
-    case 435: self = .hasAggregateValue
-    case 436: self = .hasAllowAlias
-    case 437: self = .hasBegin
-    case 438: self = .hasCcEnableArenas
-    case 439: self = .hasCcGenericServices
-    case 440: self = .hasClientStreaming
-    case 441: self = .hasCsharpNamespace
-    case 442: self = .hasCtype
-    case 443: self = .hasDebugRedact
-    case 444: self = .hasDefaultValue
-    case 445: self = .hasDeprecated
-    case 446: self = .hasDeprecatedLegacyJsonFieldConflicts
-    case 447: self = .hasDeprecationWarning
-    case 448: self = .hasDoubleValue
-    case 449: self = .hasEdition
-    case 450: self = .hasEditionDeprecated
-    case 451: self = .hasEditionIntroduced
-    case 452: self = .hasEditionRemoved
-    case 453: self = .hasEnd
-    case 454: self = .hasEnumType
-    case 455: self = .hasExtendee
-    case 456: self = .hasExtensionValue
-    case 457: self = .hasFeatures
-    case 458: self = .hasFeatureSupport
-    case 459: self = .hasFieldPresence
-    case 460: self = .hasFixedFeatures
-    case 461: self = .hasFullName
-    case 462: self = .hasGoPackage
-    case 463: self = .hash
-    case 464: self = .hashable
-    case 465: self = .hasher
-    case 466: self = .hashVisitor
-    case 467: self = .hasIdempotencyLevel
-    case 468: self = .hasIdentifierValue
-    case 469: self = .hasInputType
-    case 470: self = .hasIsExtension
-    case 471: self = .hasJavaGenerateEqualsAndHash
-    case 472: self = .hasJavaGenericServices
-    case 473: self = .hasJavaMultipleFiles
-    case 474: self = .hasJavaOuterClassname
-    case 475: self = .hasJavaPackage
-    case 476: self = .hasJavaStringCheckUtf8
-    case 477: self = .hasJsonFormat
-    case 478: self = .hasJsonName
-    case 479: self = .hasJstype
-    case 480: self = .hasLabel
-    case 481: self = .hasLazy
-    case 482: self = .hasLeadingComments
-    case 483: self = .hasMapEntry
-    case 484: self = .hasMaximumEdition
-    case 485: self = .hasMessageEncoding
-    case 486: self = .hasMessageSetWireFormat
-    case 487: self = .hasMinimumEdition
-    case 488: self = .hasName
-    case 489: self = .hasNamePart
-    case 490: self = .hasNegativeIntValue
-    case 491: self = .hasNoStandardDescriptorAccessor
-    case 492: self = .hasNumber
-    case 493: self = .hasObjcClassPrefix
-    case 494: self = .hasOneofIndex
-    case 495: self = .hasOptimizeFor
-    case 496: self = .hasOptions
-    case 497: self = .hasOutputType
-    case 498: self = .hasOverridableFeatures
-    case 499: self = .hasPackage
-    case 500: self = .hasPacked
-    case 501: self = .hasPhpClassPrefix
-    case 502: self = .hasPhpMetadataNamespace
-    case 503: self = .hasPhpNamespace
-    case 504: self = .hasPositiveIntValue
-    case 505: self = .hasProto3Optional
-    case 506: self = .hasPyGenericServices
-    case 507: self = .hasRepeated
-    case 508: self = .hasRepeatedFieldEncoding
-    case 509: self = .hasReserved
-    case 510: self = .hasRetention
-    case 511: self = .hasRubyPackage
-    case 512: self = .hasSemantic
-    case 513: self = .hasServerStreaming
-    case 514: self = .hasSourceCodeInfo
-    case 515: self = .hasSourceContext
-    case 516: self = .hasSourceFile
-    case 517: self = .hasStart
-    case 518: self = .hasStringValue
-    case 519: self = .hasSwiftPrefix
-    case 520: self = .hasSyntax
-    case 521: self = .hasTrailingComments
-    case 522: self = .hasType
-    case 523: self = .hasTypeName
-    case 524: self = .hasUnverifiedLazy
-    case 525: self = .hasUtf8Validation
-    case 526: self = .hasValue
-    case 527: self = .hasVerification
-    case 528: self = .hasWeak
-    case 529: self = .hour
-    case 530: self = .i
-    case 531: self = .idempotencyLevel
-    case 532: self = .identifierValue
-    case 533: self = .if
-    case 534: self = .ignoreUnknownExtensionFields
-    case 535: self = .ignoreUnknownFields
-    case 536: self = .index
-    case 537: self = .init_
-    case 538: self = .inout
-    case 539: self = .inputType
-    case 540: self = .insert
-    case 541: self = .int
-    case 542: self = .int32
-    case 543: self = .int32Value
-    case 544: self = .int64
-    case 545: self = .int64Value
-    case 546: self = .int8
-    case 547: self = .integerLiteral
-    case 548: self = .integerLiteralType
-    case 549: self = .intern
-    case 550: self = .internal
-    case 551: self = .internalState
-    case 552: self = .intersect
-    case 553: self = .into
-    case 554: self = .ints
-    case 555: self = .isA
-    case 556: self = .isEqual
-    case 557: self = .isEqualTo
-    case 558: self = .isExtension
-    case 559: self = .isInitialized
-    case 560: self = .isNegative
-    case 561: self = .isPathValid
-    case 562: self = .isValid
-    case 563: self = .itemTagsEncodedSize
-    case 564: self = .iterator
-    case 565: self = .javaGenerateEqualsAndHash
-    case 566: self = .javaGenericServices
-    case 567: self = .javaMultipleFiles
-    case 568: self = .javaOuterClassname
-    case 569: self = .javaPackage
-    case 570: self = .javaStringCheckUtf8
-    case 571: self = .jsondecoder
-    case 572: self = .jsondecodingError
-    case 573: self = .jsondecodingOptions
-    case 574: self = .jsonEncoder
-    case 575: self = .jsonencodingError
-    case 576: self = .jsonencodingOptions
-    case 577: self = .jsonencodingVisitor
-    case 578: self = .jsonFormat
-    case 579: self = .jsonmapEncodingVisitor
-    case 580: self = .jsonName
-    case 581: self = .jsonPath
-    case 582: self = .jsonPaths
-    case 583: self = .jsonscanner
-    case 584: self = .jsonString
-    case 585: self = .jsonText
-    case 586: self = .jsonUtf8Bytes
-    case 587: self = .jsonUtf8Data
-    case 588: self = .jstype
-    case 589: self = .k
-    case 590: self = .kChunkSize
-    case 591: self = .key
-    case 592: self = .keyField
-    case 593: self = .keyFieldOpt
-    case 594: self = .keyType
-    case 595: self = .kind
-    case 596: self = .l
-    case 597: self = .label
-    case 598: self = .lazy
-    case 599: self = .leadingComments
-    case 600: self = .leadingDetachedComments
-    case 601: self = .length
-    case 602: self = .lessThan
-    case 603: self = .let
-    case 604: self = .lhs
-    case 605: self = .line
-    case 606: self = .list
-    case 607: self = .listOfMessages
-    case 608: self = .listValue
-    case 609: self = .littleEndian
-    case 610: self = .load
-    case 611: self = .localHasher
-    case 612: self = .location
-    case 613: self = .m
-    case 614: self = .major
-    case 615: self = .makeAsyncIterator
-    case 616: self = .makeIterator
-    case 617: self = .malformedLength
-    case 618: self = .mapEntry
-    case 619: self = .mapKeyType
-    case 620: self = .mapToMessages
-    case 621: self = .mapValueType
-    case 622: self = .mapVisitor
-    case 623: self = .mask
-    case 624: self = .maximumEdition
-    case 625: self = .mdayStart
-    case 626: self = .merge
-    case 627: self = .mergeOptions
-    case 628: self = .message
-    case 629: self = .messageDepthLimit
-    case 630: self = .messageEncoding
-    case 631: self = .messageExtension
-    case 632: self = .messageImplementationBase
-    case 633: self = .messageOptions
-    case 634: self = .messageSet
-    case 635: self = .messageSetWireFormat
-    case 636: self = .messageSize
-    case 637: self = .messageType
-    case 638: self = .method
-    case 639: self = .methodDescriptorProto
-    case 640: self = .methodOptions
-    case 641: self = .methods
-    case 642: self = .min
-    case 643: self = .minimumEdition
-    case 644: self = .minor
-    case 645: self = .mixin
-    case 646: self = .mixins
-    case 647: self = .modify
-    case 648: self = .month
-    case 649: self = .msgExtension
-    case 650: self = .mutating
-    case 651: self = .n
-    case 652: self = .name
-    case 653: self = .nameDescription
-    case 654: self = .nameMap
-    case 655: self = .namePart
-    case 656: self = .names
-    case 657: self = .nanos
-    case 658: self = .negativeIntValue
-    case 659: self = .nestedType
-    case 660: self = .newExtensible
-    case 661: self = .newL
-    case 662: self = .newList
-    case 663: self = .newMessage
-    case 664: self = .newValue
-    case 665: self = .next
-    case 666: self = .nextByte
-    case 667: self = .nextFieldNumber
-    case 668: self = .nextVarInt
-    case 669: self = .nil
-    case 670: self = .nilLiteral
-    case 671: self = .noBytesAvailable
-    case 672: self = .noStandardDescriptorAccessor
-    case 673: self = .nullValue
-    case 674: self = .number
-    case 675: self = .numberValue
-    case 676: self = .objcClassPrefix
-    case 677: self = .of
-    case 678: self = .oneofDecl
-    case 679: self = .oneofDescriptorProto
-    case 680: self = .oneofIndex
-    case 681: self = .oneofOptions
-    case 682: self = .oneofs
-    case 683: self = .oneOfKind
-    case 684: self = .optimizeFor
-    case 685: self = .optimizeMode
-    case 686: self = .option
-    case 687: self = .optionalEnumExtensionField
-    case 688: self = .optionalExtensionField
-    case 689: self = .optionalGroupExtensionField
-    case 690: self = .optionalMessageExtensionField
-    case 691: self = .optionRetention
-    case 692: self = .options
-    case 693: self = .optionTargetType
-    case 694: self = .other
-    case 695: self = .others
-    case 696: self = .out
-    case 697: self = .outputType
-    case 698: self = .overridableFeatures
-    case 699: self = .p
-    case 700: self = .package
-    case 701: self = .packed
-    case 702: self = .packedEnumExtensionField
-    case 703: self = .packedExtensionField
-    case 704: self = .padding
-    case 705: self = .parent
-    case 706: self = .parse
-    case 707: self = .partial
-    case 708: self = .path
-    case 709: self = .pathDecoder
-    case 710: self = .pathDecodingError
-    case 711: self = .paths
-    case 712: self = .pathVisitor
-    case 713: self = .payload
-    case 714: self = .payloadSize
-    case 715: self = .phpClassPrefix
-    case 716: self = .phpMetadataNamespace
-    case 717: self = .phpNamespace
-    case 718: self = .pos
-    case 719: self = .positiveIntValue
-    case 720: self = .prefix
-    case 721: self = .preserveProtoFieldNames
-    case 722: self = .preTraverse
-    case 723: self = .prevPath
-    case 724: self = .printUnknownFields
-    case 725: self = .proto2
-    case 726: self = .proto3DefaultValue
-    case 727: self = .proto3Optional
-    case 728: self = .protobufApiversionCheck
-    case 729: self = .protobufApiversion2
-    case 730: self = .protobufBool
-    case 731: self = .protobufBytes
-    case 732: self = .protobufDouble
-    case 733: self = .protobufEnumMap
-    case 734: self = .protobufExtension
-    case 735: self = .protobufFixed32
-    case 736: self = .protobufFixed64
-    case 737: self = .protobufFloat
-    case 738: self = .protobufInt32
-    case 739: self = .protobufInt64
-    case 740: self = .protobufMap
-    case 741: self = .protobufMessageMap
-    case 742: self = .protobufSfixed32
-    case 743: self = .protobufSfixed64
-    case 744: self = .protobufSint32
-    case 745: self = .protobufSint64
-    case 746: self = .protobufString
-    case 747: self = .protobufUint32
-    case 748: self = .protobufUint64
-    case 749: self = .protobufExtensionFieldValues
-    case 750: self = .protobufFieldNumber
-    case 751: self = .protobufGeneratedIsEqualTo
-    case 752: self = .protobufNameMap
-    case 753: self = .protobufNewField
-    case 754: self = .protobufPackage
-    case 755: self = .protocol
-    case 756: self = .protoFieldName
-    case 757: self = .protoMessageName
-    case 758: self = .protoNameProviding
-    case 759: self = .protoPaths
-    case 760: self = .public
-    case 761: self = .publicDependency
-    case 762: self = .putBoolValue
-    case 763: self = .putBytesValue
-    case 764: self = .putDoubleValue
-    case 765: self = .putEnumValue
-    case 766: self = .putFixedUint32
-    case 767: self = .putFixedUint64
-    case 768: self = .putFloatValue
-    case 769: self = .putInt64
-    case 770: self = .putStringValue
-    case 771: self = .putUint64
-    case 772: self = .putUint64Hex
-    case 773: self = .putVarInt
-    case 774: self = .putZigZagVarInt
-    case 775: self = .pyGenericServices
-    case 776: self = .r
-    case 777: self = .rawChars
-    case 778: self = .rawRepresentable
-    case 779: self = .rawValue_
-    case 780: self = .read4HexDigits
-    case 781: self = .readBytes
-    case 782: self = .register
-    case 783: self = .removingAllFieldsOf
-    case 784: self = .repeated
-    case 785: self = .repeatedEnumExtensionField
-    case 786: self = .repeatedExtensionField
-    case 787: self = .repeatedFieldEncoding
-    case 788: self = .repeatedGroupExtensionField
-    case 789: self = .repeatedMessageExtensionField
-    case 790: self = .repeating
-    case 791: self = .replaceRepeatedFields
-    case 792: self = .requestStreaming
-    case 793: self = .requestTypeURL
-    case 794: self = .requiredSize
-    case 795: self = .responseStreaming
-    case 796: self = .responseTypeURL
-    case 797: self = .result
-    case 798: self = .retention
-    case 799: self = .rethrows
-    case 800: self = .return
-    case 801: self = .returnType
-    case 802: self = .revision
-    case 803: self = .rhs
-    case 804: self = .root
-    case 805: self = .rubyPackage
-    case 806: self = .s
-    case 807: self = .sawBackslash
-    case 808: self = .sawSection4Characters
-    case 809: self = .sawSection5Characters
-    case 810: self = .scan
-    case 811: self = .scanner
-    case 812: self = .seconds
-    case 813: self = .self_
-    case 814: self = .semantic
-    case 815: self = .sendable
-    case 816: self = .separator
-    case 817: self = .serialize
-    case 818: self = .serializedBytes
-    case 819: self = .serializedData
-    case 820: self = .serializedSize
-    case 821: self = .serverStreaming
-    case 822: self = .service
-    case 823: self = .serviceDescriptorProto
-    case 824: self = .serviceOptions
-    case 825: self = .set
-    case 826: self = .setExtensionValue
-    case 827: self = .shift
-    case 828: self = .simpleExtensionMap
-    case 829: self = .size
-    case 830: self = .sizer
-    case 831: self = .source
-    case 832: self = .sourceCodeInfo
-    case 833: self = .sourceContext
-    case 834: self = .sourceEncoding
-    case 835: self = .sourceFile
-    case 836: self = .sourceLocation
-    case 837: self = .span
-    case 838: self = .split
-    case 839: self = .start
-    case 840: self = .startArray
-    case 841: self = .startArrayObject
-    case 842: self = .startField
-    case 843: self = .startIndex
-    case 844: self = .startMessageField
-    case 845: self = .startObject
-    case 846: self = .startRegularField
-    case 847: self = .state
-    case 848: self = .static
-    case 849: self = .staticString
-    case 850: self = .storage
-    case 851: self = .string
-    case 852: self = .stringLiteral
-    case 853: self = .stringLiteralType
-    case 854: self = .stringResult
-    case 855: self = .stringValue
-    case 856: self = .struct
-    case 857: self = .structValue
-    case 858: self = .subDecoder
-    case 859: self = .subscript
-    case 860: self = .subtract
-    case 861: self = .subVisitor
-    case 862: self = .swift
-    case 863: self = .swiftPrefix
-    case 864: self = .swiftProtobufContiguousBytes
-    case 865: self = .swiftProtobufError
-    case 866: self = .syntax
-    case 867: self = .t
-    case 868: self = .tag
-    case 869: self = .targets
-    case 870: self = .terminator
-    case 871: self = .testDecoder
-    case 872: self = .text
-    case 873: self = .textDecoder
-    case 874: self = .textFormatDecoder
-    case 875: self = .textFormatDecodingError
-    case 876: self = .textFormatDecodingOptions
-    case 877: self = .textFormatEncodingOptions
-    case 878: self = .textFormatEncodingVisitor
-    case 879: self = .textFormatString
-    case 880: self = .throwOrIgnore
-    case 881: self = .throws
-    case 882: self = .timeInterval
-    case 883: self = .timeIntervalSince1970
-    case 884: self = .timeIntervalSinceReferenceDate
-    case 885: self = .timestamp
-    case 886: self = .tmp
-    case 887: self = .tooLarge
-    case 888: self = .total
-    case 889: self = .totalArrayDepth
-    case 890: self = .totalSize
-    case 891: self = .trailingComments
-    case 892: self = .traverse
-    case 893: self = .trim
-    case 894: self = .true
-    case 895: self = .try
-    case 896: self = .type
-    case 897: self = .typealias
-    case 898: self = .typeEnum
-    case 899: self = .typeName
-    case 900: self = .typePrefix
-    case 901: self = .typeStart
-    case 902: self = .typeUnknown
-    case 903: self = .typeURL
-    case 904: self = .uint32
-    case 905: self = .uint32Value
-    case 906: self = .uint64
-    case 907: self = .uint64Value
-    case 908: self = .uint8
-    case 909: self = .unchecked
-    case 910: self = .unicodeScalarLiteral
-    case 911: self = .unicodeScalarLiteralType
-    case 912: self = .unicodeScalars
-    case 913: self = .unicodeScalarView
-    case 914: self = .uninterpretedOption
-    case 915: self = .union
-    case 916: self = .uniqueStorage
-    case 917: self = .unknown
-    case 918: self = .unknownFields
-    case 919: self = .unknownStorage
-    case 920: self = .unpackTo
-    case 921: self = .unsafeBufferPointer
-    case 922: self = .unsafeMutablePointer
-    case 923: self = .unsafeMutableRawBufferPointer
-    case 924: self = .unsafeRawBufferPointer
-    case 925: self = .unsafeRawPointer
-    case 926: self = .unverifiedLazy
-    case 927: self = .updatedOptions
-    case 928: self = .url
-    case 929: self = .useDeterministicOrdering
-    case 930: self = .utf8
-    case 931: self = .utf8Ptr
-    case 932: self = .utf8ToDouble
-    case 933: self = .utf8Validation
-    case 934: self = .utf8View
-    case 935: self = .v
-    case 936: self = .value
-    case 937: self = .valueField
-    case 938: self = .values
-    case 939: self = .valueType
-    case 940: self = .var
-    case 941: self = .verification
-    case 942: self = .verificationState
-    case 943: self = .version
-    case 944: self = .versionString
-    case 945: self = .visitExtensionFields
-    case 946: self = .visitExtensionFieldsAsMessageSet
-    case 947: self = .visitMapField
-    case 948: self = .visitor
-    case 949: self = .visitPacked
-    case 950: self = .visitPackedBoolField
-    case 951: self = .visitPackedDoubleField
-    case 952: self = .visitPackedEnumField
-    case 953: self = .visitPackedFixed32Field
-    case 954: self = .visitPackedFixed64Field
-    case 955: self = .visitPackedFloatField
-    case 956: self = .visitPackedInt32Field
-    case 957: self = .visitPackedInt64Field
-    case 958: self = .visitPackedSfixed32Field
-    case 959: self = .visitPackedSfixed64Field
-    case 960: self = .visitPackedSint32Field
-    case 961: self = .visitPackedSint64Field
-    case 962: self = .visitPackedUint32Field
-    case 963: self = .visitPackedUint64Field
-    case 964: self = .visitRepeated
-    case 965: self = .visitRepeatedBoolField
-    case 966: self = .visitRepeatedBytesField
-    case 967: self = .visitRepeatedDoubleField
-    case 968: self = .visitRepeatedEnumField
-    case 969: self = .visitRepeatedFixed32Field
-    case 970: self = .visitRepeatedFixed64Field
-    case 971: self = .visitRepeatedFloatField
-    case 972: self = .visitRepeatedGroupField
-    case 973: self = .visitRepeatedInt32Field
-    case 974: self = .visitRepeatedInt64Field
-    case 975: self = .visitRepeatedMessageField
-    case 976: self = .visitRepeatedSfixed32Field
-    case 977: self = .visitRepeatedSfixed64Field
-    case 978: self = .visitRepeatedSint32Field
-    case 979: self = .visitRepeatedSint64Field
-    case 980: self = .visitRepeatedStringField
-    case 981: self = .visitRepeatedUint32Field
-    case 982: self = .visitRepeatedUint64Field
-    case 983: self = .visitSingular
-    case 984: self = .visitSingularBoolField
-    case 985: self = .visitSingularBytesField
-    case 986: self = .visitSingularDoubleField
-    case 987: self = .visitSingularEnumField
-    case 988: self = .visitSingularFixed32Field
-    case 989: self = .visitSingularFixed64Field
-    case 990: self = .visitSingularFloatField
-    case 991: self = .visitSingularGroupField
-    case 992: self = .visitSingularInt32Field
-    case 993: self = .visitSingularInt64Field
-    case 994: self = .visitSingularMessageField
-    case 995: self = .visitSingularSfixed32Field
-    case 996: self = .visitSingularSfixed64Field
-    case 997: self = .visitSingularSint32Field
-    case 998: self = .visitSingularSint64Field
-    case 999: self = .visitSingularStringField
-    case 1000: self = .visitSingularUint32Field
-    case 1001: self = .visitSingularUint64Field
-    case 1002: self = .visitUnknown
-    case 1003: self = .wasDecoded
-    case 1004: self = .weak
-    case 1005: self = .weakDependency
-    case 1006: self = .where
-    case 1007: self = .wireFormat
-    case 1008: self = .with
-    case 1009: self = .withUnsafeBytes
-    case 1010: self = .withUnsafeMutableBytes
-    case 1011: self = .work
-    case 1012: self = .wrapped
-    case 1013: self = .wrappedType
-    case 1014: self = .wrappedValue
-    case 1015: self = .written
-    case 1016: self = .yday
+    case 97: self = .clearEnforceNamingStyle
+    case 98: self = .clearEnumType
+    case 99: self = .clearExtendee
+    case 100: self = .clearExtensionValue
+    case 101: self = .clearFeatures
+    case 102: self = .clearFeatureSupport
+    case 103: self = .clearFieldPresence
+    case 104: self = .clearFixedFeatures
+    case 105: self = .clearFullName
+    case 106: self = .clearGoPackage
+    case 107: self = .clearIdempotencyLevel
+    case 108: self = .clearIdentifierValue
+    case 109: self = .clearInputType
+    case 110: self = .clearIsExtension
+    case 111: self = .clearJavaGenerateEqualsAndHash
+    case 112: self = .clearJavaGenericServices
+    case 113: self = .clearJavaMultipleFiles
+    case 114: self = .clearJavaOuterClassname
+    case 115: self = .clearJavaPackage
+    case 116: self = .clearJavaStringCheckUtf8
+    case 117: self = .clearJsonFormat
+    case 118: self = .clearJsonName
+    case 119: self = .clearJstype
+    case 120: self = .clearLabel
+    case 121: self = .clearLazy
+    case 122: self = .clearLeadingComments
+    case 123: self = .clearMapEntry
+    case 124: self = .clearMaximumEdition
+    case 125: self = .clearMessageEncoding
+    case 126: self = .clearMessageSetWireFormat
+    case 127: self = .clearMinimumEdition
+    case 128: self = .clearName
+    case 129: self = .clearNamePart
+    case 130: self = .clearNegativeIntValue
+    case 131: self = .clearNoStandardDescriptorAccessor
+    case 132: self = .clearNumber
+    case 133: self = .clearObjcClassPrefix
+    case 134: self = .clearOneofIndex
+    case 135: self = .clearOptimizeFor
+    case 136: self = .clearOptions
+    case 137: self = .clearOutputType
+    case 138: self = .clearOverridableFeatures
+    case 139: self = .clearPackage
+    case 140: self = .clearPacked
+    case 141: self = .clearPhpClassPrefix
+    case 142: self = .clearPhpMetadataNamespace
+    case 143: self = .clearPhpNamespace
+    case 144: self = .clearPositiveIntValue
+    case 145: self = .clearProto3Optional
+    case 146: self = .clearPyGenericServices
+    case 147: self = .clearRepeated
+    case 148: self = .clearRepeatedFieldEncoding
+    case 149: self = .clearReserved
+    case 150: self = .clearRetention
+    case 151: self = .clearRubyPackage
+    case 152: self = .clearSemantic
+    case 153: self = .clearServerStreaming
+    case 154: self = .clearSourceCodeInfo
+    case 155: self = .clearSourceContext
+    case 156: self = .clearSourceFile
+    case 157: self = .clearStart
+    case 158: self = .clearStringValue
+    case 159: self = .clearSwiftPrefix
+    case 160: self = .clearSyntax
+    case 161: self = .clearTrailingComments
+    case 162: self = .clearType
+    case 163: self = .clearTypeName
+    case 164: self = .clearUnverifiedLazy
+    case 165: self = .clearUtf8Validation
+    case 166: self = .clearValue
+    case 167: self = .clearVerification
+    case 168: self = .clearWeak
+    case 169: self = .clientStreaming
+    case 170: self = .code
+    case 171: self = .codePoint
+    case 172: self = .codeUnits
+    case 173: self = .collection
+    case 174: self = .com
+    case 175: self = .comma
+    case 176: self = .consumedBytes
+    case 177: self = .contains
+    case 178: self = .contentsOf
+    case 179: self = .contiguousBytes
+    case 180: self = .copy
+    case 181: self = .count
+    case 182: self = .countVarintsInBuffer
+    case 183: self = .csharpNamespace
+    case 184: self = .ctype
+    case 185: self = .customCodable
+    case 186: self = .customDebugStringConvertible
+    case 187: self = .customStringConvertible
+    case 188: self = .d
+    case 189: self = .data
+    case 190: self = .dataResult
+    case 191: self = .date
+    case 192: self = .daySec
+    case 193: self = .daysSinceEpoch
+    case 194: self = .debugDescription_
+    case 195: self = .debugRedact
+    case 196: self = .declaration
+    case 197: self = .decoded
+    case 198: self = .decodedFromJsonnull
+    case 199: self = .decodeExtensionField
+    case 200: self = .decodeExtensionFieldsAsMessageSet
+    case 201: self = .decodeJson
+    case 202: self = .decodeMapField
+    case 203: self = .decodeMessage
+    case 204: self = .decoder
+    case 205: self = .decodeRepeated
+    case 206: self = .decodeRepeatedBoolField
+    case 207: self = .decodeRepeatedBytesField
+    case 208: self = .decodeRepeatedDoubleField
+    case 209: self = .decodeRepeatedEnumField
+    case 210: self = .decodeRepeatedFixed32Field
+    case 211: self = .decodeRepeatedFixed64Field
+    case 212: self = .decodeRepeatedFloatField
+    case 213: self = .decodeRepeatedGroupField
+    case 214: self = .decodeRepeatedInt32Field
+    case 215: self = .decodeRepeatedInt64Field
+    case 216: self = .decodeRepeatedMessageField
+    case 217: self = .decodeRepeatedSfixed32Field
+    case 218: self = .decodeRepeatedSfixed64Field
+    case 219: self = .decodeRepeatedSint32Field
+    case 220: self = .decodeRepeatedSint64Field
+    case 221: self = .decodeRepeatedStringField
+    case 222: self = .decodeRepeatedUint32Field
+    case 223: self = .decodeRepeatedUint64Field
+    case 224: self = .decodeSingular
+    case 225: self = .decodeSingularBoolField
+    case 226: self = .decodeSingularBytesField
+    case 227: self = .decodeSingularDoubleField
+    case 228: self = .decodeSingularEnumField
+    case 229: self = .decodeSingularFixed32Field
+    case 230: self = .decodeSingularFixed64Field
+    case 231: self = .decodeSingularFloatField
+    case 232: self = .decodeSingularGroupField
+    case 233: self = .decodeSingularInt32Field
+    case 234: self = .decodeSingularInt64Field
+    case 235: self = .decodeSingularMessageField
+    case 236: self = .decodeSingularSfixed32Field
+    case 237: self = .decodeSingularSfixed64Field
+    case 238: self = .decodeSingularSint32Field
+    case 239: self = .decodeSingularSint64Field
+    case 240: self = .decodeSingularStringField
+    case 241: self = .decodeSingularUint32Field
+    case 242: self = .decodeSingularUint64Field
+    case 243: self = .decodeTextFormat
+    case 244: self = .defaultAnyTypeUrlprefix
+    case 245: self = .defaults
+    case 246: self = .defaultValue
+    case 247: self = .dependency
+    case 248: self = .deprecated
+    case 249: self = .deprecatedLegacyJsonFieldConflicts
+    case 250: self = .deprecationWarning
+    case 251: self = .description_
+    case 252: self = .descriptorProto
+    case 253: self = .dictionary
+    case 254: self = .dictionaryLiteral
+    case 255: self = .digit
+    case 256: self = .digit0
+    case 257: self = .digit1
+    case 258: self = .digitCount
+    case 259: self = .digits
+    case 260: self = .digitValue
+    case 261: self = .discardableResult
+    case 262: self = .discardUnknownFields
+    case 263: self = .double
+    case 264: self = .doubleValue
+    case 265: self = .duration
+    case 266: self = .e
+    case 267: self = .edition
+    case 268: self = .editionDefault
+    case 269: self = .editionDefaults
+    case 270: self = .editionDeprecated
+    case 271: self = .editionIntroduced
+    case 272: self = .editionRemoved
+    case 273: self = .element
+    case 274: self = .elements
+    case 275: self = .else
+    case 276: self = .emitExtensionFieldName
+    case 277: self = .emitFieldName
+    case 278: self = .emitFieldNumber
+    case 279: self = .empty
+    case 280: self = .emptyAnyTypeURL
+    case 281: self = .emptyData
+    case 282: self = .encodeAsBytes
+    case 283: self = .encoded
+    case 284: self = .encodedJsonstring
+    case 285: self = .encodedSize
+    case 286: self = .encodeField
+    case 287: self = .encoder
+    case 288: self = .end
+    case 289: self = .endArray
+    case 290: self = .endMessageField
+    case 291: self = .endObject
+    case 292: self = .endRegularField
+    case 293: self = .enforceNamingStyle
+    case 294: self = .enum
+    case 295: self = .enumDescriptorProto
+    case 296: self = .enumOptions
+    case 297: self = .enumReservedRange
+    case 298: self = .enumType
+    case 299: self = .enumvalue
+    case 300: self = .enumValueDescriptorProto
+    case 301: self = .enumValueOptions
+    case 302: self = .equatable
+    case 303: self = .error
+    case 304: self = .expressibleByArrayLiteral
+    case 305: self = .expressibleByDictionaryLiteral
+    case 306: self = .ext
+    case 307: self = .extDecoder
+    case 308: self = .extendedGraphemeClusterLiteral
+    case 309: self = .extendedGraphemeClusterLiteralType
+    case 310: self = .extendee
+    case 311: self = .extensibleMessage
+    case 312: self = .extension
+    case 313: self = .extensionField
+    case 314: self = .extensionFieldNumber
+    case 315: self = .extensionFieldValueSet
+    case 316: self = .extensionMap
+    case 317: self = .extensionRange
+    case 318: self = .extensionRangeOptions
+    case 319: self = .extensions
+    case 320: self = .extras
+    case 321: self = .f
+    case 322: self = .false
+    case 323: self = .features
+    case 324: self = .featureSet
+    case 325: self = .featureSetDefaults
+    case 326: self = .featureSetEditionDefault
+    case 327: self = .featureSupport
+    case 328: self = .field
+    case 329: self = .fieldData
+    case 330: self = .fieldDescriptorProto
+    case 331: self = .fieldMask
+    case 332: self = .fieldMaskError
+    case 333: self = .fieldName
+    case 334: self = .fieldNameCount
+    case 335: self = .fieldNum
+    case 336: self = .fieldNumber
+    case 337: self = .fieldNumberForProto
+    case 338: self = .fieldOptions
+    case 339: self = .fieldPresence
+    case 340: self = .fields
+    case 341: self = .fieldSize
+    case 342: self = .fieldTag
+    case 343: self = .fieldType
+    case 344: self = .file
+    case 345: self = .fileDescriptorProto
+    case 346: self = .fileDescriptorSet
+    case 347: self = .fileName
+    case 348: self = .fileOptions
+    case 349: self = .filter
+    case 350: self = .final
+    case 351: self = .finiteOnly
+    case 352: self = .first
+    case 353: self = .firstItem
+    case 354: self = .fixedFeatures
+    case 355: self = .float
+    case 356: self = .floatLiteral
+    case 357: self = .floatLiteralType
+    case 358: self = .floatValue
+    case 359: self = .for
+    case 360: self = .forMessageName
+    case 361: self = .formUnion
+    case 362: self = .forReadingFrom
+    case 363: self = .forTypeURL
+    case 364: self = .forwardParser
+    case 365: self = .forWritingInto
+    case 366: self = .from
+    case 367: self = .fromAscii2
+    case 368: self = .fromAscii4
+    case 369: self = .fromByteOffset
+    case 370: self = .fromHexDigit
+    case 371: self = .fullName
+    case 372: self = .func
+    case 373: self = .function
+    case 374: self = .g
+    case 375: self = .generatedCodeInfo
+    case 376: self = .get
+    case 377: self = .getExtensionValue
+    case 378: self = .googleapis
+    case 379: self = .googleProtobufAny
+    case 380: self = .googleProtobufApi
+    case 381: self = .googleProtobufBoolValue
+    case 382: self = .googleProtobufBytesValue
+    case 383: self = .googleProtobufDescriptorProto
+    case 384: self = .googleProtobufDoubleValue
+    case 385: self = .googleProtobufDuration
+    case 386: self = .googleProtobufEdition
+    case 387: self = .googleProtobufEmpty
+    case 388: self = .googleProtobufEnum
+    case 389: self = .googleProtobufEnumDescriptorProto
+    case 390: self = .googleProtobufEnumOptions
+    case 391: self = .googleProtobufEnumValue
+    case 392: self = .googleProtobufEnumValueDescriptorProto
+    case 393: self = .googleProtobufEnumValueOptions
+    case 394: self = .googleProtobufExtensionRangeOptions
+    case 395: self = .googleProtobufFeatureSet
+    case 396: self = .googleProtobufFeatureSetDefaults
+    case 397: self = .googleProtobufField
+    case 398: self = .googleProtobufFieldDescriptorProto
+    case 399: self = .googleProtobufFieldMask
+    case 400: self = .googleProtobufFieldOptions
+    case 401: self = .googleProtobufFileDescriptorProto
+    case 402: self = .googleProtobufFileDescriptorSet
+    case 403: self = .googleProtobufFileOptions
+    case 404: self = .googleProtobufFloatValue
+    case 405: self = .googleProtobufGeneratedCodeInfo
+    case 406: self = .googleProtobufInt32Value
+    case 407: self = .googleProtobufInt64Value
+    case 408: self = .googleProtobufListValue
+    case 409: self = .googleProtobufMessageOptions
+    case 410: self = .googleProtobufMethod
+    case 411: self = .googleProtobufMethodDescriptorProto
+    case 412: self = .googleProtobufMethodOptions
+    case 413: self = .googleProtobufMixin
+    case 414: self = .googleProtobufNullValue
+    case 415: self = .googleProtobufOneofDescriptorProto
+    case 416: self = .googleProtobufOneofOptions
+    case 417: self = .googleProtobufOption
+    case 418: self = .googleProtobufServiceDescriptorProto
+    case 419: self = .googleProtobufServiceOptions
+    case 420: self = .googleProtobufSourceCodeInfo
+    case 421: self = .googleProtobufSourceContext
+    case 422: self = .googleProtobufStringValue
+    case 423: self = .googleProtobufStruct
+    case 424: self = .googleProtobufSyntax
+    case 425: self = .googleProtobufTimestamp
+    case 426: self = .googleProtobufType
+    case 427: self = .googleProtobufUint32Value
+    case 428: self = .googleProtobufUint64Value
+    case 429: self = .googleProtobufUninterpretedOption
+    case 430: self = .googleProtobufValue
+    case 431: self = .goPackage
+    case 432: self = .group
+    case 433: self = .groupFieldNumberStack
+    case 434: self = .groupSize
+    case 435: self = .guard
+    case 436: self = .hadOneofValue
+    case 437: self = .handleConflictingOneOf
+    case 438: self = .hasAggregateValue
+    case 439: self = .hasAllowAlias
+    case 440: self = .hasBegin
+    case 441: self = .hasCcEnableArenas
+    case 442: self = .hasCcGenericServices
+    case 443: self = .hasClientStreaming
+    case 444: self = .hasCsharpNamespace
+    case 445: self = .hasCtype
+    case 446: self = .hasDebugRedact
+    case 447: self = .hasDefaultValue
+    case 448: self = .hasDeprecated
+    case 449: self = .hasDeprecatedLegacyJsonFieldConflicts
+    case 450: self = .hasDeprecationWarning
+    case 451: self = .hasDoubleValue
+    case 452: self = .hasEdition
+    case 453: self = .hasEditionDeprecated
+    case 454: self = .hasEditionIntroduced
+    case 455: self = .hasEditionRemoved
+    case 456: self = .hasEnd
+    case 457: self = .hasEnforceNamingStyle
+    case 458: self = .hasEnumType
+    case 459: self = .hasExtendee
+    case 460: self = .hasExtensionValue
+    case 461: self = .hasFeatures
+    case 462: self = .hasFeatureSupport
+    case 463: self = .hasFieldPresence
+    case 464: self = .hasFixedFeatures
+    case 465: self = .hasFullName
+    case 466: self = .hasGoPackage
+    case 467: self = .hash
+    case 468: self = .hashable
+    case 469: self = .hasher
+    case 470: self = .hashVisitor
+    case 471: self = .hasIdempotencyLevel
+    case 472: self = .hasIdentifierValue
+    case 473: self = .hasInputType
+    case 474: self = .hasIsExtension
+    case 475: self = .hasJavaGenerateEqualsAndHash
+    case 476: self = .hasJavaGenericServices
+    case 477: self = .hasJavaMultipleFiles
+    case 478: self = .hasJavaOuterClassname
+    case 479: self = .hasJavaPackage
+    case 480: self = .hasJavaStringCheckUtf8
+    case 481: self = .hasJsonFormat
+    case 482: self = .hasJsonName
+    case 483: self = .hasJstype
+    case 484: self = .hasLabel
+    case 485: self = .hasLazy
+    case 486: self = .hasLeadingComments
+    case 487: self = .hasMapEntry
+    case 488: self = .hasMaximumEdition
+    case 489: self = .hasMessageEncoding
+    case 490: self = .hasMessageSetWireFormat
+    case 491: self = .hasMinimumEdition
+    case 492: self = .hasName
+    case 493: self = .hasNamePart
+    case 494: self = .hasNegativeIntValue
+    case 495: self = .hasNoStandardDescriptorAccessor
+    case 496: self = .hasNumber
+    case 497: self = .hasObjcClassPrefix
+    case 498: self = .hasOneofIndex
+    case 499: self = .hasOptimizeFor
+    case 500: self = .hasOptions
+    case 501: self = .hasOutputType
+    case 502: self = .hasOverridableFeatures
+    case 503: self = .hasPackage
+    case 504: self = .hasPacked
+    case 505: self = .hasPhpClassPrefix
+    case 506: self = .hasPhpMetadataNamespace
+    case 507: self = .hasPhpNamespace
+    case 508: self = .hasPositiveIntValue
+    case 509: self = .hasProto3Optional
+    case 510: self = .hasPyGenericServices
+    case 511: self = .hasRepeated
+    case 512: self = .hasRepeatedFieldEncoding
+    case 513: self = .hasReserved
+    case 514: self = .hasRetention
+    case 515: self = .hasRubyPackage
+    case 516: self = .hasSemantic
+    case 517: self = .hasServerStreaming
+    case 518: self = .hasSourceCodeInfo
+    case 519: self = .hasSourceContext
+    case 520: self = .hasSourceFile
+    case 521: self = .hasStart
+    case 522: self = .hasStringValue
+    case 523: self = .hasSwiftPrefix
+    case 524: self = .hasSyntax
+    case 525: self = .hasTrailingComments
+    case 526: self = .hasType
+    case 527: self = .hasTypeName
+    case 528: self = .hasUnverifiedLazy
+    case 529: self = .hasUtf8Validation
+    case 530: self = .hasValue
+    case 531: self = .hasVerification
+    case 532: self = .hasWeak
+    case 533: self = .hour
+    case 534: self = .i
+    case 535: self = .idempotencyLevel
+    case 536: self = .identifierValue
+    case 537: self = .if
+    case 538: self = .ignoreUnknownExtensionFields
+    case 539: self = .ignoreUnknownFields
+    case 540: self = .index
+    case 541: self = .init_
+    case 542: self = .inout
+    case 543: self = .inputType
+    case 544: self = .insert
+    case 545: self = .int
+    case 546: self = .int32
+    case 547: self = .int32Value
+    case 548: self = .int64
+    case 549: self = .int64Value
+    case 550: self = .int8
+    case 551: self = .integerLiteral
+    case 552: self = .integerLiteralType
+    case 553: self = .intern
+    case 554: self = .internal
+    case 555: self = .internalState
+    case 556: self = .intersect
+    case 557: self = .into
+    case 558: self = .ints
+    case 559: self = .invalidAnyTypeURL
+    case 560: self = .isA
+    case 561: self = .isEqual
+    case 562: self = .isEqualTo
+    case 563: self = .isExtension
+    case 564: self = .isInitialized
+    case 565: self = .isNegative
+    case 566: self = .isPathValid
+    case 567: self = .isValid
+    case 568: self = .itemTagsEncodedSize
+    case 569: self = .iterator
+    case 570: self = .javaGenerateEqualsAndHash
+    case 571: self = .javaGenericServices
+    case 572: self = .javaMultipleFiles
+    case 573: self = .javaOuterClassname
+    case 574: self = .javaPackage
+    case 575: self = .javaStringCheckUtf8
+    case 576: self = .jsondecoder
+    case 577: self = .jsondecoding
+    case 578: self = .jsondecodingError
+    case 579: self = .jsondecodingOptions
+    case 580: self = .jsonEncoder
+    case 581: self = .jsonencoding
+    case 582: self = .jsonencodingError
+    case 583: self = .jsonencodingOptions
+    case 584: self = .jsonencodingVisitor
+    case 585: self = .jsonFormat
+    case 586: self = .jsonmapEncodingVisitor
+    case 587: self = .jsonName
+    case 588: self = .jsonPath
+    case 589: self = .jsonPaths
+    case 590: self = .jsonscanner
+    case 591: self = .jsonString
+    case 592: self = .jsonText
+    case 593: self = .jsonUtf8Bytes
+    case 594: self = .jsonUtf8Data
+    case 595: self = .jstype
+    case 596: self = .k
+    case 597: self = .kChunkSize
+    case 598: self = .key
+    case 599: self = .keyField
+    case 600: self = .keyFieldOpt
+    case 601: self = .keyType
+    case 602: self = .kind
+    case 603: self = .l
+    case 604: self = .label
+    case 605: self = .lazy
+    case 606: self = .leadingComments
+    case 607: self = .leadingDetachedComments
+    case 608: self = .length
+    case 609: self = .lessThan
+    case 610: self = .let
+    case 611: self = .lhs
+    case 612: self = .line
+    case 613: self = .list
+    case 614: self = .listOfMessages
+    case 615: self = .listValue
+    case 616: self = .littleEndian
+    case 617: self = .load
+    case 618: self = .localHasher
+    case 619: self = .location
+    case 620: self = .m
+    case 621: self = .major
+    case 622: self = .makeAsyncIterator
+    case 623: self = .makeIterator
+    case 624: self = .malformedLength
+    case 625: self = .mapEntry
+    case 626: self = .mapKeyType
+    case 627: self = .mapToMessages
+    case 628: self = .mapValueType
+    case 629: self = .mapVisitor
+    case 630: self = .mask
+    case 631: self = .maximumEdition
+    case 632: self = .mdayStart
+    case 633: self = .merge
+    case 634: self = .mergeOptions
+    case 635: self = .message
+    case 636: self = .messageDepthLimit
+    case 637: self = .messageEncoding
+    case 638: self = .messageExtension
+    case 639: self = .messageImplementationBase
+    case 640: self = .messageOptions
+    case 641: self = .messageSet
+    case 642: self = .messageSetWireFormat
+    case 643: self = .messageSize
+    case 644: self = .messageType
+    case 645: self = .method
+    case 646: self = .methodDescriptorProto
+    case 647: self = .methodOptions
+    case 648: self = .methods
+    case 649: self = .min
+    case 650: self = .minimumEdition
+    case 651: self = .minor
+    case 652: self = .mixin
+    case 653: self = .mixins
+    case 654: self = .modify
+    case 655: self = .month
+    case 656: self = .msgExtension
+    case 657: self = .mutating
+    case 658: self = .n
+    case 659: self = .name
+    case 660: self = .nameDescription
+    case 661: self = .nameMap
+    case 662: self = .namePart
+    case 663: self = .names
+    case 664: self = .nanos
+    case 665: self = .negativeIntValue
+    case 666: self = .nestedType
+    case 667: self = .newExtensible
+    case 668: self = .newL
+    case 669: self = .newList
+    case 670: self = .newMessage
+    case 671: self = .newValue
+    case 672: self = .next
+    case 673: self = .nextByte
+    case 674: self = .nextFieldNumber
+    case 675: self = .nextVarInt
+    case 676: self = .nil
+    case 677: self = .nilLiteral
+    case 678: self = .noBytesAvailable
+    case 679: self = .noStandardDescriptorAccessor
+    case 680: self = .nullValue
+    case 681: self = .number
+    case 682: self = .numberValue
+    case 683: self = .objcClassPrefix
+    case 684: self = .of
+    case 685: self = .oneofDecl
+    case 686: self = .oneofDescriptorProto
+    case 687: self = .oneofIndex
+    case 688: self = .oneofOptions
+    case 689: self = .oneofs
+    case 690: self = .oneOfKind
+    case 691: self = .optimizeFor
+    case 692: self = .optimizeMode
+    case 693: self = .option
+    case 694: self = .optionalEnumExtensionField
+    case 695: self = .optionalExtensionField
+    case 696: self = .optionalGroupExtensionField
+    case 697: self = .optionalMessageExtensionField
+    case 698: self = .optionRetention
+    case 699: self = .options
+    case 700: self = .optionTargetType
+    case 701: self = .other
+    case 702: self = .others
+    case 703: self = .out
+    case 704: self = .outputType
+    case 705: self = .overridableFeatures
+    case 706: self = .p
+    case 707: self = .package
+    case 708: self = .packed
+    case 709: self = .packedEnumExtensionField
+    case 710: self = .packedExtensionField
+    case 711: self = .padding
+    case 712: self = .parent
+    case 713: self = .parse
+    case 714: self = .partial
+    case 715: self = .path
+    case 716: self = .pathDecoder
+    case 717: self = .pathDecodingError
+    case 718: self = .paths
+    case 719: self = .pathVisitor
+    case 720: self = .payload
+    case 721: self = .payloadSize
+    case 722: self = .phpClassPrefix
+    case 723: self = .phpMetadataNamespace
+    case 724: self = .phpNamespace
+    case 725: self = .pos
+    case 726: self = .positiveIntValue
+    case 727: self = .prefix
+    case 728: self = .preserveProtoFieldNames
+    case 729: self = .preTraverse
+    case 730: self = .prevPath
+    case 731: self = .printUnknownFields
+    case 732: self = .proto2
+    case 733: self = .proto3DefaultValue
+    case 734: self = .proto3Optional
+    case 735: self = .protobufApiversionCheck
+    case 736: self = .protobufApiversion2
+    case 737: self = .protobufBool
+    case 738: self = .protobufBytes
+    case 739: self = .protobufDouble
+    case 740: self = .protobufEnumMap
+    case 741: self = .protobufExtension
+    case 742: self = .protobufFixed32
+    case 743: self = .protobufFixed64
+    case 744: self = .protobufFloat
+    case 745: self = .protobufInt32
+    case 746: self = .protobufInt64
+    case 747: self = .protobufMap
+    case 748: self = .protobufMessageMap
+    case 749: self = .protobufSfixed32
+    case 750: self = .protobufSfixed64
+    case 751: self = .protobufSint32
+    case 752: self = .protobufSint64
+    case 753: self = .protobufString
+    case 754: self = .protobufUint32
+    case 755: self = .protobufUint64
+    case 756: self = .protobufExtensionFieldValues
+    case 757: self = .protobufFieldNumber
+    case 758: self = .protobufGeneratedIsEqualTo
+    case 759: self = .protobufNameMap
+    case 760: self = .protobufNewField
+    case 761: self = .protobufPackage
+    case 762: self = .protocol
+    case 763: self = .protoFieldName
+    case 764: self = .protoMessageName
+    case 765: self = .protoNameProviding
+    case 766: self = .protoPaths
+    case 767: self = .public
+    case 768: self = .publicDependency
+    case 769: self = .putBoolValue
+    case 770: self = .putBytesValue
+    case 771: self = .putDoubleValue
+    case 772: self = .putEnumValue
+    case 773: self = .putFixedUint32
+    case 774: self = .putFixedUint64
+    case 775: self = .putFloatValue
+    case 776: self = .putInt64
+    case 777: self = .putStringValue
+    case 778: self = .putUint64
+    case 779: self = .putUint64Hex
+    case 780: self = .putVarInt
+    case 781: self = .putZigZagVarInt
+    case 782: self = .pyGenericServices
+    case 783: self = .r
+    case 784: self = .rawChars
+    case 785: self = .rawRepresentable
+    case 786: self = .rawValue_
+    case 787: self = .read4HexDigits
+    case 788: self = .readBytes
+    case 789: self = .register
+    case 790: self = .removingAllFieldsOf
+    case 791: self = .repeated
+    case 792: self = .repeatedEnumExtensionField
+    case 793: self = .repeatedExtensionField
+    case 794: self = .repeatedFieldEncoding
+    case 795: self = .repeatedGroupExtensionField
+    case 796: self = .repeatedMessageExtensionField
+    case 797: self = .repeating
+    case 798: self = .replaceRepeatedFields
+    case 799: self = .requestStreaming
+    case 800: self = .requestTypeURL
+    case 801: self = .requiredSize
+    case 802: self = .responseStreaming
+    case 803: self = .responseTypeURL
+    case 804: self = .result
+    case 805: self = .retention
+    case 806: self = .rethrows
+    case 807: self = .return
+    case 808: self = .returnType
+    case 809: self = .revision
+    case 810: self = .rhs
+    case 811: self = .root
+    case 812: self = .rubyPackage
+    case 813: self = .s
+    case 814: self = .sawBackslash
+    case 815: self = .sawSection4Characters
+    case 816: self = .sawSection5Characters
+    case 817: self = .scan
+    case 818: self = .scanner
+    case 819: self = .seconds
+    case 820: self = .self_
+    case 821: self = .semantic
+    case 822: self = .sendable
+    case 823: self = .separator
+    case 824: self = .serialize
+    case 825: self = .serializedBytes
+    case 826: self = .serializedData
+    case 827: self = .serializedSize
+    case 828: self = .serverStreaming
+    case 829: self = .service
+    case 830: self = .serviceDescriptorProto
+    case 831: self = .serviceOptions
+    case 832: self = .set
+    case 833: self = .setExtensionValue
+    case 834: self = .shift
+    case 835: self = .simpleExtensionMap
+    case 836: self = .size
+    case 837: self = .sizer
+    case 838: self = .source
+    case 839: self = .sourceCodeInfo
+    case 840: self = .sourceContext
+    case 841: self = .sourceEncoding
+    case 842: self = .sourceFile
+    case 843: self = .sourceLocation
+    case 844: self = .span
+    case 845: self = .split
+    case 846: self = .start
+    case 847: self = .startArray
+    case 848: self = .startArrayObject
+    case 849: self = .startField
+    case 850: self = .startIndex
+    case 851: self = .startMessageField
+    case 852: self = .startObject
+    case 853: self = .startRegularField
+    case 854: self = .state
+    case 855: self = .static
+    case 856: self = .staticString
+    case 857: self = .storage
+    case 858: self = .string
+    case 859: self = .stringLiteral
+    case 860: self = .stringLiteralType
+    case 861: self = .stringResult
+    case 862: self = .stringValue
+    case 863: self = .struct
+    case 864: self = .structValue
+    case 865: self = .subDecoder
+    case 866: self = .subscript
+    case 867: self = .subtract
+    case 868: self = .subVisitor
+    case 869: self = .swift
+    case 870: self = .swiftPrefix
+    case 871: self = .swiftProtobufContiguousBytes
+    case 872: self = .swiftProtobufError
+    case 873: self = .syntax
+    case 874: self = .t
+    case 875: self = .tag
+    case 876: self = .targets
+    case 877: self = .terminator
+    case 878: self = .testDecoder
+    case 879: self = .text
+    case 880: self = .textDecoder
+    case 881: self = .textFormatDecoder
+    case 882: self = .textFormatDecodingError
+    case 883: self = .textFormatDecodingOptions
+    case 884: self = .textFormatEncodingOptions
+    case 885: self = .textFormatEncodingVisitor
+    case 886: self = .textFormatString
+    case 887: self = .throwOrIgnore
+    case 888: self = .throws
+    case 889: self = .timeInterval
+    case 890: self = .timeIntervalSince1970
+    case 891: self = .timeIntervalSinceReferenceDate
+    case 892: self = .timestamp
+    case 893: self = .tmp
+    case 894: self = .tooLarge
+    case 895: self = .total
+    case 896: self = .totalArrayDepth
+    case 897: self = .totalSize
+    case 898: self = .trailingComments
+    case 899: self = .traverse
+    case 900: self = .trim
+    case 901: self = .true
+    case 902: self = .try
+    case 903: self = .type
+    case 904: self = .typealias
+    case 905: self = .typeEnum
+    case 906: self = .typeName
+    case 907: self = .typePrefix
+    case 908: self = .typeStart
+    case 909: self = .typeUnknown
+    case 910: self = .typeURL
+    case 911: self = .uint32
+    case 912: self = .uint32Value
+    case 913: self = .uint64
+    case 914: self = .uint64Value
+    case 915: self = .uint8
+    case 916: self = .unchecked
+    case 917: self = .unicodeScalarLiteral
+    case 918: self = .unicodeScalarLiteralType
+    case 919: self = .unicodeScalars
+    case 920: self = .unicodeScalarView
+    case 921: self = .uninterpretedOption
+    case 922: self = .union
+    case 923: self = .uniqueStorage
+    case 924: self = .unknown
+    case 925: self = .unknownFields
+    case 926: self = .unknownStorage
+    case 927: self = .unpackTo
+    case 928: self = .unsafeBufferPointer
+    case 929: self = .unsafeMutablePointer
+    case 930: self = .unsafeMutableRawBufferPointer
+    case 931: self = .unsafeRawBufferPointer
+    case 932: self = .unsafeRawPointer
+    case 933: self = .unverifiedLazy
+    case 934: self = .updatedOptions
+    case 935: self = .url
+    case 936: self = .useDeterministicOrdering
+    case 937: self = .utf8
+    case 938: self = .utf8Ptr
+    case 939: self = .utf8ToDouble
+    case 940: self = .utf8Validation
+    case 941: self = .utf8View
+    case 942: self = .v
+    case 943: self = .value
+    case 944: self = .valueField
+    case 945: self = .values
+    case 946: self = .valueType
+    case 947: self = .var
+    case 948: self = .verification
+    case 949: self = .verificationState
+    case 950: self = .version
+    case 951: self = .versionString
+    case 952: self = .visitExtensionFields
+    case 953: self = .visitExtensionFieldsAsMessageSet
+    case 954: self = .visitMapField
+    case 955: self = .visitor
+    case 956: self = .visitPacked
+    case 957: self = .visitPackedBoolField
+    case 958: self = .visitPackedDoubleField
+    case 959: self = .visitPackedEnumField
+    case 960: self = .visitPackedFixed32Field
+    case 961: self = .visitPackedFixed64Field
+    case 962: self = .visitPackedFloatField
+    case 963: self = .visitPackedInt32Field
+    case 964: self = .visitPackedInt64Field
+    case 965: self = .visitPackedSfixed32Field
+    case 966: self = .visitPackedSfixed64Field
+    case 967: self = .visitPackedSint32Field
+    case 968: self = .visitPackedSint64Field
+    case 969: self = .visitPackedUint32Field
+    case 970: self = .visitPackedUint64Field
+    case 971: self = .visitRepeated
+    case 972: self = .visitRepeatedBoolField
+    case 973: self = .visitRepeatedBytesField
+    case 974: self = .visitRepeatedDoubleField
+    case 975: self = .visitRepeatedEnumField
+    case 976: self = .visitRepeatedFixed32Field
+    case 977: self = .visitRepeatedFixed64Field
+    case 978: self = .visitRepeatedFloatField
+    case 979: self = .visitRepeatedGroupField
+    case 980: self = .visitRepeatedInt32Field
+    case 981: self = .visitRepeatedInt64Field
+    case 982: self = .visitRepeatedMessageField
+    case 983: self = .visitRepeatedSfixed32Field
+    case 984: self = .visitRepeatedSfixed64Field
+    case 985: self = .visitRepeatedSint32Field
+    case 986: self = .visitRepeatedSint64Field
+    case 987: self = .visitRepeatedStringField
+    case 988: self = .visitRepeatedUint32Field
+    case 989: self = .visitRepeatedUint64Field
+    case 990: self = .visitSingular
+    case 991: self = .visitSingularBoolField
+    case 992: self = .visitSingularBytesField
+    case 993: self = .visitSingularDoubleField
+    case 994: self = .visitSingularEnumField
+    case 995: self = .visitSingularFixed32Field
+    case 996: self = .visitSingularFixed64Field
+    case 997: self = .visitSingularFloatField
+    case 998: self = .visitSingularGroupField
+    case 999: self = .visitSingularInt32Field
+    case 1000: self = .visitSingularInt64Field
+    case 1001: self = .visitSingularMessageField
+    case 1002: self = .visitSingularSfixed32Field
+    case 1003: self = .visitSingularSfixed64Field
+    case 1004: self = .visitSingularSint32Field
+    case 1005: self = .visitSingularSint64Field
+    case 1006: self = .visitSingularStringField
+    case 1007: self = .visitSingularUint32Field
+    case 1008: self = .visitSingularUint64Field
+    case 1009: self = .visitUnknown
+    case 1010: self = .wasDecoded
+    case 1011: self = .weak
+    case 1012: self = .weakDependency
+    case 1013: self = .where
+    case 1014: self = .wireFormat
+    case 1015: self = .with
+    case 1016: self = .withUnsafeBytes
+    case 1017: self = .withUnsafeMutableBytes
+    case 1018: self = .work
+    case 1019: self = .wrapped
+    case 1020: self = .wrappedType
+    case 1021: self = .wrappedValue
+    case 1022: self = .written
+    case 1023: self = .yday
     default: self = .UNRECOGNIZED(rawValue)
     }
   }
@@ -2171,932 +2185,939 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .clearEditionIntroduced: return 94
     case .clearEditionRemoved: return 95
     case .clearEnd: return 96
-    case .clearEnumType: return 97
-    case .clearExtendee: return 98
-    case .clearExtensionValue: return 99
-    case .clearFeatures: return 100
-    case .clearFeatureSupport: return 101
-    case .clearFieldPresence: return 102
-    case .clearFixedFeatures: return 103
-    case .clearFullName: return 104
-    case .clearGoPackage: return 105
-    case .clearIdempotencyLevel: return 106
-    case .clearIdentifierValue: return 107
-    case .clearInputType: return 108
-    case .clearIsExtension: return 109
-    case .clearJavaGenerateEqualsAndHash: return 110
-    case .clearJavaGenericServices: return 111
-    case .clearJavaMultipleFiles: return 112
-    case .clearJavaOuterClassname: return 113
-    case .clearJavaPackage: return 114
-    case .clearJavaStringCheckUtf8: return 115
-    case .clearJsonFormat: return 116
-    case .clearJsonName: return 117
-    case .clearJstype: return 118
-    case .clearLabel: return 119
-    case .clearLazy: return 120
-    case .clearLeadingComments: return 121
-    case .clearMapEntry: return 122
-    case .clearMaximumEdition: return 123
-    case .clearMessageEncoding: return 124
-    case .clearMessageSetWireFormat: return 125
-    case .clearMinimumEdition: return 126
-    case .clearName: return 127
-    case .clearNamePart: return 128
-    case .clearNegativeIntValue: return 129
-    case .clearNoStandardDescriptorAccessor: return 130
-    case .clearNumber: return 131
-    case .clearObjcClassPrefix: return 132
-    case .clearOneofIndex: return 133
-    case .clearOptimizeFor: return 134
-    case .clearOptions: return 135
-    case .clearOutputType: return 136
-    case .clearOverridableFeatures: return 137
-    case .clearPackage: return 138
-    case .clearPacked: return 139
-    case .clearPhpClassPrefix: return 140
-    case .clearPhpMetadataNamespace: return 141
-    case .clearPhpNamespace: return 142
-    case .clearPositiveIntValue: return 143
-    case .clearProto3Optional: return 144
-    case .clearPyGenericServices: return 145
-    case .clearRepeated: return 146
-    case .clearRepeatedFieldEncoding: return 147
-    case .clearReserved: return 148
-    case .clearRetention: return 149
-    case .clearRubyPackage: return 150
-    case .clearSemantic: return 151
-    case .clearServerStreaming: return 152
-    case .clearSourceCodeInfo: return 153
-    case .clearSourceContext: return 154
-    case .clearSourceFile: return 155
-    case .clearStart: return 156
-    case .clearStringValue: return 157
-    case .clearSwiftPrefix: return 158
-    case .clearSyntax: return 159
-    case .clearTrailingComments: return 160
-    case .clearType: return 161
-    case .clearTypeName: return 162
-    case .clearUnverifiedLazy: return 163
-    case .clearUtf8Validation: return 164
-    case .clearValue: return 165
-    case .clearVerification: return 166
-    case .clearWeak: return 167
-    case .clientStreaming: return 168
-    case .code: return 169
-    case .codePoint: return 170
-    case .codeUnits: return 171
-    case .collection: return 172
-    case .com: return 173
-    case .comma: return 174
-    case .consumedBytes: return 175
-    case .contains: return 176
-    case .contentsOf: return 177
-    case .contiguousBytes: return 178
-    case .copy: return 179
-    case .count: return 180
-    case .countVarintsInBuffer: return 181
-    case .csharpNamespace: return 182
-    case .ctype: return 183
-    case .customCodable: return 184
-    case .customDebugStringConvertible: return 185
-    case .customStringConvertible: return 186
-    case .d: return 187
-    case .data: return 188
-    case .dataResult: return 189
-    case .date: return 190
-    case .daySec: return 191
-    case .daysSinceEpoch: return 192
-    case .debugDescription_: return 193
-    case .debugRedact: return 194
-    case .declaration: return 195
-    case .decoded: return 196
-    case .decodedFromJsonnull: return 197
-    case .decodeExtensionField: return 198
-    case .decodeExtensionFieldsAsMessageSet: return 199
-    case .decodeJson: return 200
-    case .decodeMapField: return 201
-    case .decodeMessage: return 202
-    case .decoder: return 203
-    case .decodeRepeated: return 204
-    case .decodeRepeatedBoolField: return 205
-    case .decodeRepeatedBytesField: return 206
-    case .decodeRepeatedDoubleField: return 207
-    case .decodeRepeatedEnumField: return 208
-    case .decodeRepeatedFixed32Field: return 209
-    case .decodeRepeatedFixed64Field: return 210
-    case .decodeRepeatedFloatField: return 211
-    case .decodeRepeatedGroupField: return 212
-    case .decodeRepeatedInt32Field: return 213
-    case .decodeRepeatedInt64Field: return 214
-    case .decodeRepeatedMessageField: return 215
-    case .decodeRepeatedSfixed32Field: return 216
-    case .decodeRepeatedSfixed64Field: return 217
-    case .decodeRepeatedSint32Field: return 218
-    case .decodeRepeatedSint64Field: return 219
-    case .decodeRepeatedStringField: return 220
-    case .decodeRepeatedUint32Field: return 221
-    case .decodeRepeatedUint64Field: return 222
-    case .decodeSingular: return 223
-    case .decodeSingularBoolField: return 224
-    case .decodeSingularBytesField: return 225
-    case .decodeSingularDoubleField: return 226
-    case .decodeSingularEnumField: return 227
-    case .decodeSingularFixed32Field: return 228
-    case .decodeSingularFixed64Field: return 229
-    case .decodeSingularFloatField: return 230
-    case .decodeSingularGroupField: return 231
-    case .decodeSingularInt32Field: return 232
-    case .decodeSingularInt64Field: return 233
-    case .decodeSingularMessageField: return 234
-    case .decodeSingularSfixed32Field: return 235
-    case .decodeSingularSfixed64Field: return 236
-    case .decodeSingularSint32Field: return 237
-    case .decodeSingularSint64Field: return 238
-    case .decodeSingularStringField: return 239
-    case .decodeSingularUint32Field: return 240
-    case .decodeSingularUint64Field: return 241
-    case .decodeTextFormat: return 242
-    case .defaultAnyTypeUrlprefix: return 243
-    case .defaults: return 244
-    case .defaultValue: return 245
-    case .dependency: return 246
-    case .deprecated: return 247
-    case .deprecatedLegacyJsonFieldConflicts: return 248
-    case .deprecationWarning: return 249
-    case .description_: return 250
-    case .descriptorProto: return 251
-    case .dictionary: return 252
-    case .dictionaryLiteral: return 253
-    case .digit: return 254
-    case .digit0: return 255
-    case .digit1: return 256
-    case .digitCount: return 257
-    case .digits: return 258
-    case .digitValue: return 259
-    case .discardableResult: return 260
-    case .discardUnknownFields: return 261
-    case .double: return 262
-    case .doubleValue: return 263
-    case .duration: return 264
-    case .e: return 265
-    case .edition: return 266
-    case .editionDefault: return 267
-    case .editionDefaults: return 268
-    case .editionDeprecated: return 269
-    case .editionIntroduced: return 270
-    case .editionRemoved: return 271
-    case .element: return 272
-    case .elements: return 273
-    case .else: return 274
-    case .emitExtensionFieldName: return 275
-    case .emitFieldName: return 276
-    case .emitFieldNumber: return 277
-    case .empty: return 278
-    case .emptyData: return 279
-    case .encodeAsBytes: return 280
-    case .encoded: return 281
-    case .encodedJsonstring: return 282
-    case .encodedSize: return 283
-    case .encodeField: return 284
-    case .encoder: return 285
-    case .end: return 286
-    case .endArray: return 287
-    case .endMessageField: return 288
-    case .endObject: return 289
-    case .endRegularField: return 290
-    case .enum: return 291
-    case .enumDescriptorProto: return 292
-    case .enumOptions: return 293
-    case .enumReservedRange: return 294
-    case .enumType: return 295
-    case .enumvalue: return 296
-    case .enumValueDescriptorProto: return 297
-    case .enumValueOptions: return 298
-    case .equatable: return 299
-    case .error: return 300
-    case .expressibleByArrayLiteral: return 301
-    case .expressibleByDictionaryLiteral: return 302
-    case .ext: return 303
-    case .extDecoder: return 304
-    case .extendedGraphemeClusterLiteral: return 305
-    case .extendedGraphemeClusterLiteralType: return 306
-    case .extendee: return 307
-    case .extensibleMessage: return 308
-    case .extension: return 309
-    case .extensionField: return 310
-    case .extensionFieldNumber: return 311
-    case .extensionFieldValueSet: return 312
-    case .extensionMap: return 313
-    case .extensionRange: return 314
-    case .extensionRangeOptions: return 315
-    case .extensions: return 316
-    case .extras: return 317
-    case .f: return 318
-    case .false: return 319
-    case .features: return 320
-    case .featureSet: return 321
-    case .featureSetDefaults: return 322
-    case .featureSetEditionDefault: return 323
-    case .featureSupport: return 324
-    case .field: return 325
-    case .fieldData: return 326
-    case .fieldDescriptorProto: return 327
-    case .fieldMask: return 328
-    case .fieldMaskError: return 329
-    case .fieldName: return 330
-    case .fieldNameCount: return 331
-    case .fieldNum: return 332
-    case .fieldNumber: return 333
-    case .fieldNumberForProto: return 334
-    case .fieldOptions: return 335
-    case .fieldPresence: return 336
-    case .fields: return 337
-    case .fieldSize: return 338
-    case .fieldTag: return 339
-    case .fieldType: return 340
-    case .file: return 341
-    case .fileDescriptorProto: return 342
-    case .fileDescriptorSet: return 343
-    case .fileName: return 344
-    case .fileOptions: return 345
-    case .filter: return 346
-    case .final: return 347
-    case .finiteOnly: return 348
-    case .first: return 349
-    case .firstItem: return 350
-    case .fixedFeatures: return 351
-    case .float: return 352
-    case .floatLiteral: return 353
-    case .floatLiteralType: return 354
-    case .floatValue: return 355
-    case .for: return 356
-    case .forMessageName: return 357
-    case .formUnion: return 358
-    case .forReadingFrom: return 359
-    case .forTypeURL: return 360
-    case .forwardParser: return 361
-    case .forWritingInto: return 362
-    case .from: return 363
-    case .fromAscii2: return 364
-    case .fromAscii4: return 365
-    case .fromByteOffset: return 366
-    case .fromHexDigit: return 367
-    case .fullName: return 368
-    case .func: return 369
-    case .function: return 370
-    case .g: return 371
-    case .generatedCodeInfo: return 372
-    case .get: return 373
-    case .getExtensionValue: return 374
-    case .googleapis: return 375
-    case .googleProtobufAny: return 376
-    case .googleProtobufApi: return 377
-    case .googleProtobufBoolValue: return 378
-    case .googleProtobufBytesValue: return 379
-    case .googleProtobufDescriptorProto: return 380
-    case .googleProtobufDoubleValue: return 381
-    case .googleProtobufDuration: return 382
-    case .googleProtobufEdition: return 383
-    case .googleProtobufEmpty: return 384
-    case .googleProtobufEnum: return 385
-    case .googleProtobufEnumDescriptorProto: return 386
-    case .googleProtobufEnumOptions: return 387
-    case .googleProtobufEnumValue: return 388
-    case .googleProtobufEnumValueDescriptorProto: return 389
-    case .googleProtobufEnumValueOptions: return 390
-    case .googleProtobufExtensionRangeOptions: return 391
-    case .googleProtobufFeatureSet: return 392
-    case .googleProtobufFeatureSetDefaults: return 393
-    case .googleProtobufField: return 394
-    case .googleProtobufFieldDescriptorProto: return 395
-    case .googleProtobufFieldMask: return 396
-    case .googleProtobufFieldOptions: return 397
-    case .googleProtobufFileDescriptorProto: return 398
-    case .googleProtobufFileDescriptorSet: return 399
-    case .googleProtobufFileOptions: return 400
-    case .googleProtobufFloatValue: return 401
-    case .googleProtobufGeneratedCodeInfo: return 402
-    case .googleProtobufInt32Value: return 403
-    case .googleProtobufInt64Value: return 404
-    case .googleProtobufListValue: return 405
-    case .googleProtobufMessageOptions: return 406
-    case .googleProtobufMethod: return 407
-    case .googleProtobufMethodDescriptorProto: return 408
-    case .googleProtobufMethodOptions: return 409
-    case .googleProtobufMixin: return 410
-    case .googleProtobufNullValue: return 411
-    case .googleProtobufOneofDescriptorProto: return 412
-    case .googleProtobufOneofOptions: return 413
-    case .googleProtobufOption: return 414
-    case .googleProtobufServiceDescriptorProto: return 415
-    case .googleProtobufServiceOptions: return 416
-    case .googleProtobufSourceCodeInfo: return 417
-    case .googleProtobufSourceContext: return 418
-    case .googleProtobufStringValue: return 419
-    case .googleProtobufStruct: return 420
-    case .googleProtobufSyntax: return 421
-    case .googleProtobufTimestamp: return 422
-    case .googleProtobufType: return 423
-    case .googleProtobufUint32Value: return 424
-    case .googleProtobufUint64Value: return 425
-    case .googleProtobufUninterpretedOption: return 426
-    case .googleProtobufValue: return 427
-    case .goPackage: return 428
-    case .group: return 429
-    case .groupFieldNumberStack: return 430
-    case .groupSize: return 431
-    case .guard: return 432
-    case .hadOneofValue: return 433
-    case .handleConflictingOneOf: return 434
-    case .hasAggregateValue: return 435
-    case .hasAllowAlias: return 436
-    case .hasBegin: return 437
-    case .hasCcEnableArenas: return 438
-    case .hasCcGenericServices: return 439
-    case .hasClientStreaming: return 440
-    case .hasCsharpNamespace: return 441
-    case .hasCtype: return 442
-    case .hasDebugRedact: return 443
-    case .hasDefaultValue: return 444
-    case .hasDeprecated: return 445
-    case .hasDeprecatedLegacyJsonFieldConflicts: return 446
-    case .hasDeprecationWarning: return 447
-    case .hasDoubleValue: return 448
-    case .hasEdition: return 449
-    case .hasEditionDeprecated: return 450
-    case .hasEditionIntroduced: return 451
-    case .hasEditionRemoved: return 452
-    case .hasEnd: return 453
-    case .hasEnumType: return 454
-    case .hasExtendee: return 455
-    case .hasExtensionValue: return 456
-    case .hasFeatures: return 457
-    case .hasFeatureSupport: return 458
-    case .hasFieldPresence: return 459
-    case .hasFixedFeatures: return 460
-    case .hasFullName: return 461
-    case .hasGoPackage: return 462
-    case .hash: return 463
-    case .hashable: return 464
-    case .hasher: return 465
-    case .hashVisitor: return 466
-    case .hasIdempotencyLevel: return 467
-    case .hasIdentifierValue: return 468
-    case .hasInputType: return 469
-    case .hasIsExtension: return 470
-    case .hasJavaGenerateEqualsAndHash: return 471
-    case .hasJavaGenericServices: return 472
-    case .hasJavaMultipleFiles: return 473
-    case .hasJavaOuterClassname: return 474
-    case .hasJavaPackage: return 475
-    case .hasJavaStringCheckUtf8: return 476
-    case .hasJsonFormat: return 477
-    case .hasJsonName: return 478
-    case .hasJstype: return 479
-    case .hasLabel: return 480
-    case .hasLazy: return 481
-    case .hasLeadingComments: return 482
-    case .hasMapEntry: return 483
-    case .hasMaximumEdition: return 484
-    case .hasMessageEncoding: return 485
-    case .hasMessageSetWireFormat: return 486
-    case .hasMinimumEdition: return 487
-    case .hasName: return 488
-    case .hasNamePart: return 489
-    case .hasNegativeIntValue: return 490
-    case .hasNoStandardDescriptorAccessor: return 491
-    case .hasNumber: return 492
-    case .hasObjcClassPrefix: return 493
-    case .hasOneofIndex: return 494
-    case .hasOptimizeFor: return 495
-    case .hasOptions: return 496
-    case .hasOutputType: return 497
-    case .hasOverridableFeatures: return 498
-    case .hasPackage: return 499
+    case .clearEnforceNamingStyle: return 97
+    case .clearEnumType: return 98
+    case .clearExtendee: return 99
+    case .clearExtensionValue: return 100
+    case .clearFeatures: return 101
+    case .clearFeatureSupport: return 102
+    case .clearFieldPresence: return 103
+    case .clearFixedFeatures: return 104
+    case .clearFullName: return 105
+    case .clearGoPackage: return 106
+    case .clearIdempotencyLevel: return 107
+    case .clearIdentifierValue: return 108
+    case .clearInputType: return 109
+    case .clearIsExtension: return 110
+    case .clearJavaGenerateEqualsAndHash: return 111
+    case .clearJavaGenericServices: return 112
+    case .clearJavaMultipleFiles: return 113
+    case .clearJavaOuterClassname: return 114
+    case .clearJavaPackage: return 115
+    case .clearJavaStringCheckUtf8: return 116
+    case .clearJsonFormat: return 117
+    case .clearJsonName: return 118
+    case .clearJstype: return 119
+    case .clearLabel: return 120
+    case .clearLazy: return 121
+    case .clearLeadingComments: return 122
+    case .clearMapEntry: return 123
+    case .clearMaximumEdition: return 124
+    case .clearMessageEncoding: return 125
+    case .clearMessageSetWireFormat: return 126
+    case .clearMinimumEdition: return 127
+    case .clearName: return 128
+    case .clearNamePart: return 129
+    case .clearNegativeIntValue: return 130
+    case .clearNoStandardDescriptorAccessor: return 131
+    case .clearNumber: return 132
+    case .clearObjcClassPrefix: return 133
+    case .clearOneofIndex: return 134
+    case .clearOptimizeFor: return 135
+    case .clearOptions: return 136
+    case .clearOutputType: return 137
+    case .clearOverridableFeatures: return 138
+    case .clearPackage: return 139
+    case .clearPacked: return 140
+    case .clearPhpClassPrefix: return 141
+    case .clearPhpMetadataNamespace: return 142
+    case .clearPhpNamespace: return 143
+    case .clearPositiveIntValue: return 144
+    case .clearProto3Optional: return 145
+    case .clearPyGenericServices: return 146
+    case .clearRepeated: return 147
+    case .clearRepeatedFieldEncoding: return 148
+    case .clearReserved: return 149
+    case .clearRetention: return 150
+    case .clearRubyPackage: return 151
+    case .clearSemantic: return 152
+    case .clearServerStreaming: return 153
+    case .clearSourceCodeInfo: return 154
+    case .clearSourceContext: return 155
+    case .clearSourceFile: return 156
+    case .clearStart: return 157
+    case .clearStringValue: return 158
+    case .clearSwiftPrefix: return 159
+    case .clearSyntax: return 160
+    case .clearTrailingComments: return 161
+    case .clearType: return 162
+    case .clearTypeName: return 163
+    case .clearUnverifiedLazy: return 164
+    case .clearUtf8Validation: return 165
+    case .clearValue: return 166
+    case .clearVerification: return 167
+    case .clearWeak: return 168
+    case .clientStreaming: return 169
+    case .code: return 170
+    case .codePoint: return 171
+    case .codeUnits: return 172
+    case .collection: return 173
+    case .com: return 174
+    case .comma: return 175
+    case .consumedBytes: return 176
+    case .contains: return 177
+    case .contentsOf: return 178
+    case .contiguousBytes: return 179
+    case .copy: return 180
+    case .count: return 181
+    case .countVarintsInBuffer: return 182
+    case .csharpNamespace: return 183
+    case .ctype: return 184
+    case .customCodable: return 185
+    case .customDebugStringConvertible: return 186
+    case .customStringConvertible: return 187
+    case .d: return 188
+    case .data: return 189
+    case .dataResult: return 190
+    case .date: return 191
+    case .daySec: return 192
+    case .daysSinceEpoch: return 193
+    case .debugDescription_: return 194
+    case .debugRedact: return 195
+    case .declaration: return 196
+    case .decoded: return 197
+    case .decodedFromJsonnull: return 198
+    case .decodeExtensionField: return 199
+    case .decodeExtensionFieldsAsMessageSet: return 200
+    case .decodeJson: return 201
+    case .decodeMapField: return 202
+    case .decodeMessage: return 203
+    case .decoder: return 204
+    case .decodeRepeated: return 205
+    case .decodeRepeatedBoolField: return 206
+    case .decodeRepeatedBytesField: return 207
+    case .decodeRepeatedDoubleField: return 208
+    case .decodeRepeatedEnumField: return 209
+    case .decodeRepeatedFixed32Field: return 210
+    case .decodeRepeatedFixed64Field: return 211
+    case .decodeRepeatedFloatField: return 212
+    case .decodeRepeatedGroupField: return 213
+    case .decodeRepeatedInt32Field: return 214
+    case .decodeRepeatedInt64Field: return 215
+    case .decodeRepeatedMessageField: return 216
+    case .decodeRepeatedSfixed32Field: return 217
+    case .decodeRepeatedSfixed64Field: return 218
+    case .decodeRepeatedSint32Field: return 219
+    case .decodeRepeatedSint64Field: return 220
+    case .decodeRepeatedStringField: return 221
+    case .decodeRepeatedUint32Field: return 222
+    case .decodeRepeatedUint64Field: return 223
+    case .decodeSingular: return 224
+    case .decodeSingularBoolField: return 225
+    case .decodeSingularBytesField: return 226
+    case .decodeSingularDoubleField: return 227
+    case .decodeSingularEnumField: return 228
+    case .decodeSingularFixed32Field: return 229
+    case .decodeSingularFixed64Field: return 230
+    case .decodeSingularFloatField: return 231
+    case .decodeSingularGroupField: return 232
+    case .decodeSingularInt32Field: return 233
+    case .decodeSingularInt64Field: return 234
+    case .decodeSingularMessageField: return 235
+    case .decodeSingularSfixed32Field: return 236
+    case .decodeSingularSfixed64Field: return 237
+    case .decodeSingularSint32Field: return 238
+    case .decodeSingularSint64Field: return 239
+    case .decodeSingularStringField: return 240
+    case .decodeSingularUint32Field: return 241
+    case .decodeSingularUint64Field: return 242
+    case .decodeTextFormat: return 243
+    case .defaultAnyTypeUrlprefix: return 244
+    case .defaults: return 245
+    case .defaultValue: return 246
+    case .dependency: return 247
+    case .deprecated: return 248
+    case .deprecatedLegacyJsonFieldConflicts: return 249
+    case .deprecationWarning: return 250
+    case .description_: return 251
+    case .descriptorProto: return 252
+    case .dictionary: return 253
+    case .dictionaryLiteral: return 254
+    case .digit: return 255
+    case .digit0: return 256
+    case .digit1: return 257
+    case .digitCount: return 258
+    case .digits: return 259
+    case .digitValue: return 260
+    case .discardableResult: return 261
+    case .discardUnknownFields: return 262
+    case .double: return 263
+    case .doubleValue: return 264
+    case .duration: return 265
+    case .e: return 266
+    case .edition: return 267
+    case .editionDefault: return 268
+    case .editionDefaults: return 269
+    case .editionDeprecated: return 270
+    case .editionIntroduced: return 271
+    case .editionRemoved: return 272
+    case .element: return 273
+    case .elements: return 274
+    case .else: return 275
+    case .emitExtensionFieldName: return 276
+    case .emitFieldName: return 277
+    case .emitFieldNumber: return 278
+    case .empty: return 279
+    case .emptyAnyTypeURL: return 280
+    case .emptyData: return 281
+    case .encodeAsBytes: return 282
+    case .encoded: return 283
+    case .encodedJsonstring: return 284
+    case .encodedSize: return 285
+    case .encodeField: return 286
+    case .encoder: return 287
+    case .end: return 288
+    case .endArray: return 289
+    case .endMessageField: return 290
+    case .endObject: return 291
+    case .endRegularField: return 292
+    case .enforceNamingStyle: return 293
+    case .enum: return 294
+    case .enumDescriptorProto: return 295
+    case .enumOptions: return 296
+    case .enumReservedRange: return 297
+    case .enumType: return 298
+    case .enumvalue: return 299
+    case .enumValueDescriptorProto: return 300
+    case .enumValueOptions: return 301
+    case .equatable: return 302
+    case .error: return 303
+    case .expressibleByArrayLiteral: return 304
+    case .expressibleByDictionaryLiteral: return 305
+    case .ext: return 306
+    case .extDecoder: return 307
+    case .extendedGraphemeClusterLiteral: return 308
+    case .extendedGraphemeClusterLiteralType: return 309
+    case .extendee: return 310
+    case .extensibleMessage: return 311
+    case .extension: return 312
+    case .extensionField: return 313
+    case .extensionFieldNumber: return 314
+    case .extensionFieldValueSet: return 315
+    case .extensionMap: return 316
+    case .extensionRange: return 317
+    case .extensionRangeOptions: return 318
+    case .extensions: return 319
+    case .extras: return 320
+    case .f: return 321
+    case .false: return 322
+    case .features: return 323
+    case .featureSet: return 324
+    case .featureSetDefaults: return 325
+    case .featureSetEditionDefault: return 326
+    case .featureSupport: return 327
+    case .field: return 328
+    case .fieldData: return 329
+    case .fieldDescriptorProto: return 330
+    case .fieldMask: return 331
+    case .fieldMaskError: return 332
+    case .fieldName: return 333
+    case .fieldNameCount: return 334
+    case .fieldNum: return 335
+    case .fieldNumber: return 336
+    case .fieldNumberForProto: return 337
+    case .fieldOptions: return 338
+    case .fieldPresence: return 339
+    case .fields: return 340
+    case .fieldSize: return 341
+    case .fieldTag: return 342
+    case .fieldType: return 343
+    case .file: return 344
+    case .fileDescriptorProto: return 345
+    case .fileDescriptorSet: return 346
+    case .fileName: return 347
+    case .fileOptions: return 348
+    case .filter: return 349
+    case .final: return 350
+    case .finiteOnly: return 351
+    case .first: return 352
+    case .firstItem: return 353
+    case .fixedFeatures: return 354
+    case .float: return 355
+    case .floatLiteral: return 356
+    case .floatLiteralType: return 357
+    case .floatValue: return 358
+    case .for: return 359
+    case .forMessageName: return 360
+    case .formUnion: return 361
+    case .forReadingFrom: return 362
+    case .forTypeURL: return 363
+    case .forwardParser: return 364
+    case .forWritingInto: return 365
+    case .from: return 366
+    case .fromAscii2: return 367
+    case .fromAscii4: return 368
+    case .fromByteOffset: return 369
+    case .fromHexDigit: return 370
+    case .fullName: return 371
+    case .func: return 372
+    case .function: return 373
+    case .g: return 374
+    case .generatedCodeInfo: return 375
+    case .get: return 376
+    case .getExtensionValue: return 377
+    case .googleapis: return 378
+    case .googleProtobufAny: return 379
+    case .googleProtobufApi: return 380
+    case .googleProtobufBoolValue: return 381
+    case .googleProtobufBytesValue: return 382
+    case .googleProtobufDescriptorProto: return 383
+    case .googleProtobufDoubleValue: return 384
+    case .googleProtobufDuration: return 385
+    case .googleProtobufEdition: return 386
+    case .googleProtobufEmpty: return 387
+    case .googleProtobufEnum: return 388
+    case .googleProtobufEnumDescriptorProto: return 389
+    case .googleProtobufEnumOptions: return 390
+    case .googleProtobufEnumValue: return 391
+    case .googleProtobufEnumValueDescriptorProto: return 392
+    case .googleProtobufEnumValueOptions: return 393
+    case .googleProtobufExtensionRangeOptions: return 394
+    case .googleProtobufFeatureSet: return 395
+    case .googleProtobufFeatureSetDefaults: return 396
+    case .googleProtobufField: return 397
+    case .googleProtobufFieldDescriptorProto: return 398
+    case .googleProtobufFieldMask: return 399
+    case .googleProtobufFieldOptions: return 400
+    case .googleProtobufFileDescriptorProto: return 401
+    case .googleProtobufFileDescriptorSet: return 402
+    case .googleProtobufFileOptions: return 403
+    case .googleProtobufFloatValue: return 404
+    case .googleProtobufGeneratedCodeInfo: return 405
+    case .googleProtobufInt32Value: return 406
+    case .googleProtobufInt64Value: return 407
+    case .googleProtobufListValue: return 408
+    case .googleProtobufMessageOptions: return 409
+    case .googleProtobufMethod: return 410
+    case .googleProtobufMethodDescriptorProto: return 411
+    case .googleProtobufMethodOptions: return 412
+    case .googleProtobufMixin: return 413
+    case .googleProtobufNullValue: return 414
+    case .googleProtobufOneofDescriptorProto: return 415
+    case .googleProtobufOneofOptions: return 416
+    case .googleProtobufOption: return 417
+    case .googleProtobufServiceDescriptorProto: return 418
+    case .googleProtobufServiceOptions: return 419
+    case .googleProtobufSourceCodeInfo: return 420
+    case .googleProtobufSourceContext: return 421
+    case .googleProtobufStringValue: return 422
+    case .googleProtobufStruct: return 423
+    case .googleProtobufSyntax: return 424
+    case .googleProtobufTimestamp: return 425
+    case .googleProtobufType: return 426
+    case .googleProtobufUint32Value: return 427
+    case .googleProtobufUint64Value: return 428
+    case .googleProtobufUninterpretedOption: return 429
+    case .googleProtobufValue: return 430
+    case .goPackage: return 431
+    case .group: return 432
+    case .groupFieldNumberStack: return 433
+    case .groupSize: return 434
+    case .guard: return 435
+    case .hadOneofValue: return 436
+    case .handleConflictingOneOf: return 437
+    case .hasAggregateValue: return 438
+    case .hasAllowAlias: return 439
+    case .hasBegin: return 440
+    case .hasCcEnableArenas: return 441
+    case .hasCcGenericServices: return 442
+    case .hasClientStreaming: return 443
+    case .hasCsharpNamespace: return 444
+    case .hasCtype: return 445
+    case .hasDebugRedact: return 446
+    case .hasDefaultValue: return 447
+    case .hasDeprecated: return 448
+    case .hasDeprecatedLegacyJsonFieldConflicts: return 449
+    case .hasDeprecationWarning: return 450
+    case .hasDoubleValue: return 451
+    case .hasEdition: return 452
+    case .hasEditionDeprecated: return 453
+    case .hasEditionIntroduced: return 454
+    case .hasEditionRemoved: return 455
+    case .hasEnd: return 456
+    case .hasEnforceNamingStyle: return 457
+    case .hasEnumType: return 458
+    case .hasExtendee: return 459
+    case .hasExtensionValue: return 460
+    case .hasFeatures: return 461
+    case .hasFeatureSupport: return 462
+    case .hasFieldPresence: return 463
+    case .hasFixedFeatures: return 464
+    case .hasFullName: return 465
+    case .hasGoPackage: return 466
+    case .hash: return 467
+    case .hashable: return 468
+    case .hasher: return 469
+    case .hashVisitor: return 470
+    case .hasIdempotencyLevel: return 471
+    case .hasIdentifierValue: return 472
+    case .hasInputType: return 473
+    case .hasIsExtension: return 474
+    case .hasJavaGenerateEqualsAndHash: return 475
+    case .hasJavaGenericServices: return 476
+    case .hasJavaMultipleFiles: return 477
+    case .hasJavaOuterClassname: return 478
+    case .hasJavaPackage: return 479
+    case .hasJavaStringCheckUtf8: return 480
+    case .hasJsonFormat: return 481
+    case .hasJsonName: return 482
+    case .hasJstype: return 483
+    case .hasLabel: return 484
+    case .hasLazy: return 485
+    case .hasLeadingComments: return 486
+    case .hasMapEntry: return 487
+    case .hasMaximumEdition: return 488
+    case .hasMessageEncoding: return 489
+    case .hasMessageSetWireFormat: return 490
+    case .hasMinimumEdition: return 491
+    case .hasName: return 492
+    case .hasNamePart: return 493
+    case .hasNegativeIntValue: return 494
+    case .hasNoStandardDescriptorAccessor: return 495
+    case .hasNumber: return 496
+    case .hasObjcClassPrefix: return 497
+    case .hasOneofIndex: return 498
+    case .hasOptimizeFor: return 499
     default: break
     }
     switch self {
-    case .hasPacked: return 500
-    case .hasPhpClassPrefix: return 501
-    case .hasPhpMetadataNamespace: return 502
-    case .hasPhpNamespace: return 503
-    case .hasPositiveIntValue: return 504
-    case .hasProto3Optional: return 505
-    case .hasPyGenericServices: return 506
-    case .hasRepeated: return 507
-    case .hasRepeatedFieldEncoding: return 508
-    case .hasReserved: return 509
-    case .hasRetention: return 510
-    case .hasRubyPackage: return 511
-    case .hasSemantic: return 512
-    case .hasServerStreaming: return 513
-    case .hasSourceCodeInfo: return 514
-    case .hasSourceContext: return 515
-    case .hasSourceFile: return 516
-    case .hasStart: return 517
-    case .hasStringValue: return 518
-    case .hasSwiftPrefix: return 519
-    case .hasSyntax: return 520
-    case .hasTrailingComments: return 521
-    case .hasType: return 522
-    case .hasTypeName: return 523
-    case .hasUnverifiedLazy: return 524
-    case .hasUtf8Validation: return 525
-    case .hasValue: return 526
-    case .hasVerification: return 527
-    case .hasWeak: return 528
-    case .hour: return 529
-    case .i: return 530
-    case .idempotencyLevel: return 531
-    case .identifierValue: return 532
-    case .if: return 533
-    case .ignoreUnknownExtensionFields: return 534
-    case .ignoreUnknownFields: return 535
-    case .index: return 536
-    case .init_: return 537
-    case .inout: return 538
-    case .inputType: return 539
-    case .insert: return 540
-    case .int: return 541
-    case .int32: return 542
-    case .int32Value: return 543
-    case .int64: return 544
-    case .int64Value: return 545
-    case .int8: return 546
-    case .integerLiteral: return 547
-    case .integerLiteralType: return 548
-    case .intern: return 549
-    case .internal: return 550
-    case .internalState: return 551
-    case .intersect: return 552
-    case .into: return 553
-    case .ints: return 554
-    case .isA: return 555
-    case .isEqual: return 556
-    case .isEqualTo: return 557
-    case .isExtension: return 558
-    case .isInitialized: return 559
-    case .isNegative: return 560
-    case .isPathValid: return 561
-    case .isValid: return 562
-    case .itemTagsEncodedSize: return 563
-    case .iterator: return 564
-    case .javaGenerateEqualsAndHash: return 565
-    case .javaGenericServices: return 566
-    case .javaMultipleFiles: return 567
-    case .javaOuterClassname: return 568
-    case .javaPackage: return 569
-    case .javaStringCheckUtf8: return 570
-    case .jsondecoder: return 571
-    case .jsondecodingError: return 572
-    case .jsondecodingOptions: return 573
-    case .jsonEncoder: return 574
-    case .jsonencodingError: return 575
-    case .jsonencodingOptions: return 576
-    case .jsonencodingVisitor: return 577
-    case .jsonFormat: return 578
-    case .jsonmapEncodingVisitor: return 579
-    case .jsonName: return 580
-    case .jsonPath: return 581
-    case .jsonPaths: return 582
-    case .jsonscanner: return 583
-    case .jsonString: return 584
-    case .jsonText: return 585
-    case .jsonUtf8Bytes: return 586
-    case .jsonUtf8Data: return 587
-    case .jstype: return 588
-    case .k: return 589
-    case .kChunkSize: return 590
-    case .key: return 591
-    case .keyField: return 592
-    case .keyFieldOpt: return 593
-    case .keyType: return 594
-    case .kind: return 595
-    case .l: return 596
-    case .label: return 597
-    case .lazy: return 598
-    case .leadingComments: return 599
-    case .leadingDetachedComments: return 600
-    case .length: return 601
-    case .lessThan: return 602
-    case .let: return 603
-    case .lhs: return 604
-    case .line: return 605
-    case .list: return 606
-    case .listOfMessages: return 607
-    case .listValue: return 608
-    case .littleEndian: return 609
-    case .load: return 610
-    case .localHasher: return 611
-    case .location: return 612
-    case .m: return 613
-    case .major: return 614
-    case .makeAsyncIterator: return 615
-    case .makeIterator: return 616
-    case .malformedLength: return 617
-    case .mapEntry: return 618
-    case .mapKeyType: return 619
-    case .mapToMessages: return 620
-    case .mapValueType: return 621
-    case .mapVisitor: return 622
-    case .mask: return 623
-    case .maximumEdition: return 624
-    case .mdayStart: return 625
-    case .merge: return 626
-    case .mergeOptions: return 627
-    case .message: return 628
-    case .messageDepthLimit: return 629
-    case .messageEncoding: return 630
-    case .messageExtension: return 631
-    case .messageImplementationBase: return 632
-    case .messageOptions: return 633
-    case .messageSet: return 634
-    case .messageSetWireFormat: return 635
-    case .messageSize: return 636
-    case .messageType: return 637
-    case .method: return 638
-    case .methodDescriptorProto: return 639
-    case .methodOptions: return 640
-    case .methods: return 641
-    case .min: return 642
-    case .minimumEdition: return 643
-    case .minor: return 644
-    case .mixin: return 645
-    case .mixins: return 646
-    case .modify: return 647
-    case .month: return 648
-    case .msgExtension: return 649
-    case .mutating: return 650
-    case .n: return 651
-    case .name: return 652
-    case .nameDescription: return 653
-    case .nameMap: return 654
-    case .namePart: return 655
-    case .names: return 656
-    case .nanos: return 657
-    case .negativeIntValue: return 658
-    case .nestedType: return 659
-    case .newExtensible: return 660
-    case .newL: return 661
-    case .newList: return 662
-    case .newMessage: return 663
-    case .newValue: return 664
-    case .next: return 665
-    case .nextByte: return 666
-    case .nextFieldNumber: return 667
-    case .nextVarInt: return 668
-    case .nil: return 669
-    case .nilLiteral: return 670
-    case .noBytesAvailable: return 671
-    case .noStandardDescriptorAccessor: return 672
-    case .nullValue: return 673
-    case .number: return 674
-    case .numberValue: return 675
-    case .objcClassPrefix: return 676
-    case .of: return 677
-    case .oneofDecl: return 678
-    case .oneofDescriptorProto: return 679
-    case .oneofIndex: return 680
-    case .oneofOptions: return 681
-    case .oneofs: return 682
-    case .oneOfKind: return 683
-    case .optimizeFor: return 684
-    case .optimizeMode: return 685
-    case .option: return 686
-    case .optionalEnumExtensionField: return 687
-    case .optionalExtensionField: return 688
-    case .optionalGroupExtensionField: return 689
-    case .optionalMessageExtensionField: return 690
-    case .optionRetention: return 691
-    case .options: return 692
-    case .optionTargetType: return 693
-    case .other: return 694
-    case .others: return 695
-    case .out: return 696
-    case .outputType: return 697
-    case .overridableFeatures: return 698
-    case .p: return 699
-    case .package: return 700
-    case .packed: return 701
-    case .packedEnumExtensionField: return 702
-    case .packedExtensionField: return 703
-    case .padding: return 704
-    case .parent: return 705
-    case .parse: return 706
-    case .partial: return 707
-    case .path: return 708
-    case .pathDecoder: return 709
-    case .pathDecodingError: return 710
-    case .paths: return 711
-    case .pathVisitor: return 712
-    case .payload: return 713
-    case .payloadSize: return 714
-    case .phpClassPrefix: return 715
-    case .phpMetadataNamespace: return 716
-    case .phpNamespace: return 717
-    case .pos: return 718
-    case .positiveIntValue: return 719
-    case .prefix: return 720
-    case .preserveProtoFieldNames: return 721
-    case .preTraverse: return 722
-    case .prevPath: return 723
-    case .printUnknownFields: return 724
-    case .proto2: return 725
-    case .proto3DefaultValue: return 726
-    case .proto3Optional: return 727
-    case .protobufApiversionCheck: return 728
-    case .protobufApiversion2: return 729
-    case .protobufBool: return 730
-    case .protobufBytes: return 731
-    case .protobufDouble: return 732
-    case .protobufEnumMap: return 733
-    case .protobufExtension: return 734
-    case .protobufFixed32: return 735
-    case .protobufFixed64: return 736
-    case .protobufFloat: return 737
-    case .protobufInt32: return 738
-    case .protobufInt64: return 739
-    case .protobufMap: return 740
-    case .protobufMessageMap: return 741
-    case .protobufSfixed32: return 742
-    case .protobufSfixed64: return 743
-    case .protobufSint32: return 744
-    case .protobufSint64: return 745
-    case .protobufString: return 746
-    case .protobufUint32: return 747
-    case .protobufUint64: return 748
-    case .protobufExtensionFieldValues: return 749
-    case .protobufFieldNumber: return 750
-    case .protobufGeneratedIsEqualTo: return 751
-    case .protobufNameMap: return 752
-    case .protobufNewField: return 753
-    case .protobufPackage: return 754
-    case .protocol: return 755
-    case .protoFieldName: return 756
-    case .protoMessageName: return 757
-    case .protoNameProviding: return 758
-    case .protoPaths: return 759
-    case .public: return 760
-    case .publicDependency: return 761
-    case .putBoolValue: return 762
-    case .putBytesValue: return 763
-    case .putDoubleValue: return 764
-    case .putEnumValue: return 765
-    case .putFixedUint32: return 766
-    case .putFixedUint64: return 767
-    case .putFloatValue: return 768
-    case .putInt64: return 769
-    case .putStringValue: return 770
-    case .putUint64: return 771
-    case .putUint64Hex: return 772
-    case .putVarInt: return 773
-    case .putZigZagVarInt: return 774
-    case .pyGenericServices: return 775
-    case .r: return 776
-    case .rawChars: return 777
-    case .rawRepresentable: return 778
-    case .rawValue_: return 779
-    case .read4HexDigits: return 780
-    case .readBytes: return 781
-    case .register: return 782
-    case .removingAllFieldsOf: return 783
-    case .repeated: return 784
-    case .repeatedEnumExtensionField: return 785
-    case .repeatedExtensionField: return 786
-    case .repeatedFieldEncoding: return 787
-    case .repeatedGroupExtensionField: return 788
-    case .repeatedMessageExtensionField: return 789
-    case .repeating: return 790
-    case .replaceRepeatedFields: return 791
-    case .requestStreaming: return 792
-    case .requestTypeURL: return 793
-    case .requiredSize: return 794
-    case .responseStreaming: return 795
-    case .responseTypeURL: return 796
-    case .result: return 797
-    case .retention: return 798
-    case .rethrows: return 799
-    case .return: return 800
-    case .returnType: return 801
-    case .revision: return 802
-    case .rhs: return 803
-    case .root: return 804
-    case .rubyPackage: return 805
-    case .s: return 806
-    case .sawBackslash: return 807
-    case .sawSection4Characters: return 808
-    case .sawSection5Characters: return 809
-    case .scan: return 810
-    case .scanner: return 811
-    case .seconds: return 812
-    case .self_: return 813
-    case .semantic: return 814
-    case .sendable: return 815
-    case .separator: return 816
-    case .serialize: return 817
-    case .serializedBytes: return 818
-    case .serializedData: return 819
-    case .serializedSize: return 820
-    case .serverStreaming: return 821
-    case .service: return 822
-    case .serviceDescriptorProto: return 823
-    case .serviceOptions: return 824
-    case .set: return 825
-    case .setExtensionValue: return 826
-    case .shift: return 827
-    case .simpleExtensionMap: return 828
-    case .size: return 829
-    case .sizer: return 830
-    case .source: return 831
-    case .sourceCodeInfo: return 832
-    case .sourceContext: return 833
-    case .sourceEncoding: return 834
-    case .sourceFile: return 835
-    case .sourceLocation: return 836
-    case .span: return 837
-    case .split: return 838
-    case .start: return 839
-    case .startArray: return 840
-    case .startArrayObject: return 841
-    case .startField: return 842
-    case .startIndex: return 843
-    case .startMessageField: return 844
-    case .startObject: return 845
-    case .startRegularField: return 846
-    case .state: return 847
-    case .static: return 848
-    case .staticString: return 849
-    case .storage: return 850
-    case .string: return 851
-    case .stringLiteral: return 852
-    case .stringLiteralType: return 853
-    case .stringResult: return 854
-    case .stringValue: return 855
-    case .struct: return 856
-    case .structValue: return 857
-    case .subDecoder: return 858
-    case .subscript: return 859
-    case .subtract: return 860
-    case .subVisitor: return 861
-    case .swift: return 862
-    case .swiftPrefix: return 863
-    case .swiftProtobufContiguousBytes: return 864
-    case .swiftProtobufError: return 865
-    case .syntax: return 866
-    case .t: return 867
-    case .tag: return 868
-    case .targets: return 869
-    case .terminator: return 870
-    case .testDecoder: return 871
-    case .text: return 872
-    case .textDecoder: return 873
-    case .textFormatDecoder: return 874
-    case .textFormatDecodingError: return 875
-    case .textFormatDecodingOptions: return 876
-    case .textFormatEncodingOptions: return 877
-    case .textFormatEncodingVisitor: return 878
-    case .textFormatString: return 879
-    case .throwOrIgnore: return 880
-    case .throws: return 881
-    case .timeInterval: return 882
-    case .timeIntervalSince1970: return 883
-    case .timeIntervalSinceReferenceDate: return 884
-    case .timestamp: return 885
-    case .tmp: return 886
-    case .tooLarge: return 887
-    case .total: return 888
-    case .totalArrayDepth: return 889
-    case .totalSize: return 890
-    case .trailingComments: return 891
-    case .traverse: return 892
-    case .trim: return 893
-    case .true: return 894
-    case .try: return 895
-    case .type: return 896
-    case .typealias: return 897
-    case .typeEnum: return 898
-    case .typeName: return 899
-    case .typePrefix: return 900
-    case .typeStart: return 901
-    case .typeUnknown: return 902
-    case .typeURL: return 903
-    case .uint32: return 904
-    case .uint32Value: return 905
-    case .uint64: return 906
-    case .uint64Value: return 907
-    case .uint8: return 908
-    case .unchecked: return 909
-    case .unicodeScalarLiteral: return 910
-    case .unicodeScalarLiteralType: return 911
-    case .unicodeScalars: return 912
-    case .unicodeScalarView: return 913
-    case .uninterpretedOption: return 914
-    case .union: return 915
-    case .uniqueStorage: return 916
-    case .unknown: return 917
-    case .unknownFields: return 918
-    case .unknownStorage: return 919
-    case .unpackTo: return 920
-    case .unsafeBufferPointer: return 921
-    case .unsafeMutablePointer: return 922
-    case .unsafeMutableRawBufferPointer: return 923
-    case .unsafeRawBufferPointer: return 924
-    case .unsafeRawPointer: return 925
-    case .unverifiedLazy: return 926
-    case .updatedOptions: return 927
-    case .url: return 928
-    case .useDeterministicOrdering: return 929
-    case .utf8: return 930
-    case .utf8Ptr: return 931
-    case .utf8ToDouble: return 932
-    case .utf8Validation: return 933
-    case .utf8View: return 934
-    case .v: return 935
-    case .value: return 936
-    case .valueField: return 937
-    case .values: return 938
-    case .valueType: return 939
-    case .var: return 940
-    case .verification: return 941
-    case .verificationState: return 942
-    case .version: return 943
-    case .versionString: return 944
-    case .visitExtensionFields: return 945
-    case .visitExtensionFieldsAsMessageSet: return 946
-    case .visitMapField: return 947
-    case .visitor: return 948
-    case .visitPacked: return 949
-    case .visitPackedBoolField: return 950
-    case .visitPackedDoubleField: return 951
-    case .visitPackedEnumField: return 952
-    case .visitPackedFixed32Field: return 953
-    case .visitPackedFixed64Field: return 954
-    case .visitPackedFloatField: return 955
-    case .visitPackedInt32Field: return 956
-    case .visitPackedInt64Field: return 957
-    case .visitPackedSfixed32Field: return 958
-    case .visitPackedSfixed64Field: return 959
-    case .visitPackedSint32Field: return 960
-    case .visitPackedSint64Field: return 961
-    case .visitPackedUint32Field: return 962
-    case .visitPackedUint64Field: return 963
-    case .visitRepeated: return 964
-    case .visitRepeatedBoolField: return 965
-    case .visitRepeatedBytesField: return 966
-    case .visitRepeatedDoubleField: return 967
-    case .visitRepeatedEnumField: return 968
-    case .visitRepeatedFixed32Field: return 969
-    case .visitRepeatedFixed64Field: return 970
-    case .visitRepeatedFloatField: return 971
-    case .visitRepeatedGroupField: return 972
-    case .visitRepeatedInt32Field: return 973
-    case .visitRepeatedInt64Field: return 974
-    case .visitRepeatedMessageField: return 975
-    case .visitRepeatedSfixed32Field: return 976
-    case .visitRepeatedSfixed64Field: return 977
-    case .visitRepeatedSint32Field: return 978
-    case .visitRepeatedSint64Field: return 979
-    case .visitRepeatedStringField: return 980
-    case .visitRepeatedUint32Field: return 981
-    case .visitRepeatedUint64Field: return 982
-    case .visitSingular: return 983
-    case .visitSingularBoolField: return 984
-    case .visitSingularBytesField: return 985
-    case .visitSingularDoubleField: return 986
-    case .visitSingularEnumField: return 987
-    case .visitSingularFixed32Field: return 988
-    case .visitSingularFixed64Field: return 989
-    case .visitSingularFloatField: return 990
-    case .visitSingularGroupField: return 991
-    case .visitSingularInt32Field: return 992
-    case .visitSingularInt64Field: return 993
-    case .visitSingularMessageField: return 994
-    case .visitSingularSfixed32Field: return 995
-    case .visitSingularSfixed64Field: return 996
-    case .visitSingularSint32Field: return 997
-    case .visitSingularSint64Field: return 998
-    case .visitSingularStringField: return 999
+    case .hasOptions: return 500
+    case .hasOutputType: return 501
+    case .hasOverridableFeatures: return 502
+    case .hasPackage: return 503
+    case .hasPacked: return 504
+    case .hasPhpClassPrefix: return 505
+    case .hasPhpMetadataNamespace: return 506
+    case .hasPhpNamespace: return 507
+    case .hasPositiveIntValue: return 508
+    case .hasProto3Optional: return 509
+    case .hasPyGenericServices: return 510
+    case .hasRepeated: return 511
+    case .hasRepeatedFieldEncoding: return 512
+    case .hasReserved: return 513
+    case .hasRetention: return 514
+    case .hasRubyPackage: return 515
+    case .hasSemantic: return 516
+    case .hasServerStreaming: return 517
+    case .hasSourceCodeInfo: return 518
+    case .hasSourceContext: return 519
+    case .hasSourceFile: return 520
+    case .hasStart: return 521
+    case .hasStringValue: return 522
+    case .hasSwiftPrefix: return 523
+    case .hasSyntax: return 524
+    case .hasTrailingComments: return 525
+    case .hasType: return 526
+    case .hasTypeName: return 527
+    case .hasUnverifiedLazy: return 528
+    case .hasUtf8Validation: return 529
+    case .hasValue: return 530
+    case .hasVerification: return 531
+    case .hasWeak: return 532
+    case .hour: return 533
+    case .i: return 534
+    case .idempotencyLevel: return 535
+    case .identifierValue: return 536
+    case .if: return 537
+    case .ignoreUnknownExtensionFields: return 538
+    case .ignoreUnknownFields: return 539
+    case .index: return 540
+    case .init_: return 541
+    case .inout: return 542
+    case .inputType: return 543
+    case .insert: return 544
+    case .int: return 545
+    case .int32: return 546
+    case .int32Value: return 547
+    case .int64: return 548
+    case .int64Value: return 549
+    case .int8: return 550
+    case .integerLiteral: return 551
+    case .integerLiteralType: return 552
+    case .intern: return 553
+    case .internal: return 554
+    case .internalState: return 555
+    case .intersect: return 556
+    case .into: return 557
+    case .ints: return 558
+    case .invalidAnyTypeURL: return 559
+    case .isA: return 560
+    case .isEqual: return 561
+    case .isEqualTo: return 562
+    case .isExtension: return 563
+    case .isInitialized: return 564
+    case .isNegative: return 565
+    case .isPathValid: return 566
+    case .isValid: return 567
+    case .itemTagsEncodedSize: return 568
+    case .iterator: return 569
+    case .javaGenerateEqualsAndHash: return 570
+    case .javaGenericServices: return 571
+    case .javaMultipleFiles: return 572
+    case .javaOuterClassname: return 573
+    case .javaPackage: return 574
+    case .javaStringCheckUtf8: return 575
+    case .jsondecoder: return 576
+    case .jsondecoding: return 577
+    case .jsondecodingError: return 578
+    case .jsondecodingOptions: return 579
+    case .jsonEncoder: return 580
+    case .jsonencoding: return 581
+    case .jsonencodingError: return 582
+    case .jsonencodingOptions: return 583
+    case .jsonencodingVisitor: return 584
+    case .jsonFormat: return 585
+    case .jsonmapEncodingVisitor: return 586
+    case .jsonName: return 587
+    case .jsonPath: return 588
+    case .jsonPaths: return 589
+    case .jsonscanner: return 590
+    case .jsonString: return 591
+    case .jsonText: return 592
+    case .jsonUtf8Bytes: return 593
+    case .jsonUtf8Data: return 594
+    case .jstype: return 595
+    case .k: return 596
+    case .kChunkSize: return 597
+    case .key: return 598
+    case .keyField: return 599
+    case .keyFieldOpt: return 600
+    case .keyType: return 601
+    case .kind: return 602
+    case .l: return 603
+    case .label: return 604
+    case .lazy: return 605
+    case .leadingComments: return 606
+    case .leadingDetachedComments: return 607
+    case .length: return 608
+    case .lessThan: return 609
+    case .let: return 610
+    case .lhs: return 611
+    case .line: return 612
+    case .list: return 613
+    case .listOfMessages: return 614
+    case .listValue: return 615
+    case .littleEndian: return 616
+    case .load: return 617
+    case .localHasher: return 618
+    case .location: return 619
+    case .m: return 620
+    case .major: return 621
+    case .makeAsyncIterator: return 622
+    case .makeIterator: return 623
+    case .malformedLength: return 624
+    case .mapEntry: return 625
+    case .mapKeyType: return 626
+    case .mapToMessages: return 627
+    case .mapValueType: return 628
+    case .mapVisitor: return 629
+    case .mask: return 630
+    case .maximumEdition: return 631
+    case .mdayStart: return 632
+    case .merge: return 633
+    case .mergeOptions: return 634
+    case .message: return 635
+    case .messageDepthLimit: return 636
+    case .messageEncoding: return 637
+    case .messageExtension: return 638
+    case .messageImplementationBase: return 639
+    case .messageOptions: return 640
+    case .messageSet: return 641
+    case .messageSetWireFormat: return 642
+    case .messageSize: return 643
+    case .messageType: return 644
+    case .method: return 645
+    case .methodDescriptorProto: return 646
+    case .methodOptions: return 647
+    case .methods: return 648
+    case .min: return 649
+    case .minimumEdition: return 650
+    case .minor: return 651
+    case .mixin: return 652
+    case .mixins: return 653
+    case .modify: return 654
+    case .month: return 655
+    case .msgExtension: return 656
+    case .mutating: return 657
+    case .n: return 658
+    case .name: return 659
+    case .nameDescription: return 660
+    case .nameMap: return 661
+    case .namePart: return 662
+    case .names: return 663
+    case .nanos: return 664
+    case .negativeIntValue: return 665
+    case .nestedType: return 666
+    case .newExtensible: return 667
+    case .newL: return 668
+    case .newList: return 669
+    case .newMessage: return 670
+    case .newValue: return 671
+    case .next: return 672
+    case .nextByte: return 673
+    case .nextFieldNumber: return 674
+    case .nextVarInt: return 675
+    case .nil: return 676
+    case .nilLiteral: return 677
+    case .noBytesAvailable: return 678
+    case .noStandardDescriptorAccessor: return 679
+    case .nullValue: return 680
+    case .number: return 681
+    case .numberValue: return 682
+    case .objcClassPrefix: return 683
+    case .of: return 684
+    case .oneofDecl: return 685
+    case .oneofDescriptorProto: return 686
+    case .oneofIndex: return 687
+    case .oneofOptions: return 688
+    case .oneofs: return 689
+    case .oneOfKind: return 690
+    case .optimizeFor: return 691
+    case .optimizeMode: return 692
+    case .option: return 693
+    case .optionalEnumExtensionField: return 694
+    case .optionalExtensionField: return 695
+    case .optionalGroupExtensionField: return 696
+    case .optionalMessageExtensionField: return 697
+    case .optionRetention: return 698
+    case .options: return 699
+    case .optionTargetType: return 700
+    case .other: return 701
+    case .others: return 702
+    case .out: return 703
+    case .outputType: return 704
+    case .overridableFeatures: return 705
+    case .p: return 706
+    case .package: return 707
+    case .packed: return 708
+    case .packedEnumExtensionField: return 709
+    case .packedExtensionField: return 710
+    case .padding: return 711
+    case .parent: return 712
+    case .parse: return 713
+    case .partial: return 714
+    case .path: return 715
+    case .pathDecoder: return 716
+    case .pathDecodingError: return 717
+    case .paths: return 718
+    case .pathVisitor: return 719
+    case .payload: return 720
+    case .payloadSize: return 721
+    case .phpClassPrefix: return 722
+    case .phpMetadataNamespace: return 723
+    case .phpNamespace: return 724
+    case .pos: return 725
+    case .positiveIntValue: return 726
+    case .prefix: return 727
+    case .preserveProtoFieldNames: return 728
+    case .preTraverse: return 729
+    case .prevPath: return 730
+    case .printUnknownFields: return 731
+    case .proto2: return 732
+    case .proto3DefaultValue: return 733
+    case .proto3Optional: return 734
+    case .protobufApiversionCheck: return 735
+    case .protobufApiversion2: return 736
+    case .protobufBool: return 737
+    case .protobufBytes: return 738
+    case .protobufDouble: return 739
+    case .protobufEnumMap: return 740
+    case .protobufExtension: return 741
+    case .protobufFixed32: return 742
+    case .protobufFixed64: return 743
+    case .protobufFloat: return 744
+    case .protobufInt32: return 745
+    case .protobufInt64: return 746
+    case .protobufMap: return 747
+    case .protobufMessageMap: return 748
+    case .protobufSfixed32: return 749
+    case .protobufSfixed64: return 750
+    case .protobufSint32: return 751
+    case .protobufSint64: return 752
+    case .protobufString: return 753
+    case .protobufUint32: return 754
+    case .protobufUint64: return 755
+    case .protobufExtensionFieldValues: return 756
+    case .protobufFieldNumber: return 757
+    case .protobufGeneratedIsEqualTo: return 758
+    case .protobufNameMap: return 759
+    case .protobufNewField: return 760
+    case .protobufPackage: return 761
+    case .protocol: return 762
+    case .protoFieldName: return 763
+    case .protoMessageName: return 764
+    case .protoNameProviding: return 765
+    case .protoPaths: return 766
+    case .public: return 767
+    case .publicDependency: return 768
+    case .putBoolValue: return 769
+    case .putBytesValue: return 770
+    case .putDoubleValue: return 771
+    case .putEnumValue: return 772
+    case .putFixedUint32: return 773
+    case .putFixedUint64: return 774
+    case .putFloatValue: return 775
+    case .putInt64: return 776
+    case .putStringValue: return 777
+    case .putUint64: return 778
+    case .putUint64Hex: return 779
+    case .putVarInt: return 780
+    case .putZigZagVarInt: return 781
+    case .pyGenericServices: return 782
+    case .r: return 783
+    case .rawChars: return 784
+    case .rawRepresentable: return 785
+    case .rawValue_: return 786
+    case .read4HexDigits: return 787
+    case .readBytes: return 788
+    case .register: return 789
+    case .removingAllFieldsOf: return 790
+    case .repeated: return 791
+    case .repeatedEnumExtensionField: return 792
+    case .repeatedExtensionField: return 793
+    case .repeatedFieldEncoding: return 794
+    case .repeatedGroupExtensionField: return 795
+    case .repeatedMessageExtensionField: return 796
+    case .repeating: return 797
+    case .replaceRepeatedFields: return 798
+    case .requestStreaming: return 799
+    case .requestTypeURL: return 800
+    case .requiredSize: return 801
+    case .responseStreaming: return 802
+    case .responseTypeURL: return 803
+    case .result: return 804
+    case .retention: return 805
+    case .rethrows: return 806
+    case .return: return 807
+    case .returnType: return 808
+    case .revision: return 809
+    case .rhs: return 810
+    case .root: return 811
+    case .rubyPackage: return 812
+    case .s: return 813
+    case .sawBackslash: return 814
+    case .sawSection4Characters: return 815
+    case .sawSection5Characters: return 816
+    case .scan: return 817
+    case .scanner: return 818
+    case .seconds: return 819
+    case .self_: return 820
+    case .semantic: return 821
+    case .sendable: return 822
+    case .separator: return 823
+    case .serialize: return 824
+    case .serializedBytes: return 825
+    case .serializedData: return 826
+    case .serializedSize: return 827
+    case .serverStreaming: return 828
+    case .service: return 829
+    case .serviceDescriptorProto: return 830
+    case .serviceOptions: return 831
+    case .set: return 832
+    case .setExtensionValue: return 833
+    case .shift: return 834
+    case .simpleExtensionMap: return 835
+    case .size: return 836
+    case .sizer: return 837
+    case .source: return 838
+    case .sourceCodeInfo: return 839
+    case .sourceContext: return 840
+    case .sourceEncoding: return 841
+    case .sourceFile: return 842
+    case .sourceLocation: return 843
+    case .span: return 844
+    case .split: return 845
+    case .start: return 846
+    case .startArray: return 847
+    case .startArrayObject: return 848
+    case .startField: return 849
+    case .startIndex: return 850
+    case .startMessageField: return 851
+    case .startObject: return 852
+    case .startRegularField: return 853
+    case .state: return 854
+    case .static: return 855
+    case .staticString: return 856
+    case .storage: return 857
+    case .string: return 858
+    case .stringLiteral: return 859
+    case .stringLiteralType: return 860
+    case .stringResult: return 861
+    case .stringValue: return 862
+    case .struct: return 863
+    case .structValue: return 864
+    case .subDecoder: return 865
+    case .subscript: return 866
+    case .subtract: return 867
+    case .subVisitor: return 868
+    case .swift: return 869
+    case .swiftPrefix: return 870
+    case .swiftProtobufContiguousBytes: return 871
+    case .swiftProtobufError: return 872
+    case .syntax: return 873
+    case .t: return 874
+    case .tag: return 875
+    case .targets: return 876
+    case .terminator: return 877
+    case .testDecoder: return 878
+    case .text: return 879
+    case .textDecoder: return 880
+    case .textFormatDecoder: return 881
+    case .textFormatDecodingError: return 882
+    case .textFormatDecodingOptions: return 883
+    case .textFormatEncodingOptions: return 884
+    case .textFormatEncodingVisitor: return 885
+    case .textFormatString: return 886
+    case .throwOrIgnore: return 887
+    case .throws: return 888
+    case .timeInterval: return 889
+    case .timeIntervalSince1970: return 890
+    case .timeIntervalSinceReferenceDate: return 891
+    case .timestamp: return 892
+    case .tmp: return 893
+    case .tooLarge: return 894
+    case .total: return 895
+    case .totalArrayDepth: return 896
+    case .totalSize: return 897
+    case .trailingComments: return 898
+    case .traverse: return 899
+    case .trim: return 900
+    case .true: return 901
+    case .try: return 902
+    case .type: return 903
+    case .typealias: return 904
+    case .typeEnum: return 905
+    case .typeName: return 906
+    case .typePrefix: return 907
+    case .typeStart: return 908
+    case .typeUnknown: return 909
+    case .typeURL: return 910
+    case .uint32: return 911
+    case .uint32Value: return 912
+    case .uint64: return 913
+    case .uint64Value: return 914
+    case .uint8: return 915
+    case .unchecked: return 916
+    case .unicodeScalarLiteral: return 917
+    case .unicodeScalarLiteralType: return 918
+    case .unicodeScalars: return 919
+    case .unicodeScalarView: return 920
+    case .uninterpretedOption: return 921
+    case .union: return 922
+    case .uniqueStorage: return 923
+    case .unknown: return 924
+    case .unknownFields: return 925
+    case .unknownStorage: return 926
+    case .unpackTo: return 927
+    case .unsafeBufferPointer: return 928
+    case .unsafeMutablePointer: return 929
+    case .unsafeMutableRawBufferPointer: return 930
+    case .unsafeRawBufferPointer: return 931
+    case .unsafeRawPointer: return 932
+    case .unverifiedLazy: return 933
+    case .updatedOptions: return 934
+    case .url: return 935
+    case .useDeterministicOrdering: return 936
+    case .utf8: return 937
+    case .utf8Ptr: return 938
+    case .utf8ToDouble: return 939
+    case .utf8Validation: return 940
+    case .utf8View: return 941
+    case .v: return 942
+    case .value: return 943
+    case .valueField: return 944
+    case .values: return 945
+    case .valueType: return 946
+    case .var: return 947
+    case .verification: return 948
+    case .verificationState: return 949
+    case .version: return 950
+    case .versionString: return 951
+    case .visitExtensionFields: return 952
+    case .visitExtensionFieldsAsMessageSet: return 953
+    case .visitMapField: return 954
+    case .visitor: return 955
+    case .visitPacked: return 956
+    case .visitPackedBoolField: return 957
+    case .visitPackedDoubleField: return 958
+    case .visitPackedEnumField: return 959
+    case .visitPackedFixed32Field: return 960
+    case .visitPackedFixed64Field: return 961
+    case .visitPackedFloatField: return 962
+    case .visitPackedInt32Field: return 963
+    case .visitPackedInt64Field: return 964
+    case .visitPackedSfixed32Field: return 965
+    case .visitPackedSfixed64Field: return 966
+    case .visitPackedSint32Field: return 967
+    case .visitPackedSint64Field: return 968
+    case .visitPackedUint32Field: return 969
+    case .visitPackedUint64Field: return 970
+    case .visitRepeated: return 971
+    case .visitRepeatedBoolField: return 972
+    case .visitRepeatedBytesField: return 973
+    case .visitRepeatedDoubleField: return 974
+    case .visitRepeatedEnumField: return 975
+    case .visitRepeatedFixed32Field: return 976
+    case .visitRepeatedFixed64Field: return 977
+    case .visitRepeatedFloatField: return 978
+    case .visitRepeatedGroupField: return 979
+    case .visitRepeatedInt32Field: return 980
+    case .visitRepeatedInt64Field: return 981
+    case .visitRepeatedMessageField: return 982
+    case .visitRepeatedSfixed32Field: return 983
+    case .visitRepeatedSfixed64Field: return 984
+    case .visitRepeatedSint32Field: return 985
+    case .visitRepeatedSint64Field: return 986
+    case .visitRepeatedStringField: return 987
+    case .visitRepeatedUint32Field: return 988
+    case .visitRepeatedUint64Field: return 989
+    case .visitSingular: return 990
+    case .visitSingularBoolField: return 991
+    case .visitSingularBytesField: return 992
+    case .visitSingularDoubleField: return 993
+    case .visitSingularEnumField: return 994
+    case .visitSingularFixed32Field: return 995
+    case .visitSingularFixed64Field: return 996
+    case .visitSingularFloatField: return 997
+    case .visitSingularGroupField: return 998
+    case .visitSingularInt32Field: return 999
     default: break
     }
     switch self {
-    case .visitSingularUint32Field: return 1000
-    case .visitSingularUint64Field: return 1001
-    case .visitUnknown: return 1002
-    case .wasDecoded: return 1003
-    case .weak: return 1004
-    case .weakDependency: return 1005
-    case .where: return 1006
-    case .wireFormat: return 1007
-    case .with: return 1008
-    case .withUnsafeBytes: return 1009
-    case .withUnsafeMutableBytes: return 1010
-    case .work: return 1011
-    case .wrapped: return 1012
-    case .wrappedType: return 1013
-    case .wrappedValue: return 1014
-    case .written: return 1015
-    case .yday: return 1016
+    case .visitSingularInt64Field: return 1000
+    case .visitSingularMessageField: return 1001
+    case .visitSingularSfixed32Field: return 1002
+    case .visitSingularSfixed64Field: return 1003
+    case .visitSingularSint32Field: return 1004
+    case .visitSingularSint64Field: return 1005
+    case .visitSingularStringField: return 1006
+    case .visitSingularUint32Field: return 1007
+    case .visitSingularUint64Field: return 1008
+    case .visitUnknown: return 1009
+    case .wasDecoded: return 1010
+    case .weak: return 1011
+    case .weakDependency: return 1012
+    case .where: return 1013
+    case .wireFormat: return 1014
+    case .with: return 1015
+    case .withUnsafeBytes: return 1016
+    case .withUnsafeMutableBytes: return 1017
+    case .work: return 1018
+    case .wrapped: return 1019
+    case .wrappedType: return 1020
+    case .wrappedValue: return 1021
+    case .written: return 1022
+    case .yday: return 1023
     case .UNRECOGNIZED(let i): return i
     default: break
     }
@@ -3205,6 +3226,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .clearEditionIntroduced,
     .clearEditionRemoved,
     .clearEnd,
+    .clearEnforceNamingStyle,
     .clearEnumType,
     .clearExtendee,
     .clearExtensionValue,
@@ -3387,6 +3409,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .emitFieldName,
     .emitFieldNumber,
     .empty,
+    .emptyAnyTypeURL,
     .emptyData,
     .encodeAsBytes,
     .encoded,
@@ -3399,6 +3422,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .endMessageField,
     .endObject,
     .endRegularField,
+    .enforceNamingStyle,
     .enum,
     .enumDescriptorProto,
     .enumOptions,
@@ -3562,6 +3586,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .hasEditionIntroduced,
     .hasEditionRemoved,
     .hasEnd,
+    .hasEnforceNamingStyle,
     .hasEnumType,
     .hasExtendee,
     .hasExtensionValue,
@@ -3663,6 +3688,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .intersect,
     .into,
     .ints,
+    .invalidAnyTypeURL,
     .isA,
     .isEqual,
     .isEqualTo,
@@ -3680,9 +3706,11 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .javaPackage,
     .javaStringCheckUtf8,
     .jsondecoder,
+    .jsondecoding,
     .jsondecodingError,
     .jsondecodingOptions,
     .jsonEncoder,
+    .jsonencoding,
     .jsonencodingError,
     .jsonencodingOptions,
     .jsonencodingVisitor,
@@ -4230,925 +4258,932 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     94: .same(proto: "clearEditionIntroduced"),
     95: .same(proto: "clearEditionRemoved"),
     96: .same(proto: "clearEnd"),
-    97: .same(proto: "clearEnumType"),
-    98: .same(proto: "clearExtendee"),
-    99: .same(proto: "clearExtensionValue"),
-    100: .same(proto: "clearFeatures"),
-    101: .same(proto: "clearFeatureSupport"),
-    102: .same(proto: "clearFieldPresence"),
-    103: .same(proto: "clearFixedFeatures"),
-    104: .same(proto: "clearFullName"),
-    105: .same(proto: "clearGoPackage"),
-    106: .same(proto: "clearIdempotencyLevel"),
-    107: .same(proto: "clearIdentifierValue"),
-    108: .same(proto: "clearInputType"),
-    109: .same(proto: "clearIsExtension"),
-    110: .same(proto: "clearJavaGenerateEqualsAndHash"),
-    111: .same(proto: "clearJavaGenericServices"),
-    112: .same(proto: "clearJavaMultipleFiles"),
-    113: .same(proto: "clearJavaOuterClassname"),
-    114: .same(proto: "clearJavaPackage"),
-    115: .same(proto: "clearJavaStringCheckUtf8"),
-    116: .same(proto: "clearJsonFormat"),
-    117: .same(proto: "clearJsonName"),
-    118: .same(proto: "clearJstype"),
-    119: .same(proto: "clearLabel"),
-    120: .same(proto: "clearLazy"),
-    121: .same(proto: "clearLeadingComments"),
-    122: .same(proto: "clearMapEntry"),
-    123: .same(proto: "clearMaximumEdition"),
-    124: .same(proto: "clearMessageEncoding"),
-    125: .same(proto: "clearMessageSetWireFormat"),
-    126: .same(proto: "clearMinimumEdition"),
-    127: .same(proto: "clearName"),
-    128: .same(proto: "clearNamePart"),
-    129: .same(proto: "clearNegativeIntValue"),
-    130: .same(proto: "clearNoStandardDescriptorAccessor"),
-    131: .same(proto: "clearNumber"),
-    132: .same(proto: "clearObjcClassPrefix"),
-    133: .same(proto: "clearOneofIndex"),
-    134: .same(proto: "clearOptimizeFor"),
-    135: .same(proto: "clearOptions"),
-    136: .same(proto: "clearOutputType"),
-    137: .same(proto: "clearOverridableFeatures"),
-    138: .same(proto: "clearPackage"),
-    139: .same(proto: "clearPacked"),
-    140: .same(proto: "clearPhpClassPrefix"),
-    141: .same(proto: "clearPhpMetadataNamespace"),
-    142: .same(proto: "clearPhpNamespace"),
-    143: .same(proto: "clearPositiveIntValue"),
-    144: .same(proto: "clearProto3Optional"),
-    145: .same(proto: "clearPyGenericServices"),
-    146: .same(proto: "clearRepeated"),
-    147: .same(proto: "clearRepeatedFieldEncoding"),
-    148: .same(proto: "clearReserved"),
-    149: .same(proto: "clearRetention"),
-    150: .same(proto: "clearRubyPackage"),
-    151: .same(proto: "clearSemantic"),
-    152: .same(proto: "clearServerStreaming"),
-    153: .same(proto: "clearSourceCodeInfo"),
-    154: .same(proto: "clearSourceContext"),
-    155: .same(proto: "clearSourceFile"),
-    156: .same(proto: "clearStart"),
-    157: .same(proto: "clearStringValue"),
-    158: .same(proto: "clearSwiftPrefix"),
-    159: .same(proto: "clearSyntax"),
-    160: .same(proto: "clearTrailingComments"),
-    161: .same(proto: "clearType"),
-    162: .same(proto: "clearTypeName"),
-    163: .same(proto: "clearUnverifiedLazy"),
-    164: .same(proto: "clearUtf8Validation"),
-    165: .same(proto: "clearValue"),
-    166: .same(proto: "clearVerification"),
-    167: .same(proto: "clearWeak"),
-    168: .same(proto: "clientStreaming"),
-    169: .same(proto: "code"),
-    170: .same(proto: "codePoint"),
-    171: .same(proto: "codeUnits"),
-    172: .same(proto: "Collection"),
-    173: .same(proto: "com"),
-    174: .same(proto: "comma"),
-    175: .same(proto: "consumedBytes"),
-    176: .same(proto: "contains"),
-    177: .same(proto: "contentsOf"),
-    178: .same(proto: "ContiguousBytes"),
-    179: .same(proto: "copy"),
-    180: .same(proto: "count"),
-    181: .same(proto: "countVarintsInBuffer"),
-    182: .same(proto: "csharpNamespace"),
-    183: .same(proto: "ctype"),
-    184: .same(proto: "customCodable"),
-    185: .same(proto: "CustomDebugStringConvertible"),
-    186: .same(proto: "CustomStringConvertible"),
-    187: .same(proto: "d"),
-    188: .same(proto: "Data"),
-    189: .same(proto: "dataResult"),
-    190: .same(proto: "date"),
-    191: .same(proto: "daySec"),
-    192: .same(proto: "daysSinceEpoch"),
-    193: .same(proto: "debugDescription"),
-    194: .same(proto: "debugRedact"),
-    195: .same(proto: "declaration"),
-    196: .same(proto: "decoded"),
-    197: .same(proto: "decodedFromJSONNull"),
-    198: .same(proto: "decodeExtensionField"),
-    199: .same(proto: "decodeExtensionFieldsAsMessageSet"),
-    200: .same(proto: "decodeJSON"),
-    201: .same(proto: "decodeMapField"),
-    202: .same(proto: "decodeMessage"),
-    203: .same(proto: "decoder"),
-    204: .same(proto: "decodeRepeated"),
-    205: .same(proto: "decodeRepeatedBoolField"),
-    206: .same(proto: "decodeRepeatedBytesField"),
-    207: .same(proto: "decodeRepeatedDoubleField"),
-    208: .same(proto: "decodeRepeatedEnumField"),
-    209: .same(proto: "decodeRepeatedFixed32Field"),
-    210: .same(proto: "decodeRepeatedFixed64Field"),
-    211: .same(proto: "decodeRepeatedFloatField"),
-    212: .same(proto: "decodeRepeatedGroupField"),
-    213: .same(proto: "decodeRepeatedInt32Field"),
-    214: .same(proto: "decodeRepeatedInt64Field"),
-    215: .same(proto: "decodeRepeatedMessageField"),
-    216: .same(proto: "decodeRepeatedSFixed32Field"),
-    217: .same(proto: "decodeRepeatedSFixed64Field"),
-    218: .same(proto: "decodeRepeatedSInt32Field"),
-    219: .same(proto: "decodeRepeatedSInt64Field"),
-    220: .same(proto: "decodeRepeatedStringField"),
-    221: .same(proto: "decodeRepeatedUInt32Field"),
-    222: .same(proto: "decodeRepeatedUInt64Field"),
-    223: .same(proto: "decodeSingular"),
-    224: .same(proto: "decodeSingularBoolField"),
-    225: .same(proto: "decodeSingularBytesField"),
-    226: .same(proto: "decodeSingularDoubleField"),
-    227: .same(proto: "decodeSingularEnumField"),
-    228: .same(proto: "decodeSingularFixed32Field"),
-    229: .same(proto: "decodeSingularFixed64Field"),
-    230: .same(proto: "decodeSingularFloatField"),
-    231: .same(proto: "decodeSingularGroupField"),
-    232: .same(proto: "decodeSingularInt32Field"),
-    233: .same(proto: "decodeSingularInt64Field"),
-    234: .same(proto: "decodeSingularMessageField"),
-    235: .same(proto: "decodeSingularSFixed32Field"),
-    236: .same(proto: "decodeSingularSFixed64Field"),
-    237: .same(proto: "decodeSingularSInt32Field"),
-    238: .same(proto: "decodeSingularSInt64Field"),
-    239: .same(proto: "decodeSingularStringField"),
-    240: .same(proto: "decodeSingularUInt32Field"),
-    241: .same(proto: "decodeSingularUInt64Field"),
-    242: .same(proto: "decodeTextFormat"),
-    243: .same(proto: "defaultAnyTypeURLPrefix"),
-    244: .same(proto: "defaults"),
-    245: .same(proto: "defaultValue"),
-    246: .same(proto: "dependency"),
-    247: .same(proto: "deprecated"),
-    248: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
-    249: .same(proto: "deprecationWarning"),
-    250: .same(proto: "description"),
-    251: .same(proto: "DescriptorProto"),
-    252: .same(proto: "Dictionary"),
-    253: .same(proto: "dictionaryLiteral"),
-    254: .same(proto: "digit"),
-    255: .same(proto: "digit0"),
-    256: .same(proto: "digit1"),
-    257: .same(proto: "digitCount"),
-    258: .same(proto: "digits"),
-    259: .same(proto: "digitValue"),
-    260: .same(proto: "discardableResult"),
-    261: .same(proto: "discardUnknownFields"),
-    262: .same(proto: "Double"),
-    263: .same(proto: "doubleValue"),
-    264: .same(proto: "Duration"),
-    265: .same(proto: "E"),
-    266: .same(proto: "edition"),
-    267: .same(proto: "EditionDefault"),
-    268: .same(proto: "editionDefaults"),
-    269: .same(proto: "editionDeprecated"),
-    270: .same(proto: "editionIntroduced"),
-    271: .same(proto: "editionRemoved"),
-    272: .same(proto: "Element"),
-    273: .same(proto: "elements"),
-    274: .same(proto: "else"),
-    275: .same(proto: "emitExtensionFieldName"),
-    276: .same(proto: "emitFieldName"),
-    277: .same(proto: "emitFieldNumber"),
-    278: .same(proto: "Empty"),
-    279: .same(proto: "emptyData"),
-    280: .same(proto: "encodeAsBytes"),
-    281: .same(proto: "encoded"),
-    282: .same(proto: "encodedJSONString"),
-    283: .same(proto: "encodedSize"),
-    284: .same(proto: "encodeField"),
-    285: .same(proto: "encoder"),
-    286: .same(proto: "end"),
-    287: .same(proto: "endArray"),
-    288: .same(proto: "endMessageField"),
-    289: .same(proto: "endObject"),
-    290: .same(proto: "endRegularField"),
-    291: .same(proto: "enum"),
-    292: .same(proto: "EnumDescriptorProto"),
-    293: .same(proto: "EnumOptions"),
-    294: .same(proto: "EnumReservedRange"),
-    295: .same(proto: "enumType"),
-    296: .same(proto: "enumvalue"),
-    297: .same(proto: "EnumValueDescriptorProto"),
-    298: .same(proto: "EnumValueOptions"),
-    299: .same(proto: "Equatable"),
-    300: .same(proto: "Error"),
-    301: .same(proto: "ExpressibleByArrayLiteral"),
-    302: .same(proto: "ExpressibleByDictionaryLiteral"),
-    303: .same(proto: "ext"),
-    304: .same(proto: "extDecoder"),
-    305: .same(proto: "extendedGraphemeClusterLiteral"),
-    306: .same(proto: "ExtendedGraphemeClusterLiteralType"),
-    307: .same(proto: "extendee"),
-    308: .same(proto: "ExtensibleMessage"),
-    309: .same(proto: "extension"),
-    310: .same(proto: "ExtensionField"),
-    311: .same(proto: "extensionFieldNumber"),
-    312: .same(proto: "ExtensionFieldValueSet"),
-    313: .same(proto: "ExtensionMap"),
-    314: .same(proto: "extensionRange"),
-    315: .same(proto: "ExtensionRangeOptions"),
-    316: .same(proto: "extensions"),
-    317: .same(proto: "extras"),
-    318: .same(proto: "F"),
-    319: .same(proto: "false"),
-    320: .same(proto: "features"),
-    321: .same(proto: "FeatureSet"),
-    322: .same(proto: "FeatureSetDefaults"),
-    323: .same(proto: "FeatureSetEditionDefault"),
-    324: .same(proto: "featureSupport"),
-    325: .same(proto: "field"),
-    326: .same(proto: "fieldData"),
-    327: .same(proto: "FieldDescriptorProto"),
-    328: .same(proto: "FieldMask"),
-    329: .same(proto: "FieldMaskError"),
-    330: .same(proto: "fieldName"),
-    331: .same(proto: "fieldNameCount"),
-    332: .same(proto: "fieldNum"),
-    333: .same(proto: "fieldNumber"),
-    334: .same(proto: "fieldNumberForProto"),
-    335: .same(proto: "FieldOptions"),
-    336: .same(proto: "fieldPresence"),
-    337: .same(proto: "fields"),
-    338: .same(proto: "fieldSize"),
-    339: .same(proto: "FieldTag"),
-    340: .same(proto: "FieldType"),
-    341: .same(proto: "file"),
-    342: .same(proto: "FileDescriptorProto"),
-    343: .same(proto: "FileDescriptorSet"),
-    344: .same(proto: "fileName"),
-    345: .same(proto: "FileOptions"),
-    346: .same(proto: "filter"),
-    347: .same(proto: "final"),
-    348: .same(proto: "finiteOnly"),
-    349: .same(proto: "first"),
-    350: .same(proto: "firstItem"),
-    351: .same(proto: "fixedFeatures"),
-    352: .same(proto: "Float"),
-    353: .same(proto: "floatLiteral"),
-    354: .same(proto: "FloatLiteralType"),
-    355: .same(proto: "FloatValue"),
-    356: .same(proto: "for"),
-    357: .same(proto: "forMessageName"),
-    358: .same(proto: "formUnion"),
-    359: .same(proto: "forReadingFrom"),
-    360: .same(proto: "forTypeURL"),
-    361: .same(proto: "ForwardParser"),
-    362: .same(proto: "forWritingInto"),
-    363: .same(proto: "from"),
-    364: .same(proto: "fromAscii2"),
-    365: .same(proto: "fromAscii4"),
-    366: .same(proto: "fromByteOffset"),
-    367: .same(proto: "fromHexDigit"),
-    368: .same(proto: "fullName"),
-    369: .same(proto: "func"),
-    370: .same(proto: "function"),
-    371: .same(proto: "G"),
-    372: .same(proto: "GeneratedCodeInfo"),
-    373: .same(proto: "get"),
-    374: .same(proto: "getExtensionValue"),
-    375: .same(proto: "googleapis"),
-    376: .same(proto: "Google_Protobuf_Any"),
-    377: .same(proto: "Google_Protobuf_Api"),
-    378: .same(proto: "Google_Protobuf_BoolValue"),
-    379: .same(proto: "Google_Protobuf_BytesValue"),
-    380: .same(proto: "Google_Protobuf_DescriptorProto"),
-    381: .same(proto: "Google_Protobuf_DoubleValue"),
-    382: .same(proto: "Google_Protobuf_Duration"),
-    383: .same(proto: "Google_Protobuf_Edition"),
-    384: .same(proto: "Google_Protobuf_Empty"),
-    385: .same(proto: "Google_Protobuf_Enum"),
-    386: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
-    387: .same(proto: "Google_Protobuf_EnumOptions"),
-    388: .same(proto: "Google_Protobuf_EnumValue"),
-    389: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    390: .same(proto: "Google_Protobuf_EnumValueOptions"),
-    391: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    392: .same(proto: "Google_Protobuf_FeatureSet"),
-    393: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
-    394: .same(proto: "Google_Protobuf_Field"),
-    395: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
-    396: .same(proto: "Google_Protobuf_FieldMask"),
-    397: .same(proto: "Google_Protobuf_FieldOptions"),
-    398: .same(proto: "Google_Protobuf_FileDescriptorProto"),
-    399: .same(proto: "Google_Protobuf_FileDescriptorSet"),
-    400: .same(proto: "Google_Protobuf_FileOptions"),
-    401: .same(proto: "Google_Protobuf_FloatValue"),
-    402: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    403: .same(proto: "Google_Protobuf_Int32Value"),
-    404: .same(proto: "Google_Protobuf_Int64Value"),
-    405: .same(proto: "Google_Protobuf_ListValue"),
-    406: .same(proto: "Google_Protobuf_MessageOptions"),
-    407: .same(proto: "Google_Protobuf_Method"),
-    408: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
-    409: .same(proto: "Google_Protobuf_MethodOptions"),
-    410: .same(proto: "Google_Protobuf_Mixin"),
-    411: .same(proto: "Google_Protobuf_NullValue"),
-    412: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
-    413: .same(proto: "Google_Protobuf_OneofOptions"),
-    414: .same(proto: "Google_Protobuf_Option"),
-    415: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    416: .same(proto: "Google_Protobuf_ServiceOptions"),
-    417: .same(proto: "Google_Protobuf_SourceCodeInfo"),
-    418: .same(proto: "Google_Protobuf_SourceContext"),
-    419: .same(proto: "Google_Protobuf_StringValue"),
-    420: .same(proto: "Google_Protobuf_Struct"),
-    421: .same(proto: "Google_Protobuf_Syntax"),
-    422: .same(proto: "Google_Protobuf_Timestamp"),
-    423: .same(proto: "Google_Protobuf_Type"),
-    424: .same(proto: "Google_Protobuf_UInt32Value"),
-    425: .same(proto: "Google_Protobuf_UInt64Value"),
-    426: .same(proto: "Google_Protobuf_UninterpretedOption"),
-    427: .same(proto: "Google_Protobuf_Value"),
-    428: .same(proto: "goPackage"),
-    429: .same(proto: "group"),
-    430: .same(proto: "groupFieldNumberStack"),
-    431: .same(proto: "groupSize"),
-    432: .same(proto: "guard"),
-    433: .same(proto: "hadOneofValue"),
-    434: .same(proto: "handleConflictingOneOf"),
-    435: .same(proto: "hasAggregateValue"),
-    436: .same(proto: "hasAllowAlias"),
-    437: .same(proto: "hasBegin"),
-    438: .same(proto: "hasCcEnableArenas"),
-    439: .same(proto: "hasCcGenericServices"),
-    440: .same(proto: "hasClientStreaming"),
-    441: .same(proto: "hasCsharpNamespace"),
-    442: .same(proto: "hasCtype"),
-    443: .same(proto: "hasDebugRedact"),
-    444: .same(proto: "hasDefaultValue"),
-    445: .same(proto: "hasDeprecated"),
-    446: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
-    447: .same(proto: "hasDeprecationWarning"),
-    448: .same(proto: "hasDoubleValue"),
-    449: .same(proto: "hasEdition"),
-    450: .same(proto: "hasEditionDeprecated"),
-    451: .same(proto: "hasEditionIntroduced"),
-    452: .same(proto: "hasEditionRemoved"),
-    453: .same(proto: "hasEnd"),
-    454: .same(proto: "hasEnumType"),
-    455: .same(proto: "hasExtendee"),
-    456: .same(proto: "hasExtensionValue"),
-    457: .same(proto: "hasFeatures"),
-    458: .same(proto: "hasFeatureSupport"),
-    459: .same(proto: "hasFieldPresence"),
-    460: .same(proto: "hasFixedFeatures"),
-    461: .same(proto: "hasFullName"),
-    462: .same(proto: "hasGoPackage"),
-    463: .same(proto: "hash"),
-    464: .same(proto: "Hashable"),
-    465: .same(proto: "hasher"),
-    466: .same(proto: "HashVisitor"),
-    467: .same(proto: "hasIdempotencyLevel"),
-    468: .same(proto: "hasIdentifierValue"),
-    469: .same(proto: "hasInputType"),
-    470: .same(proto: "hasIsExtension"),
-    471: .same(proto: "hasJavaGenerateEqualsAndHash"),
-    472: .same(proto: "hasJavaGenericServices"),
-    473: .same(proto: "hasJavaMultipleFiles"),
-    474: .same(proto: "hasJavaOuterClassname"),
-    475: .same(proto: "hasJavaPackage"),
-    476: .same(proto: "hasJavaStringCheckUtf8"),
-    477: .same(proto: "hasJsonFormat"),
-    478: .same(proto: "hasJsonName"),
-    479: .same(proto: "hasJstype"),
-    480: .same(proto: "hasLabel"),
-    481: .same(proto: "hasLazy"),
-    482: .same(proto: "hasLeadingComments"),
-    483: .same(proto: "hasMapEntry"),
-    484: .same(proto: "hasMaximumEdition"),
-    485: .same(proto: "hasMessageEncoding"),
-    486: .same(proto: "hasMessageSetWireFormat"),
-    487: .same(proto: "hasMinimumEdition"),
-    488: .same(proto: "hasName"),
-    489: .same(proto: "hasNamePart"),
-    490: .same(proto: "hasNegativeIntValue"),
-    491: .same(proto: "hasNoStandardDescriptorAccessor"),
-    492: .same(proto: "hasNumber"),
-    493: .same(proto: "hasObjcClassPrefix"),
-    494: .same(proto: "hasOneofIndex"),
-    495: .same(proto: "hasOptimizeFor"),
-    496: .same(proto: "hasOptions"),
-    497: .same(proto: "hasOutputType"),
-    498: .same(proto: "hasOverridableFeatures"),
-    499: .same(proto: "hasPackage"),
-    500: .same(proto: "hasPacked"),
-    501: .same(proto: "hasPhpClassPrefix"),
-    502: .same(proto: "hasPhpMetadataNamespace"),
-    503: .same(proto: "hasPhpNamespace"),
-    504: .same(proto: "hasPositiveIntValue"),
-    505: .same(proto: "hasProto3Optional"),
-    506: .same(proto: "hasPyGenericServices"),
-    507: .same(proto: "hasRepeated"),
-    508: .same(proto: "hasRepeatedFieldEncoding"),
-    509: .same(proto: "hasReserved"),
-    510: .same(proto: "hasRetention"),
-    511: .same(proto: "hasRubyPackage"),
-    512: .same(proto: "hasSemantic"),
-    513: .same(proto: "hasServerStreaming"),
-    514: .same(proto: "hasSourceCodeInfo"),
-    515: .same(proto: "hasSourceContext"),
-    516: .same(proto: "hasSourceFile"),
-    517: .same(proto: "hasStart"),
-    518: .same(proto: "hasStringValue"),
-    519: .same(proto: "hasSwiftPrefix"),
-    520: .same(proto: "hasSyntax"),
-    521: .same(proto: "hasTrailingComments"),
-    522: .same(proto: "hasType"),
-    523: .same(proto: "hasTypeName"),
-    524: .same(proto: "hasUnverifiedLazy"),
-    525: .same(proto: "hasUtf8Validation"),
-    526: .same(proto: "hasValue"),
-    527: .same(proto: "hasVerification"),
-    528: .same(proto: "hasWeak"),
-    529: .same(proto: "hour"),
-    530: .same(proto: "i"),
-    531: .same(proto: "idempotencyLevel"),
-    532: .same(proto: "identifierValue"),
-    533: .same(proto: "if"),
-    534: .same(proto: "ignoreUnknownExtensionFields"),
-    535: .same(proto: "ignoreUnknownFields"),
-    536: .same(proto: "index"),
-    537: .same(proto: "init"),
-    538: .same(proto: "inout"),
-    539: .same(proto: "inputType"),
-    540: .same(proto: "insert"),
-    541: .same(proto: "Int"),
-    542: .same(proto: "Int32"),
-    543: .same(proto: "Int32Value"),
-    544: .same(proto: "Int64"),
-    545: .same(proto: "Int64Value"),
-    546: .same(proto: "Int8"),
-    547: .same(proto: "integerLiteral"),
-    548: .same(proto: "IntegerLiteralType"),
-    549: .same(proto: "intern"),
-    550: .same(proto: "Internal"),
-    551: .same(proto: "InternalState"),
-    552: .same(proto: "intersect"),
-    553: .same(proto: "into"),
-    554: .same(proto: "ints"),
-    555: .same(proto: "isA"),
-    556: .same(proto: "isEqual"),
-    557: .same(proto: "isEqualTo"),
-    558: .same(proto: "isExtension"),
-    559: .same(proto: "isInitialized"),
-    560: .same(proto: "isNegative"),
-    561: .same(proto: "isPathValid"),
-    562: .same(proto: "isValid"),
-    563: .same(proto: "itemTagsEncodedSize"),
-    564: .same(proto: "iterator"),
-    565: .same(proto: "javaGenerateEqualsAndHash"),
-    566: .same(proto: "javaGenericServices"),
-    567: .same(proto: "javaMultipleFiles"),
-    568: .same(proto: "javaOuterClassname"),
-    569: .same(proto: "javaPackage"),
-    570: .same(proto: "javaStringCheckUtf8"),
-    571: .same(proto: "JSONDecoder"),
-    572: .same(proto: "JSONDecodingError"),
-    573: .same(proto: "JSONDecodingOptions"),
-    574: .same(proto: "jsonEncoder"),
-    575: .same(proto: "JSONEncodingError"),
-    576: .same(proto: "JSONEncodingOptions"),
-    577: .same(proto: "JSONEncodingVisitor"),
-    578: .same(proto: "jsonFormat"),
-    579: .same(proto: "JSONMapEncodingVisitor"),
-    580: .same(proto: "jsonName"),
-    581: .same(proto: "jsonPath"),
-    582: .same(proto: "jsonPaths"),
-    583: .same(proto: "JSONScanner"),
-    584: .same(proto: "jsonString"),
-    585: .same(proto: "jsonText"),
-    586: .same(proto: "jsonUTF8Bytes"),
-    587: .same(proto: "jsonUTF8Data"),
-    588: .same(proto: "jstype"),
-    589: .same(proto: "k"),
-    590: .same(proto: "kChunkSize"),
-    591: .same(proto: "Key"),
-    592: .same(proto: "keyField"),
-    593: .same(proto: "keyFieldOpt"),
-    594: .same(proto: "KeyType"),
-    595: .same(proto: "kind"),
-    596: .same(proto: "l"),
-    597: .same(proto: "label"),
-    598: .same(proto: "lazy"),
-    599: .same(proto: "leadingComments"),
-    600: .same(proto: "leadingDetachedComments"),
-    601: .same(proto: "length"),
-    602: .same(proto: "lessThan"),
-    603: .same(proto: "let"),
-    604: .same(proto: "lhs"),
-    605: .same(proto: "line"),
-    606: .same(proto: "list"),
-    607: .same(proto: "listOfMessages"),
-    608: .same(proto: "listValue"),
-    609: .same(proto: "littleEndian"),
-    610: .same(proto: "load"),
-    611: .same(proto: "localHasher"),
-    612: .same(proto: "location"),
-    613: .same(proto: "M"),
-    614: .same(proto: "major"),
-    615: .same(proto: "makeAsyncIterator"),
-    616: .same(proto: "makeIterator"),
-    617: .same(proto: "malformedLength"),
-    618: .same(proto: "mapEntry"),
-    619: .same(proto: "MapKeyType"),
-    620: .same(proto: "mapToMessages"),
-    621: .same(proto: "MapValueType"),
-    622: .same(proto: "mapVisitor"),
-    623: .same(proto: "mask"),
-    624: .same(proto: "maximumEdition"),
-    625: .same(proto: "mdayStart"),
-    626: .same(proto: "merge"),
-    627: .same(proto: "MergeOptions"),
-    628: .same(proto: "message"),
-    629: .same(proto: "messageDepthLimit"),
-    630: .same(proto: "messageEncoding"),
-    631: .same(proto: "MessageExtension"),
-    632: .same(proto: "MessageImplementationBase"),
-    633: .same(proto: "MessageOptions"),
-    634: .same(proto: "MessageSet"),
-    635: .same(proto: "messageSetWireFormat"),
-    636: .same(proto: "messageSize"),
-    637: .same(proto: "messageType"),
-    638: .same(proto: "Method"),
-    639: .same(proto: "MethodDescriptorProto"),
-    640: .same(proto: "MethodOptions"),
-    641: .same(proto: "methods"),
-    642: .same(proto: "min"),
-    643: .same(proto: "minimumEdition"),
-    644: .same(proto: "minor"),
-    645: .same(proto: "Mixin"),
-    646: .same(proto: "mixins"),
-    647: .same(proto: "modify"),
-    648: .same(proto: "month"),
-    649: .same(proto: "msgExtension"),
-    650: .same(proto: "mutating"),
-    651: .same(proto: "n"),
-    652: .same(proto: "name"),
-    653: .same(proto: "NameDescription"),
-    654: .same(proto: "NameMap"),
-    655: .same(proto: "NamePart"),
-    656: .same(proto: "names"),
-    657: .same(proto: "nanos"),
-    658: .same(proto: "negativeIntValue"),
-    659: .same(proto: "nestedType"),
-    660: .same(proto: "newExtensible"),
-    661: .same(proto: "newL"),
-    662: .same(proto: "newList"),
-    663: .same(proto: "newMessage"),
-    664: .same(proto: "newValue"),
-    665: .same(proto: "next"),
-    666: .same(proto: "nextByte"),
-    667: .same(proto: "nextFieldNumber"),
-    668: .same(proto: "nextVarInt"),
-    669: .same(proto: "nil"),
-    670: .same(proto: "nilLiteral"),
-    671: .same(proto: "noBytesAvailable"),
-    672: .same(proto: "noStandardDescriptorAccessor"),
-    673: .same(proto: "nullValue"),
-    674: .same(proto: "number"),
-    675: .same(proto: "numberValue"),
-    676: .same(proto: "objcClassPrefix"),
-    677: .same(proto: "of"),
-    678: .same(proto: "oneofDecl"),
-    679: .same(proto: "OneofDescriptorProto"),
-    680: .same(proto: "oneofIndex"),
-    681: .same(proto: "OneofOptions"),
-    682: .same(proto: "oneofs"),
-    683: .same(proto: "OneOf_Kind"),
-    684: .same(proto: "optimizeFor"),
-    685: .same(proto: "OptimizeMode"),
-    686: .same(proto: "Option"),
-    687: .same(proto: "OptionalEnumExtensionField"),
-    688: .same(proto: "OptionalExtensionField"),
-    689: .same(proto: "OptionalGroupExtensionField"),
-    690: .same(proto: "OptionalMessageExtensionField"),
-    691: .same(proto: "OptionRetention"),
-    692: .same(proto: "options"),
-    693: .same(proto: "OptionTargetType"),
-    694: .same(proto: "other"),
-    695: .same(proto: "others"),
-    696: .same(proto: "out"),
-    697: .same(proto: "outputType"),
-    698: .same(proto: "overridableFeatures"),
-    699: .same(proto: "p"),
-    700: .same(proto: "package"),
-    701: .same(proto: "packed"),
-    702: .same(proto: "PackedEnumExtensionField"),
-    703: .same(proto: "PackedExtensionField"),
-    704: .same(proto: "padding"),
-    705: .same(proto: "parent"),
-    706: .same(proto: "parse"),
-    707: .same(proto: "partial"),
-    708: .same(proto: "path"),
-    709: .same(proto: "PathDecoder"),
-    710: .same(proto: "PathDecodingError"),
-    711: .same(proto: "paths"),
-    712: .same(proto: "PathVisitor"),
-    713: .same(proto: "payload"),
-    714: .same(proto: "payloadSize"),
-    715: .same(proto: "phpClassPrefix"),
-    716: .same(proto: "phpMetadataNamespace"),
-    717: .same(proto: "phpNamespace"),
-    718: .same(proto: "pos"),
-    719: .same(proto: "positiveIntValue"),
-    720: .same(proto: "prefix"),
-    721: .same(proto: "preserveProtoFieldNames"),
-    722: .same(proto: "preTraverse"),
-    723: .same(proto: "prevPath"),
-    724: .same(proto: "printUnknownFields"),
-    725: .same(proto: "proto2"),
-    726: .same(proto: "proto3DefaultValue"),
-    727: .same(proto: "proto3Optional"),
-    728: .same(proto: "ProtobufAPIVersionCheck"),
-    729: .same(proto: "ProtobufAPIVersion_2"),
-    730: .same(proto: "ProtobufBool"),
-    731: .same(proto: "ProtobufBytes"),
-    732: .same(proto: "ProtobufDouble"),
-    733: .same(proto: "ProtobufEnumMap"),
-    734: .same(proto: "protobufExtension"),
-    735: .same(proto: "ProtobufFixed32"),
-    736: .same(proto: "ProtobufFixed64"),
-    737: .same(proto: "ProtobufFloat"),
-    738: .same(proto: "ProtobufInt32"),
-    739: .same(proto: "ProtobufInt64"),
-    740: .same(proto: "ProtobufMap"),
-    741: .same(proto: "ProtobufMessageMap"),
-    742: .same(proto: "ProtobufSFixed32"),
-    743: .same(proto: "ProtobufSFixed64"),
-    744: .same(proto: "ProtobufSInt32"),
-    745: .same(proto: "ProtobufSInt64"),
-    746: .same(proto: "ProtobufString"),
-    747: .same(proto: "ProtobufUInt32"),
-    748: .same(proto: "ProtobufUInt64"),
-    749: .same(proto: "protobuf_extensionFieldValues"),
-    750: .same(proto: "protobuf_fieldNumber"),
-    751: .same(proto: "protobuf_generated_isEqualTo"),
-    752: .same(proto: "protobuf_nameMap"),
-    753: .same(proto: "protobuf_newField"),
-    754: .same(proto: "protobuf_package"),
-    755: .same(proto: "protocol"),
-    756: .same(proto: "protoFieldName"),
-    757: .same(proto: "protoMessageName"),
-    758: .same(proto: "ProtoNameProviding"),
-    759: .same(proto: "protoPaths"),
-    760: .same(proto: "public"),
-    761: .same(proto: "publicDependency"),
-    762: .same(proto: "putBoolValue"),
-    763: .same(proto: "putBytesValue"),
-    764: .same(proto: "putDoubleValue"),
-    765: .same(proto: "putEnumValue"),
-    766: .same(proto: "putFixedUInt32"),
-    767: .same(proto: "putFixedUInt64"),
-    768: .same(proto: "putFloatValue"),
-    769: .same(proto: "putInt64"),
-    770: .same(proto: "putStringValue"),
-    771: .same(proto: "putUInt64"),
-    772: .same(proto: "putUInt64Hex"),
-    773: .same(proto: "putVarInt"),
-    774: .same(proto: "putZigZagVarInt"),
-    775: .same(proto: "pyGenericServices"),
-    776: .same(proto: "R"),
-    777: .same(proto: "rawChars"),
-    778: .same(proto: "RawRepresentable"),
-    779: .same(proto: "RawValue"),
-    780: .same(proto: "read4HexDigits"),
-    781: .same(proto: "readBytes"),
-    782: .same(proto: "register"),
-    783: .same(proto: "removingAllFieldsOf"),
-    784: .same(proto: "repeated"),
-    785: .same(proto: "RepeatedEnumExtensionField"),
-    786: .same(proto: "RepeatedExtensionField"),
-    787: .same(proto: "repeatedFieldEncoding"),
-    788: .same(proto: "RepeatedGroupExtensionField"),
-    789: .same(proto: "RepeatedMessageExtensionField"),
-    790: .same(proto: "repeating"),
-    791: .same(proto: "replaceRepeatedFields"),
-    792: .same(proto: "requestStreaming"),
-    793: .same(proto: "requestTypeURL"),
-    794: .same(proto: "requiredSize"),
-    795: .same(proto: "responseStreaming"),
-    796: .same(proto: "responseTypeURL"),
-    797: .same(proto: "result"),
-    798: .same(proto: "retention"),
-    799: .same(proto: "rethrows"),
-    800: .same(proto: "return"),
-    801: .same(proto: "ReturnType"),
-    802: .same(proto: "revision"),
-    803: .same(proto: "rhs"),
-    804: .same(proto: "root"),
-    805: .same(proto: "rubyPackage"),
-    806: .same(proto: "s"),
-    807: .same(proto: "sawBackslash"),
-    808: .same(proto: "sawSection4Characters"),
-    809: .same(proto: "sawSection5Characters"),
-    810: .same(proto: "scan"),
-    811: .same(proto: "scanner"),
-    812: .same(proto: "seconds"),
-    813: .same(proto: "self"),
-    814: .same(proto: "semantic"),
-    815: .same(proto: "Sendable"),
-    816: .same(proto: "separator"),
-    817: .same(proto: "serialize"),
-    818: .same(proto: "serializedBytes"),
-    819: .same(proto: "serializedData"),
-    820: .same(proto: "serializedSize"),
-    821: .same(proto: "serverStreaming"),
-    822: .same(proto: "service"),
-    823: .same(proto: "ServiceDescriptorProto"),
-    824: .same(proto: "ServiceOptions"),
-    825: .same(proto: "set"),
-    826: .same(proto: "setExtensionValue"),
-    827: .same(proto: "shift"),
-    828: .same(proto: "SimpleExtensionMap"),
-    829: .same(proto: "size"),
-    830: .same(proto: "sizer"),
-    831: .same(proto: "source"),
-    832: .same(proto: "sourceCodeInfo"),
-    833: .same(proto: "sourceContext"),
-    834: .same(proto: "sourceEncoding"),
-    835: .same(proto: "sourceFile"),
-    836: .same(proto: "SourceLocation"),
-    837: .same(proto: "span"),
-    838: .same(proto: "split"),
-    839: .same(proto: "start"),
-    840: .same(proto: "startArray"),
-    841: .same(proto: "startArrayObject"),
-    842: .same(proto: "startField"),
-    843: .same(proto: "startIndex"),
-    844: .same(proto: "startMessageField"),
-    845: .same(proto: "startObject"),
-    846: .same(proto: "startRegularField"),
-    847: .same(proto: "state"),
-    848: .same(proto: "static"),
-    849: .same(proto: "StaticString"),
-    850: .same(proto: "storage"),
-    851: .same(proto: "String"),
-    852: .same(proto: "stringLiteral"),
-    853: .same(proto: "StringLiteralType"),
-    854: .same(proto: "stringResult"),
-    855: .same(proto: "stringValue"),
-    856: .same(proto: "struct"),
-    857: .same(proto: "structValue"),
-    858: .same(proto: "subDecoder"),
-    859: .same(proto: "subscript"),
-    860: .same(proto: "subtract"),
-    861: .same(proto: "subVisitor"),
-    862: .same(proto: "Swift"),
-    863: .same(proto: "swiftPrefix"),
-    864: .same(proto: "SwiftProtobufContiguousBytes"),
-    865: .same(proto: "SwiftProtobufError"),
-    866: .same(proto: "syntax"),
-    867: .same(proto: "T"),
-    868: .same(proto: "tag"),
-    869: .same(proto: "targets"),
-    870: .same(proto: "terminator"),
-    871: .same(proto: "testDecoder"),
-    872: .same(proto: "text"),
-    873: .same(proto: "textDecoder"),
-    874: .same(proto: "TextFormatDecoder"),
-    875: .same(proto: "TextFormatDecodingError"),
-    876: .same(proto: "TextFormatDecodingOptions"),
-    877: .same(proto: "TextFormatEncodingOptions"),
-    878: .same(proto: "TextFormatEncodingVisitor"),
-    879: .same(proto: "textFormatString"),
-    880: .same(proto: "throwOrIgnore"),
-    881: .same(proto: "throws"),
-    882: .same(proto: "timeInterval"),
-    883: .same(proto: "timeIntervalSince1970"),
-    884: .same(proto: "timeIntervalSinceReferenceDate"),
-    885: .same(proto: "Timestamp"),
-    886: .same(proto: "tmp"),
-    887: .same(proto: "tooLarge"),
-    888: .same(proto: "total"),
-    889: .same(proto: "totalArrayDepth"),
-    890: .same(proto: "totalSize"),
-    891: .same(proto: "trailingComments"),
-    892: .same(proto: "traverse"),
-    893: .same(proto: "trim"),
-    894: .same(proto: "true"),
-    895: .same(proto: "try"),
-    896: .same(proto: "type"),
-    897: .same(proto: "typealias"),
-    898: .same(proto: "TypeEnum"),
-    899: .same(proto: "typeName"),
-    900: .same(proto: "typePrefix"),
-    901: .same(proto: "typeStart"),
-    902: .same(proto: "typeUnknown"),
-    903: .same(proto: "typeURL"),
-    904: .same(proto: "UInt32"),
-    905: .same(proto: "UInt32Value"),
-    906: .same(proto: "UInt64"),
-    907: .same(proto: "UInt64Value"),
-    908: .same(proto: "UInt8"),
-    909: .same(proto: "unchecked"),
-    910: .same(proto: "unicodeScalarLiteral"),
-    911: .same(proto: "UnicodeScalarLiteralType"),
-    912: .same(proto: "unicodeScalars"),
-    913: .same(proto: "UnicodeScalarView"),
-    914: .same(proto: "uninterpretedOption"),
-    915: .same(proto: "union"),
-    916: .same(proto: "uniqueStorage"),
-    917: .same(proto: "unknown"),
-    918: .same(proto: "unknownFields"),
-    919: .same(proto: "UnknownStorage"),
-    920: .same(proto: "unpackTo"),
-    921: .same(proto: "UnsafeBufferPointer"),
-    922: .same(proto: "UnsafeMutablePointer"),
-    923: .same(proto: "UnsafeMutableRawBufferPointer"),
-    924: .same(proto: "UnsafeRawBufferPointer"),
-    925: .same(proto: "UnsafeRawPointer"),
-    926: .same(proto: "unverifiedLazy"),
-    927: .same(proto: "updatedOptions"),
-    928: .same(proto: "url"),
-    929: .same(proto: "useDeterministicOrdering"),
-    930: .same(proto: "utf8"),
-    931: .same(proto: "utf8Ptr"),
-    932: .same(proto: "utf8ToDouble"),
-    933: .same(proto: "utf8Validation"),
-    934: .same(proto: "UTF8View"),
-    935: .same(proto: "v"),
-    936: .same(proto: "value"),
-    937: .same(proto: "valueField"),
-    938: .same(proto: "values"),
-    939: .same(proto: "ValueType"),
-    940: .same(proto: "var"),
-    941: .same(proto: "verification"),
-    942: .same(proto: "VerificationState"),
-    943: .same(proto: "Version"),
-    944: .same(proto: "versionString"),
-    945: .same(proto: "visitExtensionFields"),
-    946: .same(proto: "visitExtensionFieldsAsMessageSet"),
-    947: .same(proto: "visitMapField"),
-    948: .same(proto: "visitor"),
-    949: .same(proto: "visitPacked"),
-    950: .same(proto: "visitPackedBoolField"),
-    951: .same(proto: "visitPackedDoubleField"),
-    952: .same(proto: "visitPackedEnumField"),
-    953: .same(proto: "visitPackedFixed32Field"),
-    954: .same(proto: "visitPackedFixed64Field"),
-    955: .same(proto: "visitPackedFloatField"),
-    956: .same(proto: "visitPackedInt32Field"),
-    957: .same(proto: "visitPackedInt64Field"),
-    958: .same(proto: "visitPackedSFixed32Field"),
-    959: .same(proto: "visitPackedSFixed64Field"),
-    960: .same(proto: "visitPackedSInt32Field"),
-    961: .same(proto: "visitPackedSInt64Field"),
-    962: .same(proto: "visitPackedUInt32Field"),
-    963: .same(proto: "visitPackedUInt64Field"),
-    964: .same(proto: "visitRepeated"),
-    965: .same(proto: "visitRepeatedBoolField"),
-    966: .same(proto: "visitRepeatedBytesField"),
-    967: .same(proto: "visitRepeatedDoubleField"),
-    968: .same(proto: "visitRepeatedEnumField"),
-    969: .same(proto: "visitRepeatedFixed32Field"),
-    970: .same(proto: "visitRepeatedFixed64Field"),
-    971: .same(proto: "visitRepeatedFloatField"),
-    972: .same(proto: "visitRepeatedGroupField"),
-    973: .same(proto: "visitRepeatedInt32Field"),
-    974: .same(proto: "visitRepeatedInt64Field"),
-    975: .same(proto: "visitRepeatedMessageField"),
-    976: .same(proto: "visitRepeatedSFixed32Field"),
-    977: .same(proto: "visitRepeatedSFixed64Field"),
-    978: .same(proto: "visitRepeatedSInt32Field"),
-    979: .same(proto: "visitRepeatedSInt64Field"),
-    980: .same(proto: "visitRepeatedStringField"),
-    981: .same(proto: "visitRepeatedUInt32Field"),
-    982: .same(proto: "visitRepeatedUInt64Field"),
-    983: .same(proto: "visitSingular"),
-    984: .same(proto: "visitSingularBoolField"),
-    985: .same(proto: "visitSingularBytesField"),
-    986: .same(proto: "visitSingularDoubleField"),
-    987: .same(proto: "visitSingularEnumField"),
-    988: .same(proto: "visitSingularFixed32Field"),
-    989: .same(proto: "visitSingularFixed64Field"),
-    990: .same(proto: "visitSingularFloatField"),
-    991: .same(proto: "visitSingularGroupField"),
-    992: .same(proto: "visitSingularInt32Field"),
-    993: .same(proto: "visitSingularInt64Field"),
-    994: .same(proto: "visitSingularMessageField"),
-    995: .same(proto: "visitSingularSFixed32Field"),
-    996: .same(proto: "visitSingularSFixed64Field"),
-    997: .same(proto: "visitSingularSInt32Field"),
-    998: .same(proto: "visitSingularSInt64Field"),
-    999: .same(proto: "visitSingularStringField"),
-    1000: .same(proto: "visitSingularUInt32Field"),
-    1001: .same(proto: "visitSingularUInt64Field"),
-    1002: .same(proto: "visitUnknown"),
-    1003: .same(proto: "wasDecoded"),
-    1004: .same(proto: "weak"),
-    1005: .same(proto: "weakDependency"),
-    1006: .same(proto: "where"),
-    1007: .same(proto: "wireFormat"),
-    1008: .same(proto: "with"),
-    1009: .same(proto: "withUnsafeBytes"),
-    1010: .same(proto: "withUnsafeMutableBytes"),
-    1011: .same(proto: "work"),
-    1012: .same(proto: "Wrapped"),
-    1013: .same(proto: "WrappedType"),
-    1014: .same(proto: "wrappedValue"),
-    1015: .same(proto: "written"),
-    1016: .same(proto: "yday"),
+    97: .same(proto: "clearEnforceNamingStyle"),
+    98: .same(proto: "clearEnumType"),
+    99: .same(proto: "clearExtendee"),
+    100: .same(proto: "clearExtensionValue"),
+    101: .same(proto: "clearFeatures"),
+    102: .same(proto: "clearFeatureSupport"),
+    103: .same(proto: "clearFieldPresence"),
+    104: .same(proto: "clearFixedFeatures"),
+    105: .same(proto: "clearFullName"),
+    106: .same(proto: "clearGoPackage"),
+    107: .same(proto: "clearIdempotencyLevel"),
+    108: .same(proto: "clearIdentifierValue"),
+    109: .same(proto: "clearInputType"),
+    110: .same(proto: "clearIsExtension"),
+    111: .same(proto: "clearJavaGenerateEqualsAndHash"),
+    112: .same(proto: "clearJavaGenericServices"),
+    113: .same(proto: "clearJavaMultipleFiles"),
+    114: .same(proto: "clearJavaOuterClassname"),
+    115: .same(proto: "clearJavaPackage"),
+    116: .same(proto: "clearJavaStringCheckUtf8"),
+    117: .same(proto: "clearJsonFormat"),
+    118: .same(proto: "clearJsonName"),
+    119: .same(proto: "clearJstype"),
+    120: .same(proto: "clearLabel"),
+    121: .same(proto: "clearLazy"),
+    122: .same(proto: "clearLeadingComments"),
+    123: .same(proto: "clearMapEntry"),
+    124: .same(proto: "clearMaximumEdition"),
+    125: .same(proto: "clearMessageEncoding"),
+    126: .same(proto: "clearMessageSetWireFormat"),
+    127: .same(proto: "clearMinimumEdition"),
+    128: .same(proto: "clearName"),
+    129: .same(proto: "clearNamePart"),
+    130: .same(proto: "clearNegativeIntValue"),
+    131: .same(proto: "clearNoStandardDescriptorAccessor"),
+    132: .same(proto: "clearNumber"),
+    133: .same(proto: "clearObjcClassPrefix"),
+    134: .same(proto: "clearOneofIndex"),
+    135: .same(proto: "clearOptimizeFor"),
+    136: .same(proto: "clearOptions"),
+    137: .same(proto: "clearOutputType"),
+    138: .same(proto: "clearOverridableFeatures"),
+    139: .same(proto: "clearPackage"),
+    140: .same(proto: "clearPacked"),
+    141: .same(proto: "clearPhpClassPrefix"),
+    142: .same(proto: "clearPhpMetadataNamespace"),
+    143: .same(proto: "clearPhpNamespace"),
+    144: .same(proto: "clearPositiveIntValue"),
+    145: .same(proto: "clearProto3Optional"),
+    146: .same(proto: "clearPyGenericServices"),
+    147: .same(proto: "clearRepeated"),
+    148: .same(proto: "clearRepeatedFieldEncoding"),
+    149: .same(proto: "clearReserved"),
+    150: .same(proto: "clearRetention"),
+    151: .same(proto: "clearRubyPackage"),
+    152: .same(proto: "clearSemantic"),
+    153: .same(proto: "clearServerStreaming"),
+    154: .same(proto: "clearSourceCodeInfo"),
+    155: .same(proto: "clearSourceContext"),
+    156: .same(proto: "clearSourceFile"),
+    157: .same(proto: "clearStart"),
+    158: .same(proto: "clearStringValue"),
+    159: .same(proto: "clearSwiftPrefix"),
+    160: .same(proto: "clearSyntax"),
+    161: .same(proto: "clearTrailingComments"),
+    162: .same(proto: "clearType"),
+    163: .same(proto: "clearTypeName"),
+    164: .same(proto: "clearUnverifiedLazy"),
+    165: .same(proto: "clearUtf8Validation"),
+    166: .same(proto: "clearValue"),
+    167: .same(proto: "clearVerification"),
+    168: .same(proto: "clearWeak"),
+    169: .same(proto: "clientStreaming"),
+    170: .same(proto: "code"),
+    171: .same(proto: "codePoint"),
+    172: .same(proto: "codeUnits"),
+    173: .same(proto: "Collection"),
+    174: .same(proto: "com"),
+    175: .same(proto: "comma"),
+    176: .same(proto: "consumedBytes"),
+    177: .same(proto: "contains"),
+    178: .same(proto: "contentsOf"),
+    179: .same(proto: "ContiguousBytes"),
+    180: .same(proto: "copy"),
+    181: .same(proto: "count"),
+    182: .same(proto: "countVarintsInBuffer"),
+    183: .same(proto: "csharpNamespace"),
+    184: .same(proto: "ctype"),
+    185: .same(proto: "customCodable"),
+    186: .same(proto: "CustomDebugStringConvertible"),
+    187: .same(proto: "CustomStringConvertible"),
+    188: .same(proto: "d"),
+    189: .same(proto: "Data"),
+    190: .same(proto: "dataResult"),
+    191: .same(proto: "date"),
+    192: .same(proto: "daySec"),
+    193: .same(proto: "daysSinceEpoch"),
+    194: .same(proto: "debugDescription"),
+    195: .same(proto: "debugRedact"),
+    196: .same(proto: "declaration"),
+    197: .same(proto: "decoded"),
+    198: .same(proto: "decodedFromJSONNull"),
+    199: .same(proto: "decodeExtensionField"),
+    200: .same(proto: "decodeExtensionFieldsAsMessageSet"),
+    201: .same(proto: "decodeJSON"),
+    202: .same(proto: "decodeMapField"),
+    203: .same(proto: "decodeMessage"),
+    204: .same(proto: "decoder"),
+    205: .same(proto: "decodeRepeated"),
+    206: .same(proto: "decodeRepeatedBoolField"),
+    207: .same(proto: "decodeRepeatedBytesField"),
+    208: .same(proto: "decodeRepeatedDoubleField"),
+    209: .same(proto: "decodeRepeatedEnumField"),
+    210: .same(proto: "decodeRepeatedFixed32Field"),
+    211: .same(proto: "decodeRepeatedFixed64Field"),
+    212: .same(proto: "decodeRepeatedFloatField"),
+    213: .same(proto: "decodeRepeatedGroupField"),
+    214: .same(proto: "decodeRepeatedInt32Field"),
+    215: .same(proto: "decodeRepeatedInt64Field"),
+    216: .same(proto: "decodeRepeatedMessageField"),
+    217: .same(proto: "decodeRepeatedSFixed32Field"),
+    218: .same(proto: "decodeRepeatedSFixed64Field"),
+    219: .same(proto: "decodeRepeatedSInt32Field"),
+    220: .same(proto: "decodeRepeatedSInt64Field"),
+    221: .same(proto: "decodeRepeatedStringField"),
+    222: .same(proto: "decodeRepeatedUInt32Field"),
+    223: .same(proto: "decodeRepeatedUInt64Field"),
+    224: .same(proto: "decodeSingular"),
+    225: .same(proto: "decodeSingularBoolField"),
+    226: .same(proto: "decodeSingularBytesField"),
+    227: .same(proto: "decodeSingularDoubleField"),
+    228: .same(proto: "decodeSingularEnumField"),
+    229: .same(proto: "decodeSingularFixed32Field"),
+    230: .same(proto: "decodeSingularFixed64Field"),
+    231: .same(proto: "decodeSingularFloatField"),
+    232: .same(proto: "decodeSingularGroupField"),
+    233: .same(proto: "decodeSingularInt32Field"),
+    234: .same(proto: "decodeSingularInt64Field"),
+    235: .same(proto: "decodeSingularMessageField"),
+    236: .same(proto: "decodeSingularSFixed32Field"),
+    237: .same(proto: "decodeSingularSFixed64Field"),
+    238: .same(proto: "decodeSingularSInt32Field"),
+    239: .same(proto: "decodeSingularSInt64Field"),
+    240: .same(proto: "decodeSingularStringField"),
+    241: .same(proto: "decodeSingularUInt32Field"),
+    242: .same(proto: "decodeSingularUInt64Field"),
+    243: .same(proto: "decodeTextFormat"),
+    244: .same(proto: "defaultAnyTypeURLPrefix"),
+    245: .same(proto: "defaults"),
+    246: .same(proto: "defaultValue"),
+    247: .same(proto: "dependency"),
+    248: .same(proto: "deprecated"),
+    249: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
+    250: .same(proto: "deprecationWarning"),
+    251: .same(proto: "description"),
+    252: .same(proto: "DescriptorProto"),
+    253: .same(proto: "Dictionary"),
+    254: .same(proto: "dictionaryLiteral"),
+    255: .same(proto: "digit"),
+    256: .same(proto: "digit0"),
+    257: .same(proto: "digit1"),
+    258: .same(proto: "digitCount"),
+    259: .same(proto: "digits"),
+    260: .same(proto: "digitValue"),
+    261: .same(proto: "discardableResult"),
+    262: .same(proto: "discardUnknownFields"),
+    263: .same(proto: "Double"),
+    264: .same(proto: "doubleValue"),
+    265: .same(proto: "duration"),
+    266: .same(proto: "E"),
+    267: .same(proto: "edition"),
+    268: .same(proto: "EditionDefault"),
+    269: .same(proto: "editionDefaults"),
+    270: .same(proto: "editionDeprecated"),
+    271: .same(proto: "editionIntroduced"),
+    272: .same(proto: "editionRemoved"),
+    273: .same(proto: "Element"),
+    274: .same(proto: "elements"),
+    275: .same(proto: "else"),
+    276: .same(proto: "emitExtensionFieldName"),
+    277: .same(proto: "emitFieldName"),
+    278: .same(proto: "emitFieldNumber"),
+    279: .same(proto: "Empty"),
+    280: .same(proto: "emptyAnyTypeURL"),
+    281: .same(proto: "emptyData"),
+    282: .same(proto: "encodeAsBytes"),
+    283: .same(proto: "encoded"),
+    284: .same(proto: "encodedJSONString"),
+    285: .same(proto: "encodedSize"),
+    286: .same(proto: "encodeField"),
+    287: .same(proto: "encoder"),
+    288: .same(proto: "end"),
+    289: .same(proto: "endArray"),
+    290: .same(proto: "endMessageField"),
+    291: .same(proto: "endObject"),
+    292: .same(proto: "endRegularField"),
+    293: .same(proto: "enforceNamingStyle"),
+    294: .same(proto: "enum"),
+    295: .same(proto: "EnumDescriptorProto"),
+    296: .same(proto: "EnumOptions"),
+    297: .same(proto: "EnumReservedRange"),
+    298: .same(proto: "enumType"),
+    299: .same(proto: "enumvalue"),
+    300: .same(proto: "EnumValueDescriptorProto"),
+    301: .same(proto: "EnumValueOptions"),
+    302: .same(proto: "Equatable"),
+    303: .same(proto: "Error"),
+    304: .same(proto: "ExpressibleByArrayLiteral"),
+    305: .same(proto: "ExpressibleByDictionaryLiteral"),
+    306: .same(proto: "ext"),
+    307: .same(proto: "extDecoder"),
+    308: .same(proto: "extendedGraphemeClusterLiteral"),
+    309: .same(proto: "ExtendedGraphemeClusterLiteralType"),
+    310: .same(proto: "extendee"),
+    311: .same(proto: "ExtensibleMessage"),
+    312: .same(proto: "extension"),
+    313: .same(proto: "ExtensionField"),
+    314: .same(proto: "extensionFieldNumber"),
+    315: .same(proto: "ExtensionFieldValueSet"),
+    316: .same(proto: "ExtensionMap"),
+    317: .same(proto: "extensionRange"),
+    318: .same(proto: "ExtensionRangeOptions"),
+    319: .same(proto: "extensions"),
+    320: .same(proto: "extras"),
+    321: .same(proto: "F"),
+    322: .same(proto: "false"),
+    323: .same(proto: "features"),
+    324: .same(proto: "FeatureSet"),
+    325: .same(proto: "FeatureSetDefaults"),
+    326: .same(proto: "FeatureSetEditionDefault"),
+    327: .same(proto: "featureSupport"),
+    328: .same(proto: "field"),
+    329: .same(proto: "fieldData"),
+    330: .same(proto: "FieldDescriptorProto"),
+    331: .same(proto: "FieldMask"),
+    332: .same(proto: "FieldMaskError"),
+    333: .same(proto: "fieldName"),
+    334: .same(proto: "fieldNameCount"),
+    335: .same(proto: "fieldNum"),
+    336: .same(proto: "fieldNumber"),
+    337: .same(proto: "fieldNumberForProto"),
+    338: .same(proto: "FieldOptions"),
+    339: .same(proto: "fieldPresence"),
+    340: .same(proto: "fields"),
+    341: .same(proto: "fieldSize"),
+    342: .same(proto: "FieldTag"),
+    343: .same(proto: "FieldType"),
+    344: .same(proto: "file"),
+    345: .same(proto: "FileDescriptorProto"),
+    346: .same(proto: "FileDescriptorSet"),
+    347: .same(proto: "fileName"),
+    348: .same(proto: "FileOptions"),
+    349: .same(proto: "filter"),
+    350: .same(proto: "final"),
+    351: .same(proto: "finiteOnly"),
+    352: .same(proto: "first"),
+    353: .same(proto: "firstItem"),
+    354: .same(proto: "fixedFeatures"),
+    355: .same(proto: "Float"),
+    356: .same(proto: "floatLiteral"),
+    357: .same(proto: "FloatLiteralType"),
+    358: .same(proto: "FloatValue"),
+    359: .same(proto: "for"),
+    360: .same(proto: "forMessageName"),
+    361: .same(proto: "formUnion"),
+    362: .same(proto: "forReadingFrom"),
+    363: .same(proto: "forTypeURL"),
+    364: .same(proto: "ForwardParser"),
+    365: .same(proto: "forWritingInto"),
+    366: .same(proto: "from"),
+    367: .same(proto: "fromAscii2"),
+    368: .same(proto: "fromAscii4"),
+    369: .same(proto: "fromByteOffset"),
+    370: .same(proto: "fromHexDigit"),
+    371: .same(proto: "fullName"),
+    372: .same(proto: "func"),
+    373: .same(proto: "function"),
+    374: .same(proto: "G"),
+    375: .same(proto: "GeneratedCodeInfo"),
+    376: .same(proto: "get"),
+    377: .same(proto: "getExtensionValue"),
+    378: .same(proto: "googleapis"),
+    379: .same(proto: "Google_Protobuf_Any"),
+    380: .same(proto: "Google_Protobuf_Api"),
+    381: .same(proto: "Google_Protobuf_BoolValue"),
+    382: .same(proto: "Google_Protobuf_BytesValue"),
+    383: .same(proto: "Google_Protobuf_DescriptorProto"),
+    384: .same(proto: "Google_Protobuf_DoubleValue"),
+    385: .same(proto: "Google_Protobuf_Duration"),
+    386: .same(proto: "Google_Protobuf_Edition"),
+    387: .same(proto: "Google_Protobuf_Empty"),
+    388: .same(proto: "Google_Protobuf_Enum"),
+    389: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
+    390: .same(proto: "Google_Protobuf_EnumOptions"),
+    391: .same(proto: "Google_Protobuf_EnumValue"),
+    392: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    393: .same(proto: "Google_Protobuf_EnumValueOptions"),
+    394: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    395: .same(proto: "Google_Protobuf_FeatureSet"),
+    396: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
+    397: .same(proto: "Google_Protobuf_Field"),
+    398: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
+    399: .same(proto: "Google_Protobuf_FieldMask"),
+    400: .same(proto: "Google_Protobuf_FieldOptions"),
+    401: .same(proto: "Google_Protobuf_FileDescriptorProto"),
+    402: .same(proto: "Google_Protobuf_FileDescriptorSet"),
+    403: .same(proto: "Google_Protobuf_FileOptions"),
+    404: .same(proto: "Google_Protobuf_FloatValue"),
+    405: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    406: .same(proto: "Google_Protobuf_Int32Value"),
+    407: .same(proto: "Google_Protobuf_Int64Value"),
+    408: .same(proto: "Google_Protobuf_ListValue"),
+    409: .same(proto: "Google_Protobuf_MessageOptions"),
+    410: .same(proto: "Google_Protobuf_Method"),
+    411: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
+    412: .same(proto: "Google_Protobuf_MethodOptions"),
+    413: .same(proto: "Google_Protobuf_Mixin"),
+    414: .same(proto: "Google_Protobuf_NullValue"),
+    415: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
+    416: .same(proto: "Google_Protobuf_OneofOptions"),
+    417: .same(proto: "Google_Protobuf_Option"),
+    418: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    419: .same(proto: "Google_Protobuf_ServiceOptions"),
+    420: .same(proto: "Google_Protobuf_SourceCodeInfo"),
+    421: .same(proto: "Google_Protobuf_SourceContext"),
+    422: .same(proto: "Google_Protobuf_StringValue"),
+    423: .same(proto: "Google_Protobuf_Struct"),
+    424: .same(proto: "Google_Protobuf_Syntax"),
+    425: .same(proto: "Google_Protobuf_Timestamp"),
+    426: .same(proto: "Google_Protobuf_Type"),
+    427: .same(proto: "Google_Protobuf_UInt32Value"),
+    428: .same(proto: "Google_Protobuf_UInt64Value"),
+    429: .same(proto: "Google_Protobuf_UninterpretedOption"),
+    430: .same(proto: "Google_Protobuf_Value"),
+    431: .same(proto: "goPackage"),
+    432: .same(proto: "group"),
+    433: .same(proto: "groupFieldNumberStack"),
+    434: .same(proto: "groupSize"),
+    435: .same(proto: "guard"),
+    436: .same(proto: "hadOneofValue"),
+    437: .same(proto: "handleConflictingOneOf"),
+    438: .same(proto: "hasAggregateValue"),
+    439: .same(proto: "hasAllowAlias"),
+    440: .same(proto: "hasBegin"),
+    441: .same(proto: "hasCcEnableArenas"),
+    442: .same(proto: "hasCcGenericServices"),
+    443: .same(proto: "hasClientStreaming"),
+    444: .same(proto: "hasCsharpNamespace"),
+    445: .same(proto: "hasCtype"),
+    446: .same(proto: "hasDebugRedact"),
+    447: .same(proto: "hasDefaultValue"),
+    448: .same(proto: "hasDeprecated"),
+    449: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
+    450: .same(proto: "hasDeprecationWarning"),
+    451: .same(proto: "hasDoubleValue"),
+    452: .same(proto: "hasEdition"),
+    453: .same(proto: "hasEditionDeprecated"),
+    454: .same(proto: "hasEditionIntroduced"),
+    455: .same(proto: "hasEditionRemoved"),
+    456: .same(proto: "hasEnd"),
+    457: .same(proto: "hasEnforceNamingStyle"),
+    458: .same(proto: "hasEnumType"),
+    459: .same(proto: "hasExtendee"),
+    460: .same(proto: "hasExtensionValue"),
+    461: .same(proto: "hasFeatures"),
+    462: .same(proto: "hasFeatureSupport"),
+    463: .same(proto: "hasFieldPresence"),
+    464: .same(proto: "hasFixedFeatures"),
+    465: .same(proto: "hasFullName"),
+    466: .same(proto: "hasGoPackage"),
+    467: .same(proto: "hash"),
+    468: .same(proto: "Hashable"),
+    469: .same(proto: "hasher"),
+    470: .same(proto: "HashVisitor"),
+    471: .same(proto: "hasIdempotencyLevel"),
+    472: .same(proto: "hasIdentifierValue"),
+    473: .same(proto: "hasInputType"),
+    474: .same(proto: "hasIsExtension"),
+    475: .same(proto: "hasJavaGenerateEqualsAndHash"),
+    476: .same(proto: "hasJavaGenericServices"),
+    477: .same(proto: "hasJavaMultipleFiles"),
+    478: .same(proto: "hasJavaOuterClassname"),
+    479: .same(proto: "hasJavaPackage"),
+    480: .same(proto: "hasJavaStringCheckUtf8"),
+    481: .same(proto: "hasJsonFormat"),
+    482: .same(proto: "hasJsonName"),
+    483: .same(proto: "hasJstype"),
+    484: .same(proto: "hasLabel"),
+    485: .same(proto: "hasLazy"),
+    486: .same(proto: "hasLeadingComments"),
+    487: .same(proto: "hasMapEntry"),
+    488: .same(proto: "hasMaximumEdition"),
+    489: .same(proto: "hasMessageEncoding"),
+    490: .same(proto: "hasMessageSetWireFormat"),
+    491: .same(proto: "hasMinimumEdition"),
+    492: .same(proto: "hasName"),
+    493: .same(proto: "hasNamePart"),
+    494: .same(proto: "hasNegativeIntValue"),
+    495: .same(proto: "hasNoStandardDescriptorAccessor"),
+    496: .same(proto: "hasNumber"),
+    497: .same(proto: "hasObjcClassPrefix"),
+    498: .same(proto: "hasOneofIndex"),
+    499: .same(proto: "hasOptimizeFor"),
+    500: .same(proto: "hasOptions"),
+    501: .same(proto: "hasOutputType"),
+    502: .same(proto: "hasOverridableFeatures"),
+    503: .same(proto: "hasPackage"),
+    504: .same(proto: "hasPacked"),
+    505: .same(proto: "hasPhpClassPrefix"),
+    506: .same(proto: "hasPhpMetadataNamespace"),
+    507: .same(proto: "hasPhpNamespace"),
+    508: .same(proto: "hasPositiveIntValue"),
+    509: .same(proto: "hasProto3Optional"),
+    510: .same(proto: "hasPyGenericServices"),
+    511: .same(proto: "hasRepeated"),
+    512: .same(proto: "hasRepeatedFieldEncoding"),
+    513: .same(proto: "hasReserved"),
+    514: .same(proto: "hasRetention"),
+    515: .same(proto: "hasRubyPackage"),
+    516: .same(proto: "hasSemantic"),
+    517: .same(proto: "hasServerStreaming"),
+    518: .same(proto: "hasSourceCodeInfo"),
+    519: .same(proto: "hasSourceContext"),
+    520: .same(proto: "hasSourceFile"),
+    521: .same(proto: "hasStart"),
+    522: .same(proto: "hasStringValue"),
+    523: .same(proto: "hasSwiftPrefix"),
+    524: .same(proto: "hasSyntax"),
+    525: .same(proto: "hasTrailingComments"),
+    526: .same(proto: "hasType"),
+    527: .same(proto: "hasTypeName"),
+    528: .same(proto: "hasUnverifiedLazy"),
+    529: .same(proto: "hasUtf8Validation"),
+    530: .same(proto: "hasValue"),
+    531: .same(proto: "hasVerification"),
+    532: .same(proto: "hasWeak"),
+    533: .same(proto: "hour"),
+    534: .same(proto: "i"),
+    535: .same(proto: "idempotencyLevel"),
+    536: .same(proto: "identifierValue"),
+    537: .same(proto: "if"),
+    538: .same(proto: "ignoreUnknownExtensionFields"),
+    539: .same(proto: "ignoreUnknownFields"),
+    540: .same(proto: "index"),
+    541: .same(proto: "init"),
+    542: .same(proto: "inout"),
+    543: .same(proto: "inputType"),
+    544: .same(proto: "insert"),
+    545: .same(proto: "Int"),
+    546: .same(proto: "Int32"),
+    547: .same(proto: "Int32Value"),
+    548: .same(proto: "Int64"),
+    549: .same(proto: "Int64Value"),
+    550: .same(proto: "Int8"),
+    551: .same(proto: "integerLiteral"),
+    552: .same(proto: "IntegerLiteralType"),
+    553: .same(proto: "intern"),
+    554: .same(proto: "Internal"),
+    555: .same(proto: "InternalState"),
+    556: .same(proto: "intersect"),
+    557: .same(proto: "into"),
+    558: .same(proto: "ints"),
+    559: .same(proto: "invalidAnyTypeURL"),
+    560: .same(proto: "isA"),
+    561: .same(proto: "isEqual"),
+    562: .same(proto: "isEqualTo"),
+    563: .same(proto: "isExtension"),
+    564: .same(proto: "isInitialized"),
+    565: .same(proto: "isNegative"),
+    566: .same(proto: "isPathValid"),
+    567: .same(proto: "isValid"),
+    568: .same(proto: "itemTagsEncodedSize"),
+    569: .same(proto: "iterator"),
+    570: .same(proto: "javaGenerateEqualsAndHash"),
+    571: .same(proto: "javaGenericServices"),
+    572: .same(proto: "javaMultipleFiles"),
+    573: .same(proto: "javaOuterClassname"),
+    574: .same(proto: "javaPackage"),
+    575: .same(proto: "javaStringCheckUtf8"),
+    576: .same(proto: "JSONDecoder"),
+    577: .same(proto: "JSONDecoding"),
+    578: .same(proto: "JSONDecodingError"),
+    579: .same(proto: "JSONDecodingOptions"),
+    580: .same(proto: "jsonEncoder"),
+    581: .same(proto: "JSONEncoding"),
+    582: .same(proto: "JSONEncodingError"),
+    583: .same(proto: "JSONEncodingOptions"),
+    584: .same(proto: "JSONEncodingVisitor"),
+    585: .same(proto: "jsonFormat"),
+    586: .same(proto: "JSONMapEncodingVisitor"),
+    587: .same(proto: "jsonName"),
+    588: .same(proto: "jsonPath"),
+    589: .same(proto: "jsonPaths"),
+    590: .same(proto: "JSONScanner"),
+    591: .same(proto: "jsonString"),
+    592: .same(proto: "jsonText"),
+    593: .same(proto: "jsonUTF8Bytes"),
+    594: .same(proto: "jsonUTF8Data"),
+    595: .same(proto: "jstype"),
+    596: .same(proto: "k"),
+    597: .same(proto: "kChunkSize"),
+    598: .same(proto: "Key"),
+    599: .same(proto: "keyField"),
+    600: .same(proto: "keyFieldOpt"),
+    601: .same(proto: "KeyType"),
+    602: .same(proto: "kind"),
+    603: .same(proto: "l"),
+    604: .same(proto: "label"),
+    605: .same(proto: "lazy"),
+    606: .same(proto: "leadingComments"),
+    607: .same(proto: "leadingDetachedComments"),
+    608: .same(proto: "length"),
+    609: .same(proto: "lessThan"),
+    610: .same(proto: "let"),
+    611: .same(proto: "lhs"),
+    612: .same(proto: "line"),
+    613: .same(proto: "list"),
+    614: .same(proto: "listOfMessages"),
+    615: .same(proto: "listValue"),
+    616: .same(proto: "littleEndian"),
+    617: .same(proto: "load"),
+    618: .same(proto: "localHasher"),
+    619: .same(proto: "location"),
+    620: .same(proto: "M"),
+    621: .same(proto: "major"),
+    622: .same(proto: "makeAsyncIterator"),
+    623: .same(proto: "makeIterator"),
+    624: .same(proto: "malformedLength"),
+    625: .same(proto: "mapEntry"),
+    626: .same(proto: "MapKeyType"),
+    627: .same(proto: "mapToMessages"),
+    628: .same(proto: "MapValueType"),
+    629: .same(proto: "mapVisitor"),
+    630: .same(proto: "mask"),
+    631: .same(proto: "maximumEdition"),
+    632: .same(proto: "mdayStart"),
+    633: .same(proto: "merge"),
+    634: .same(proto: "MergeOptions"),
+    635: .same(proto: "message"),
+    636: .same(proto: "messageDepthLimit"),
+    637: .same(proto: "messageEncoding"),
+    638: .same(proto: "MessageExtension"),
+    639: .same(proto: "MessageImplementationBase"),
+    640: .same(proto: "MessageOptions"),
+    641: .same(proto: "MessageSet"),
+    642: .same(proto: "messageSetWireFormat"),
+    643: .same(proto: "messageSize"),
+    644: .same(proto: "messageType"),
+    645: .same(proto: "Method"),
+    646: .same(proto: "MethodDescriptorProto"),
+    647: .same(proto: "MethodOptions"),
+    648: .same(proto: "methods"),
+    649: .same(proto: "min"),
+    650: .same(proto: "minimumEdition"),
+    651: .same(proto: "minor"),
+    652: .same(proto: "Mixin"),
+    653: .same(proto: "mixins"),
+    654: .same(proto: "modify"),
+    655: .same(proto: "month"),
+    656: .same(proto: "msgExtension"),
+    657: .same(proto: "mutating"),
+    658: .same(proto: "n"),
+    659: .same(proto: "name"),
+    660: .same(proto: "NameDescription"),
+    661: .same(proto: "NameMap"),
+    662: .same(proto: "NamePart"),
+    663: .same(proto: "names"),
+    664: .same(proto: "nanos"),
+    665: .same(proto: "negativeIntValue"),
+    666: .same(proto: "nestedType"),
+    667: .same(proto: "newExtensible"),
+    668: .same(proto: "newL"),
+    669: .same(proto: "newList"),
+    670: .same(proto: "newMessage"),
+    671: .same(proto: "newValue"),
+    672: .same(proto: "next"),
+    673: .same(proto: "nextByte"),
+    674: .same(proto: "nextFieldNumber"),
+    675: .same(proto: "nextVarInt"),
+    676: .same(proto: "nil"),
+    677: .same(proto: "nilLiteral"),
+    678: .same(proto: "noBytesAvailable"),
+    679: .same(proto: "noStandardDescriptorAccessor"),
+    680: .same(proto: "nullValue"),
+    681: .same(proto: "number"),
+    682: .same(proto: "numberValue"),
+    683: .same(proto: "objcClassPrefix"),
+    684: .same(proto: "of"),
+    685: .same(proto: "oneofDecl"),
+    686: .same(proto: "OneofDescriptorProto"),
+    687: .same(proto: "oneofIndex"),
+    688: .same(proto: "OneofOptions"),
+    689: .same(proto: "oneofs"),
+    690: .same(proto: "OneOf_Kind"),
+    691: .same(proto: "optimizeFor"),
+    692: .same(proto: "OptimizeMode"),
+    693: .same(proto: "Option"),
+    694: .same(proto: "OptionalEnumExtensionField"),
+    695: .same(proto: "OptionalExtensionField"),
+    696: .same(proto: "OptionalGroupExtensionField"),
+    697: .same(proto: "OptionalMessageExtensionField"),
+    698: .same(proto: "OptionRetention"),
+    699: .same(proto: "options"),
+    700: .same(proto: "OptionTargetType"),
+    701: .same(proto: "other"),
+    702: .same(proto: "others"),
+    703: .same(proto: "out"),
+    704: .same(proto: "outputType"),
+    705: .same(proto: "overridableFeatures"),
+    706: .same(proto: "p"),
+    707: .same(proto: "package"),
+    708: .same(proto: "packed"),
+    709: .same(proto: "PackedEnumExtensionField"),
+    710: .same(proto: "PackedExtensionField"),
+    711: .same(proto: "padding"),
+    712: .same(proto: "parent"),
+    713: .same(proto: "parse"),
+    714: .same(proto: "partial"),
+    715: .same(proto: "path"),
+    716: .same(proto: "PathDecoder"),
+    717: .same(proto: "PathDecodingError"),
+    718: .same(proto: "paths"),
+    719: .same(proto: "PathVisitor"),
+    720: .same(proto: "payload"),
+    721: .same(proto: "payloadSize"),
+    722: .same(proto: "phpClassPrefix"),
+    723: .same(proto: "phpMetadataNamespace"),
+    724: .same(proto: "phpNamespace"),
+    725: .same(proto: "pos"),
+    726: .same(proto: "positiveIntValue"),
+    727: .same(proto: "prefix"),
+    728: .same(proto: "preserveProtoFieldNames"),
+    729: .same(proto: "preTraverse"),
+    730: .same(proto: "prevPath"),
+    731: .same(proto: "printUnknownFields"),
+    732: .same(proto: "proto2"),
+    733: .same(proto: "proto3DefaultValue"),
+    734: .same(proto: "proto3Optional"),
+    735: .same(proto: "ProtobufAPIVersionCheck"),
+    736: .same(proto: "ProtobufAPIVersion_2"),
+    737: .same(proto: "ProtobufBool"),
+    738: .same(proto: "ProtobufBytes"),
+    739: .same(proto: "ProtobufDouble"),
+    740: .same(proto: "ProtobufEnumMap"),
+    741: .same(proto: "protobufExtension"),
+    742: .same(proto: "ProtobufFixed32"),
+    743: .same(proto: "ProtobufFixed64"),
+    744: .same(proto: "ProtobufFloat"),
+    745: .same(proto: "ProtobufInt32"),
+    746: .same(proto: "ProtobufInt64"),
+    747: .same(proto: "ProtobufMap"),
+    748: .same(proto: "ProtobufMessageMap"),
+    749: .same(proto: "ProtobufSFixed32"),
+    750: .same(proto: "ProtobufSFixed64"),
+    751: .same(proto: "ProtobufSInt32"),
+    752: .same(proto: "ProtobufSInt64"),
+    753: .same(proto: "ProtobufString"),
+    754: .same(proto: "ProtobufUInt32"),
+    755: .same(proto: "ProtobufUInt64"),
+    756: .same(proto: "protobuf_extensionFieldValues"),
+    757: .same(proto: "protobuf_fieldNumber"),
+    758: .same(proto: "protobuf_generated_isEqualTo"),
+    759: .same(proto: "protobuf_nameMap"),
+    760: .same(proto: "protobuf_newField"),
+    761: .same(proto: "protobuf_package"),
+    762: .same(proto: "protocol"),
+    763: .same(proto: "protoFieldName"),
+    764: .same(proto: "protoMessageName"),
+    765: .same(proto: "ProtoNameProviding"),
+    766: .same(proto: "protoPaths"),
+    767: .same(proto: "public"),
+    768: .same(proto: "publicDependency"),
+    769: .same(proto: "putBoolValue"),
+    770: .same(proto: "putBytesValue"),
+    771: .same(proto: "putDoubleValue"),
+    772: .same(proto: "putEnumValue"),
+    773: .same(proto: "putFixedUInt32"),
+    774: .same(proto: "putFixedUInt64"),
+    775: .same(proto: "putFloatValue"),
+    776: .same(proto: "putInt64"),
+    777: .same(proto: "putStringValue"),
+    778: .same(proto: "putUInt64"),
+    779: .same(proto: "putUInt64Hex"),
+    780: .same(proto: "putVarInt"),
+    781: .same(proto: "putZigZagVarInt"),
+    782: .same(proto: "pyGenericServices"),
+    783: .same(proto: "R"),
+    784: .same(proto: "rawChars"),
+    785: .same(proto: "RawRepresentable"),
+    786: .same(proto: "RawValue"),
+    787: .same(proto: "read4HexDigits"),
+    788: .same(proto: "readBytes"),
+    789: .same(proto: "register"),
+    790: .same(proto: "removingAllFieldsOf"),
+    791: .same(proto: "repeated"),
+    792: .same(proto: "RepeatedEnumExtensionField"),
+    793: .same(proto: "RepeatedExtensionField"),
+    794: .same(proto: "repeatedFieldEncoding"),
+    795: .same(proto: "RepeatedGroupExtensionField"),
+    796: .same(proto: "RepeatedMessageExtensionField"),
+    797: .same(proto: "repeating"),
+    798: .same(proto: "replaceRepeatedFields"),
+    799: .same(proto: "requestStreaming"),
+    800: .same(proto: "requestTypeURL"),
+    801: .same(proto: "requiredSize"),
+    802: .same(proto: "responseStreaming"),
+    803: .same(proto: "responseTypeURL"),
+    804: .same(proto: "result"),
+    805: .same(proto: "retention"),
+    806: .same(proto: "rethrows"),
+    807: .same(proto: "return"),
+    808: .same(proto: "ReturnType"),
+    809: .same(proto: "revision"),
+    810: .same(proto: "rhs"),
+    811: .same(proto: "root"),
+    812: .same(proto: "rubyPackage"),
+    813: .same(proto: "s"),
+    814: .same(proto: "sawBackslash"),
+    815: .same(proto: "sawSection4Characters"),
+    816: .same(proto: "sawSection5Characters"),
+    817: .same(proto: "scan"),
+    818: .same(proto: "scanner"),
+    819: .same(proto: "seconds"),
+    820: .same(proto: "self"),
+    821: .same(proto: "semantic"),
+    822: .same(proto: "Sendable"),
+    823: .same(proto: "separator"),
+    824: .same(proto: "serialize"),
+    825: .same(proto: "serializedBytes"),
+    826: .same(proto: "serializedData"),
+    827: .same(proto: "serializedSize"),
+    828: .same(proto: "serverStreaming"),
+    829: .same(proto: "service"),
+    830: .same(proto: "ServiceDescriptorProto"),
+    831: .same(proto: "ServiceOptions"),
+    832: .same(proto: "set"),
+    833: .same(proto: "setExtensionValue"),
+    834: .same(proto: "shift"),
+    835: .same(proto: "SimpleExtensionMap"),
+    836: .same(proto: "size"),
+    837: .same(proto: "sizer"),
+    838: .same(proto: "source"),
+    839: .same(proto: "sourceCodeInfo"),
+    840: .same(proto: "sourceContext"),
+    841: .same(proto: "sourceEncoding"),
+    842: .same(proto: "sourceFile"),
+    843: .same(proto: "SourceLocation"),
+    844: .same(proto: "span"),
+    845: .same(proto: "split"),
+    846: .same(proto: "start"),
+    847: .same(proto: "startArray"),
+    848: .same(proto: "startArrayObject"),
+    849: .same(proto: "startField"),
+    850: .same(proto: "startIndex"),
+    851: .same(proto: "startMessageField"),
+    852: .same(proto: "startObject"),
+    853: .same(proto: "startRegularField"),
+    854: .same(proto: "state"),
+    855: .same(proto: "static"),
+    856: .same(proto: "StaticString"),
+    857: .same(proto: "storage"),
+    858: .same(proto: "String"),
+    859: .same(proto: "stringLiteral"),
+    860: .same(proto: "StringLiteralType"),
+    861: .same(proto: "stringResult"),
+    862: .same(proto: "stringValue"),
+    863: .same(proto: "struct"),
+    864: .same(proto: "structValue"),
+    865: .same(proto: "subDecoder"),
+    866: .same(proto: "subscript"),
+    867: .same(proto: "subtract"),
+    868: .same(proto: "subVisitor"),
+    869: .same(proto: "Swift"),
+    870: .same(proto: "swiftPrefix"),
+    871: .same(proto: "SwiftProtobufContiguousBytes"),
+    872: .same(proto: "SwiftProtobufError"),
+    873: .same(proto: "syntax"),
+    874: .same(proto: "T"),
+    875: .same(proto: "tag"),
+    876: .same(proto: "targets"),
+    877: .same(proto: "terminator"),
+    878: .same(proto: "testDecoder"),
+    879: .same(proto: "text"),
+    880: .same(proto: "textDecoder"),
+    881: .same(proto: "TextFormatDecoder"),
+    882: .same(proto: "TextFormatDecodingError"),
+    883: .same(proto: "TextFormatDecodingOptions"),
+    884: .same(proto: "TextFormatEncodingOptions"),
+    885: .same(proto: "TextFormatEncodingVisitor"),
+    886: .same(proto: "textFormatString"),
+    887: .same(proto: "throwOrIgnore"),
+    888: .same(proto: "throws"),
+    889: .same(proto: "timeInterval"),
+    890: .same(proto: "timeIntervalSince1970"),
+    891: .same(proto: "timeIntervalSinceReferenceDate"),
+    892: .same(proto: "Timestamp"),
+    893: .same(proto: "tmp"),
+    894: .same(proto: "tooLarge"),
+    895: .same(proto: "total"),
+    896: .same(proto: "totalArrayDepth"),
+    897: .same(proto: "totalSize"),
+    898: .same(proto: "trailingComments"),
+    899: .same(proto: "traverse"),
+    900: .same(proto: "trim"),
+    901: .same(proto: "true"),
+    902: .same(proto: "try"),
+    903: .same(proto: "type"),
+    904: .same(proto: "typealias"),
+    905: .same(proto: "TypeEnum"),
+    906: .same(proto: "typeName"),
+    907: .same(proto: "typePrefix"),
+    908: .same(proto: "typeStart"),
+    909: .same(proto: "typeUnknown"),
+    910: .same(proto: "typeURL"),
+    911: .same(proto: "UInt32"),
+    912: .same(proto: "UInt32Value"),
+    913: .same(proto: "UInt64"),
+    914: .same(proto: "UInt64Value"),
+    915: .same(proto: "UInt8"),
+    916: .same(proto: "unchecked"),
+    917: .same(proto: "unicodeScalarLiteral"),
+    918: .same(proto: "UnicodeScalarLiteralType"),
+    919: .same(proto: "unicodeScalars"),
+    920: .same(proto: "UnicodeScalarView"),
+    921: .same(proto: "uninterpretedOption"),
+    922: .same(proto: "union"),
+    923: .same(proto: "uniqueStorage"),
+    924: .same(proto: "unknown"),
+    925: .same(proto: "unknownFields"),
+    926: .same(proto: "UnknownStorage"),
+    927: .same(proto: "unpackTo"),
+    928: .same(proto: "UnsafeBufferPointer"),
+    929: .same(proto: "UnsafeMutablePointer"),
+    930: .same(proto: "UnsafeMutableRawBufferPointer"),
+    931: .same(proto: "UnsafeRawBufferPointer"),
+    932: .same(proto: "UnsafeRawPointer"),
+    933: .same(proto: "unverifiedLazy"),
+    934: .same(proto: "updatedOptions"),
+    935: .same(proto: "url"),
+    936: .same(proto: "useDeterministicOrdering"),
+    937: .same(proto: "utf8"),
+    938: .same(proto: "utf8Ptr"),
+    939: .same(proto: "utf8ToDouble"),
+    940: .same(proto: "utf8Validation"),
+    941: .same(proto: "UTF8View"),
+    942: .same(proto: "v"),
+    943: .same(proto: "value"),
+    944: .same(proto: "valueField"),
+    945: .same(proto: "values"),
+    946: .same(proto: "ValueType"),
+    947: .same(proto: "var"),
+    948: .same(proto: "verification"),
+    949: .same(proto: "VerificationState"),
+    950: .same(proto: "Version"),
+    951: .same(proto: "versionString"),
+    952: .same(proto: "visitExtensionFields"),
+    953: .same(proto: "visitExtensionFieldsAsMessageSet"),
+    954: .same(proto: "visitMapField"),
+    955: .same(proto: "visitor"),
+    956: .same(proto: "visitPacked"),
+    957: .same(proto: "visitPackedBoolField"),
+    958: .same(proto: "visitPackedDoubleField"),
+    959: .same(proto: "visitPackedEnumField"),
+    960: .same(proto: "visitPackedFixed32Field"),
+    961: .same(proto: "visitPackedFixed64Field"),
+    962: .same(proto: "visitPackedFloatField"),
+    963: .same(proto: "visitPackedInt32Field"),
+    964: .same(proto: "visitPackedInt64Field"),
+    965: .same(proto: "visitPackedSFixed32Field"),
+    966: .same(proto: "visitPackedSFixed64Field"),
+    967: .same(proto: "visitPackedSInt32Field"),
+    968: .same(proto: "visitPackedSInt64Field"),
+    969: .same(proto: "visitPackedUInt32Field"),
+    970: .same(proto: "visitPackedUInt64Field"),
+    971: .same(proto: "visitRepeated"),
+    972: .same(proto: "visitRepeatedBoolField"),
+    973: .same(proto: "visitRepeatedBytesField"),
+    974: .same(proto: "visitRepeatedDoubleField"),
+    975: .same(proto: "visitRepeatedEnumField"),
+    976: .same(proto: "visitRepeatedFixed32Field"),
+    977: .same(proto: "visitRepeatedFixed64Field"),
+    978: .same(proto: "visitRepeatedFloatField"),
+    979: .same(proto: "visitRepeatedGroupField"),
+    980: .same(proto: "visitRepeatedInt32Field"),
+    981: .same(proto: "visitRepeatedInt64Field"),
+    982: .same(proto: "visitRepeatedMessageField"),
+    983: .same(proto: "visitRepeatedSFixed32Field"),
+    984: .same(proto: "visitRepeatedSFixed64Field"),
+    985: .same(proto: "visitRepeatedSInt32Field"),
+    986: .same(proto: "visitRepeatedSInt64Field"),
+    987: .same(proto: "visitRepeatedStringField"),
+    988: .same(proto: "visitRepeatedUInt32Field"),
+    989: .same(proto: "visitRepeatedUInt64Field"),
+    990: .same(proto: "visitSingular"),
+    991: .same(proto: "visitSingularBoolField"),
+    992: .same(proto: "visitSingularBytesField"),
+    993: .same(proto: "visitSingularDoubleField"),
+    994: .same(proto: "visitSingularEnumField"),
+    995: .same(proto: "visitSingularFixed32Field"),
+    996: .same(proto: "visitSingularFixed64Field"),
+    997: .same(proto: "visitSingularFloatField"),
+    998: .same(proto: "visitSingularGroupField"),
+    999: .same(proto: "visitSingularInt32Field"),
+    1000: .same(proto: "visitSingularInt64Field"),
+    1001: .same(proto: "visitSingularMessageField"),
+    1002: .same(proto: "visitSingularSFixed32Field"),
+    1003: .same(proto: "visitSingularSFixed64Field"),
+    1004: .same(proto: "visitSingularSInt32Field"),
+    1005: .same(proto: "visitSingularSInt64Field"),
+    1006: .same(proto: "visitSingularStringField"),
+    1007: .same(proto: "visitSingularUInt32Field"),
+    1008: .same(proto: "visitSingularUInt64Field"),
+    1009: .same(proto: "visitUnknown"),
+    1010: .same(proto: "wasDecoded"),
+    1011: .same(proto: "weak"),
+    1012: .same(proto: "weakDependency"),
+    1013: .same(proto: "where"),
+    1014: .same(proto: "wireFormat"),
+    1015: .same(proto: "with"),
+    1016: .same(proto: "withUnsafeBytes"),
+    1017: .same(proto: "withUnsafeMutableBytes"),
+    1018: .same(proto: "work"),
+    1019: .same(proto: "Wrapped"),
+    1020: .same(proto: "WrappedType"),
+    1021: .same(proto: "wrappedValue"),
+    1022: .same(proto: "written"),
+    1023: .same(proto: "yday"),
   ]
 }
diff --git a/Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift b/Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift
index 5b6b008f5..d68e06030 100644
--- a/Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift
+++ b/Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift
@@ -2911,6 +2911,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum clearEnforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneClearEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneClearEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneClearEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneClearEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnforceNamingStyle] = [
+      .noneClearEnforceNamingStyle,
+    ]
+
+  }
+
   enum clearEnumType: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneClearEnumType // = 0
@@ -7921,7 +7951,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Duration: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum duration: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDuration // = 0
     case UNRECOGNIZED(Int)
@@ -7945,7 +7975,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration] = [
       .noneDuration,
     ]
 
@@ -8371,6 +8401,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum emptyAnyTypeURL: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneEmptyAnyTypeURL // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneEmptyAnyTypeURL
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneEmptyAnyTypeURL
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneEmptyAnyTypeURL: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyAnyTypeURL] = [
+      .noneEmptyAnyTypeURL,
+    ]
+
+  }
+
   enum emptyData: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneEmptyData // = 0
@@ -8731,6 +8791,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum enforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enforceNamingStyle] = [
+      .noneEnforceNamingStyle,
+    ]
+
+  }
+
   enum enumEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneEnum // = 0
@@ -13621,6 +13711,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum hasEnforceNamingStyle: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneHasEnforceNamingStyle // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneHasEnforceNamingStyle
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneHasEnforceNamingStyle
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneHasEnforceNamingStyle: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnforceNamingStyle] = [
+      .noneHasEnforceNamingStyle,
+    ]
+
+  }
+
   enum hasEnumType: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneHasEnumType // = 0
@@ -16651,6 +16771,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum invalidAnyTypeURL: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneInvalidAnyTypeURL // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneInvalidAnyTypeURL
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneInvalidAnyTypeURL
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneInvalidAnyTypeURL: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.invalidAnyTypeURL] = [
+      .noneInvalidAnyTypeURL,
+    ]
+
+  }
+
   enum isA: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneIsA // = 0
@@ -17161,6 +17311,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum JSONDecoding: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneJsondecoding // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneJsondecoding
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneJsondecoding
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneJsondecoding: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoding] = [
+      .noneJsondecoding,
+    ]
+
+  }
+
   enum JSONDecodingError: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneJsondecodingError // = 0
@@ -17251,6 +17431,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum JSONEncoding: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneJsonencoding // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneJsonencoding
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneJsonencoding
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneJsonencoding: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncoding] = [
+      .noneJsonencoding,
+    ]
+
+  }
+
   enum JSONEncodingError: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneJsonencodingError // = 0
@@ -31113,6 +31323,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnd: Swif
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_clearEnforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.clearEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_clearEnumType"),
@@ -32115,9 +32331,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.doubleValue: S
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Duration"),
+    0: .same(proto: "NONE_duration"),
   ]
 }
 
@@ -32205,6 +32421,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Empty: SwiftPr
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyAnyTypeURL: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_emptyAnyTypeURL"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.emptyData: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_emptyData"),
@@ -32277,6 +32499,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.endRegularFiel
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_enforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.enumEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_enum"),
@@ -33255,6 +33483,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnd: SwiftP
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnforceNamingStyle: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_hasEnforceNamingStyle"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.hasEnumType: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_hasEnumType"),
@@ -33861,6 +34095,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ints: SwiftPro
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.invalidAnyTypeURL: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_invalidAnyTypeURL"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.isA: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_isA"),
@@ -33963,6 +34203,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoder: S
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecoding: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_JSONDecoding"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONDecodingError: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_JSONDecodingError"),
@@ -33981,6 +34227,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.jsonEncoder: S
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncoding: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_JSONEncoding"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.JSONEncodingError: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_JSONEncodingError"),
diff --git a/Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift b/Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift
index 8786f008c..5c01c5fa1 100644
--- a/Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift
+++ b/Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift
@@ -509,6 +509,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._clearEnd_p = newValue}
   }
 
+  var clearEnforceNamingStyle_p: Int32 {
+    get {return _storage._clearEnforceNamingStyle_p}
+    set {_uniqueStorage()._clearEnforceNamingStyle_p = newValue}
+  }
+
   var clearEnumType_p: Int32 {
     get {return _storage._clearEnumType_p}
     set {_uniqueStorage()._clearEnumType_p = newValue}
@@ -1419,6 +1424,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._empty = newValue}
   }
 
+  var emptyAnyTypeURL: Int32 {
+    get {return _storage._emptyAnyTypeURL}
+    set {_uniqueStorage()._emptyAnyTypeURL = newValue}
+  }
+
   var emptyData: Int32 {
     get {return _storage._emptyData}
     set {_uniqueStorage()._emptyData = newValue}
@@ -1479,6 +1489,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._endRegularField = newValue}
   }
 
+  var enforceNamingStyle: Int32 {
+    get {return _storage._enforceNamingStyle}
+    set {_uniqueStorage()._enforceNamingStyle = newValue}
+  }
+
   var `enum`: Int32 {
     get {return _storage._enum}
     set {_uniqueStorage()._enum = newValue}
@@ -2294,6 +2309,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._hasEnd_p = newValue}
   }
 
+  var hasEnforceNamingStyle_p: Int32 {
+    get {return _storage._hasEnforceNamingStyle_p}
+    set {_uniqueStorage()._hasEnforceNamingStyle_p = newValue}
+  }
+
   var hasEnumType_p: Int32 {
     get {return _storage._hasEnumType_p}
     set {_uniqueStorage()._hasEnumType_p = newValue}
@@ -2799,6 +2819,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._ints = newValue}
   }
 
+  var invalidAnyTypeURL: Int32 {
+    get {return _storage._invalidAnyTypeURL}
+    set {_uniqueStorage()._invalidAnyTypeURL = newValue}
+  }
+
   var isA: Int32 {
     get {return _storage._isA}
     set {_uniqueStorage()._isA = newValue}
@@ -2884,6 +2909,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._jsondecoder = newValue}
   }
 
+  var jsondecoding: Int32 {
+    get {return _storage._jsondecoding}
+    set {_uniqueStorage()._jsondecoding = newValue}
+  }
+
   var jsondecodingError: Int32 {
     get {return _storage._jsondecodingError}
     set {_uniqueStorage()._jsondecodingError = newValue}
@@ -2899,6 +2929,11 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: @unchecked Send
     set {_uniqueStorage()._jsonEncoder = newValue}
   }
 
+  var jsonencoding: Int32 {
+    get {return _storage._jsonencoding}
+    set {_uniqueStorage()._jsonencoding = newValue}
+  }
+
   var jsonencodingError: Int32 {
     get {return _storage._jsonencodingError}
     set {_uniqueStorage()._jsonencodingError = newValue}
@@ -5219,926 +5254,933 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     94: .same(proto: "clearEditionIntroduced"),
     95: .same(proto: "clearEditionRemoved"),
     96: .same(proto: "clearEnd"),
-    97: .same(proto: "clearEnumType"),
-    98: .same(proto: "clearExtendee"),
-    99: .same(proto: "clearExtensionValue"),
-    100: .same(proto: "clearFeatures"),
-    101: .same(proto: "clearFeatureSupport"),
-    102: .same(proto: "clearFieldPresence"),
-    103: .same(proto: "clearFixedFeatures"),
-    104: .same(proto: "clearFullName"),
-    105: .same(proto: "clearGoPackage"),
-    106: .same(proto: "clearIdempotencyLevel"),
-    107: .same(proto: "clearIdentifierValue"),
-    108: .same(proto: "clearInputType"),
-    109: .same(proto: "clearIsExtension"),
-    110: .same(proto: "clearJavaGenerateEqualsAndHash"),
-    111: .same(proto: "clearJavaGenericServices"),
-    112: .same(proto: "clearJavaMultipleFiles"),
-    113: .same(proto: "clearJavaOuterClassname"),
-    114: .same(proto: "clearJavaPackage"),
-    115: .same(proto: "clearJavaStringCheckUtf8"),
-    116: .same(proto: "clearJsonFormat"),
-    117: .same(proto: "clearJsonName"),
-    118: .same(proto: "clearJstype"),
-    119: .same(proto: "clearLabel"),
-    120: .same(proto: "clearLazy"),
-    121: .same(proto: "clearLeadingComments"),
-    122: .same(proto: "clearMapEntry"),
-    123: .same(proto: "clearMaximumEdition"),
-    124: .same(proto: "clearMessageEncoding"),
-    125: .same(proto: "clearMessageSetWireFormat"),
-    126: .same(proto: "clearMinimumEdition"),
-    127: .same(proto: "clearName"),
-    128: .same(proto: "clearNamePart"),
-    129: .same(proto: "clearNegativeIntValue"),
-    130: .same(proto: "clearNoStandardDescriptorAccessor"),
-    131: .same(proto: "clearNumber"),
-    132: .same(proto: "clearObjcClassPrefix"),
-    133: .same(proto: "clearOneofIndex"),
-    134: .same(proto: "clearOptimizeFor"),
-    135: .same(proto: "clearOptions"),
-    136: .same(proto: "clearOutputType"),
-    137: .same(proto: "clearOverridableFeatures"),
-    138: .same(proto: "clearPackage"),
-    139: .same(proto: "clearPacked"),
-    140: .same(proto: "clearPhpClassPrefix"),
-    141: .same(proto: "clearPhpMetadataNamespace"),
-    142: .same(proto: "clearPhpNamespace"),
-    143: .same(proto: "clearPositiveIntValue"),
-    144: .same(proto: "clearProto3Optional"),
-    145: .same(proto: "clearPyGenericServices"),
-    146: .same(proto: "clearRepeated"),
-    147: .same(proto: "clearRepeatedFieldEncoding"),
-    148: .same(proto: "clearReserved"),
-    149: .same(proto: "clearRetention"),
-    150: .same(proto: "clearRubyPackage"),
-    151: .same(proto: "clearSemantic"),
-    152: .same(proto: "clearServerStreaming"),
-    153: .same(proto: "clearSourceCodeInfo"),
-    154: .same(proto: "clearSourceContext"),
-    155: .same(proto: "clearSourceFile"),
-    156: .same(proto: "clearStart"),
-    157: .same(proto: "clearStringValue"),
-    158: .same(proto: "clearSwiftPrefix"),
-    159: .same(proto: "clearSyntax"),
-    160: .same(proto: "clearTrailingComments"),
-    161: .same(proto: "clearType"),
-    162: .same(proto: "clearTypeName"),
-    163: .same(proto: "clearUnverifiedLazy"),
-    164: .same(proto: "clearUtf8Validation"),
-    165: .same(proto: "clearValue"),
-    166: .same(proto: "clearVerification"),
-    167: .same(proto: "clearWeak"),
-    168: .same(proto: "clientStreaming"),
-    169: .same(proto: "code"),
-    170: .same(proto: "codePoint"),
-    171: .same(proto: "codeUnits"),
-    172: .same(proto: "Collection"),
-    173: .same(proto: "com"),
-    174: .same(proto: "comma"),
-    175: .same(proto: "consumedBytes"),
-    176: .same(proto: "contains"),
-    177: .same(proto: "contentsOf"),
-    178: .same(proto: "ContiguousBytes"),
-    179: .same(proto: "copy"),
-    180: .same(proto: "count"),
-    181: .same(proto: "countVarintsInBuffer"),
-    182: .same(proto: "csharpNamespace"),
-    183: .same(proto: "ctype"),
-    184: .same(proto: "customCodable"),
-    185: .same(proto: "CustomDebugStringConvertible"),
-    186: .same(proto: "CustomStringConvertible"),
-    187: .same(proto: "d"),
-    188: .same(proto: "Data"),
-    189: .same(proto: "dataResult"),
-    190: .same(proto: "date"),
-    191: .same(proto: "daySec"),
-    192: .same(proto: "daysSinceEpoch"),
-    193: .same(proto: "debugDescription"),
-    194: .same(proto: "debugRedact"),
-    195: .same(proto: "declaration"),
-    196: .same(proto: "decoded"),
-    197: .same(proto: "decodedFromJSONNull"),
-    198: .same(proto: "decodeExtensionField"),
-    199: .same(proto: "decodeExtensionFieldsAsMessageSet"),
-    200: .same(proto: "decodeJSON"),
-    201: .same(proto: "decodeMapField"),
-    202: .same(proto: "decodeMessage"),
-    203: .same(proto: "decoder"),
-    204: .same(proto: "decodeRepeated"),
-    205: .same(proto: "decodeRepeatedBoolField"),
-    206: .same(proto: "decodeRepeatedBytesField"),
-    207: .same(proto: "decodeRepeatedDoubleField"),
-    208: .same(proto: "decodeRepeatedEnumField"),
-    209: .same(proto: "decodeRepeatedFixed32Field"),
-    210: .same(proto: "decodeRepeatedFixed64Field"),
-    211: .same(proto: "decodeRepeatedFloatField"),
-    212: .same(proto: "decodeRepeatedGroupField"),
-    213: .same(proto: "decodeRepeatedInt32Field"),
-    214: .same(proto: "decodeRepeatedInt64Field"),
-    215: .same(proto: "decodeRepeatedMessageField"),
-    216: .same(proto: "decodeRepeatedSFixed32Field"),
-    217: .same(proto: "decodeRepeatedSFixed64Field"),
-    218: .same(proto: "decodeRepeatedSInt32Field"),
-    219: .same(proto: "decodeRepeatedSInt64Field"),
-    220: .same(proto: "decodeRepeatedStringField"),
-    221: .same(proto: "decodeRepeatedUInt32Field"),
-    222: .same(proto: "decodeRepeatedUInt64Field"),
-    223: .same(proto: "decodeSingular"),
-    224: .same(proto: "decodeSingularBoolField"),
-    225: .same(proto: "decodeSingularBytesField"),
-    226: .same(proto: "decodeSingularDoubleField"),
-    227: .same(proto: "decodeSingularEnumField"),
-    228: .same(proto: "decodeSingularFixed32Field"),
-    229: .same(proto: "decodeSingularFixed64Field"),
-    230: .same(proto: "decodeSingularFloatField"),
-    231: .same(proto: "decodeSingularGroupField"),
-    232: .same(proto: "decodeSingularInt32Field"),
-    233: .same(proto: "decodeSingularInt64Field"),
-    234: .same(proto: "decodeSingularMessageField"),
-    235: .same(proto: "decodeSingularSFixed32Field"),
-    236: .same(proto: "decodeSingularSFixed64Field"),
-    237: .same(proto: "decodeSingularSInt32Field"),
-    238: .same(proto: "decodeSingularSInt64Field"),
-    239: .same(proto: "decodeSingularStringField"),
-    240: .same(proto: "decodeSingularUInt32Field"),
-    241: .same(proto: "decodeSingularUInt64Field"),
-    242: .same(proto: "decodeTextFormat"),
-    243: .same(proto: "defaultAnyTypeURLPrefix"),
-    244: .same(proto: "defaults"),
-    245: .same(proto: "defaultValue"),
-    246: .same(proto: "dependency"),
-    247: .same(proto: "deprecated"),
-    248: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
-    249: .same(proto: "deprecationWarning"),
-    250: .same(proto: "description"),
-    251: .same(proto: "DescriptorProto"),
-    252: .same(proto: "Dictionary"),
-    253: .same(proto: "dictionaryLiteral"),
-    254: .same(proto: "digit"),
-    255: .same(proto: "digit0"),
-    256: .same(proto: "digit1"),
-    257: .same(proto: "digitCount"),
-    258: .same(proto: "digits"),
-    259: .same(proto: "digitValue"),
-    260: .same(proto: "discardableResult"),
-    261: .same(proto: "discardUnknownFields"),
-    262: .same(proto: "Double"),
-    263: .same(proto: "doubleValue"),
-    264: .same(proto: "Duration"),
-    265: .same(proto: "E"),
-    266: .same(proto: "edition"),
-    267: .same(proto: "EditionDefault"),
-    268: .same(proto: "editionDefaults"),
-    269: .same(proto: "editionDeprecated"),
-    270: .same(proto: "editionIntroduced"),
-    271: .same(proto: "editionRemoved"),
-    272: .same(proto: "Element"),
-    273: .same(proto: "elements"),
-    274: .same(proto: "else"),
-    275: .same(proto: "emitExtensionFieldName"),
-    276: .same(proto: "emitFieldName"),
-    277: .same(proto: "emitFieldNumber"),
-    278: .same(proto: "Empty"),
-    279: .same(proto: "emptyData"),
-    280: .same(proto: "encodeAsBytes"),
-    281: .same(proto: "encoded"),
-    282: .same(proto: "encodedJSONString"),
-    283: .same(proto: "encodedSize"),
-    284: .same(proto: "encodeField"),
-    285: .same(proto: "encoder"),
-    286: .same(proto: "end"),
-    287: .same(proto: "endArray"),
-    288: .same(proto: "endMessageField"),
-    289: .same(proto: "endObject"),
-    290: .same(proto: "endRegularField"),
-    291: .same(proto: "enum"),
-    292: .same(proto: "EnumDescriptorProto"),
-    293: .same(proto: "EnumOptions"),
-    294: .same(proto: "EnumReservedRange"),
-    295: .same(proto: "enumType"),
-    296: .same(proto: "enumvalue"),
-    297: .same(proto: "EnumValueDescriptorProto"),
-    298: .same(proto: "EnumValueOptions"),
-    299: .same(proto: "Equatable"),
-    300: .same(proto: "Error"),
-    301: .same(proto: "ExpressibleByArrayLiteral"),
-    302: .same(proto: "ExpressibleByDictionaryLiteral"),
-    303: .same(proto: "ext"),
-    304: .same(proto: "extDecoder"),
-    305: .same(proto: "extendedGraphemeClusterLiteral"),
-    306: .same(proto: "ExtendedGraphemeClusterLiteralType"),
-    307: .same(proto: "extendee"),
-    308: .same(proto: "ExtensibleMessage"),
-    309: .same(proto: "extension"),
-    310: .same(proto: "ExtensionField"),
-    311: .same(proto: "extensionFieldNumber"),
-    312: .same(proto: "ExtensionFieldValueSet"),
-    313: .same(proto: "ExtensionMap"),
-    314: .same(proto: "extensionRange"),
-    315: .same(proto: "ExtensionRangeOptions"),
-    316: .same(proto: "extensions"),
-    317: .same(proto: "extras"),
-    318: .same(proto: "F"),
-    319: .same(proto: "false"),
-    320: .same(proto: "features"),
-    321: .same(proto: "FeatureSet"),
-    322: .same(proto: "FeatureSetDefaults"),
-    323: .same(proto: "FeatureSetEditionDefault"),
-    324: .same(proto: "featureSupport"),
-    325: .same(proto: "field"),
-    326: .same(proto: "fieldData"),
-    327: .same(proto: "FieldDescriptorProto"),
-    328: .same(proto: "FieldMask"),
-    329: .same(proto: "FieldMaskError"),
-    330: .same(proto: "fieldName"),
-    331: .same(proto: "fieldNameCount"),
-    332: .same(proto: "fieldNum"),
-    333: .same(proto: "fieldNumber"),
-    334: .same(proto: "fieldNumberForProto"),
-    335: .same(proto: "FieldOptions"),
-    336: .same(proto: "fieldPresence"),
-    337: .same(proto: "fields"),
-    338: .same(proto: "fieldSize"),
-    339: .same(proto: "FieldTag"),
-    340: .same(proto: "FieldType"),
-    341: .same(proto: "file"),
-    342: .same(proto: "FileDescriptorProto"),
-    343: .same(proto: "FileDescriptorSet"),
-    344: .same(proto: "fileName"),
-    345: .same(proto: "FileOptions"),
-    346: .same(proto: "filter"),
-    347: .same(proto: "final"),
-    348: .same(proto: "finiteOnly"),
-    349: .same(proto: "first"),
-    350: .same(proto: "firstItem"),
-    351: .same(proto: "fixedFeatures"),
-    352: .same(proto: "Float"),
-    353: .same(proto: "floatLiteral"),
-    354: .same(proto: "FloatLiteralType"),
-    355: .same(proto: "FloatValue"),
-    356: .same(proto: "for"),
-    357: .same(proto: "forMessageName"),
-    358: .same(proto: "formUnion"),
-    359: .same(proto: "forReadingFrom"),
-    360: .same(proto: "forTypeURL"),
-    361: .same(proto: "ForwardParser"),
-    362: .same(proto: "forWritingInto"),
-    363: .same(proto: "from"),
-    364: .same(proto: "fromAscii2"),
-    365: .same(proto: "fromAscii4"),
-    366: .same(proto: "fromByteOffset"),
-    367: .same(proto: "fromHexDigit"),
-    368: .same(proto: "fullName"),
-    369: .same(proto: "func"),
-    370: .same(proto: "function"),
-    371: .same(proto: "G"),
-    372: .same(proto: "GeneratedCodeInfo"),
-    373: .same(proto: "get"),
-    374: .same(proto: "getExtensionValue"),
-    375: .same(proto: "googleapis"),
-    376: .standard(proto: "Google_Protobuf_Any"),
-    377: .standard(proto: "Google_Protobuf_Api"),
-    378: .standard(proto: "Google_Protobuf_BoolValue"),
-    379: .standard(proto: "Google_Protobuf_BytesValue"),
-    380: .standard(proto: "Google_Protobuf_DescriptorProto"),
-    381: .standard(proto: "Google_Protobuf_DoubleValue"),
-    382: .standard(proto: "Google_Protobuf_Duration"),
-    383: .standard(proto: "Google_Protobuf_Edition"),
-    384: .standard(proto: "Google_Protobuf_Empty"),
-    385: .standard(proto: "Google_Protobuf_Enum"),
-    386: .standard(proto: "Google_Protobuf_EnumDescriptorProto"),
-    387: .standard(proto: "Google_Protobuf_EnumOptions"),
-    388: .standard(proto: "Google_Protobuf_EnumValue"),
-    389: .standard(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    390: .standard(proto: "Google_Protobuf_EnumValueOptions"),
-    391: .standard(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    392: .standard(proto: "Google_Protobuf_FeatureSet"),
-    393: .standard(proto: "Google_Protobuf_FeatureSetDefaults"),
-    394: .standard(proto: "Google_Protobuf_Field"),
-    395: .standard(proto: "Google_Protobuf_FieldDescriptorProto"),
-    396: .standard(proto: "Google_Protobuf_FieldMask"),
-    397: .standard(proto: "Google_Protobuf_FieldOptions"),
-    398: .standard(proto: "Google_Protobuf_FileDescriptorProto"),
-    399: .standard(proto: "Google_Protobuf_FileDescriptorSet"),
-    400: .standard(proto: "Google_Protobuf_FileOptions"),
-    401: .standard(proto: "Google_Protobuf_FloatValue"),
-    402: .standard(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    403: .standard(proto: "Google_Protobuf_Int32Value"),
-    404: .standard(proto: "Google_Protobuf_Int64Value"),
-    405: .standard(proto: "Google_Protobuf_ListValue"),
-    406: .standard(proto: "Google_Protobuf_MessageOptions"),
-    407: .standard(proto: "Google_Protobuf_Method"),
-    408: .standard(proto: "Google_Protobuf_MethodDescriptorProto"),
-    409: .standard(proto: "Google_Protobuf_MethodOptions"),
-    410: .standard(proto: "Google_Protobuf_Mixin"),
-    411: .standard(proto: "Google_Protobuf_NullValue"),
-    412: .standard(proto: "Google_Protobuf_OneofDescriptorProto"),
-    413: .standard(proto: "Google_Protobuf_OneofOptions"),
-    414: .standard(proto: "Google_Protobuf_Option"),
-    415: .standard(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    416: .standard(proto: "Google_Protobuf_ServiceOptions"),
-    417: .standard(proto: "Google_Protobuf_SourceCodeInfo"),
-    418: .standard(proto: "Google_Protobuf_SourceContext"),
-    419: .standard(proto: "Google_Protobuf_StringValue"),
-    420: .standard(proto: "Google_Protobuf_Struct"),
-    421: .standard(proto: "Google_Protobuf_Syntax"),
-    422: .standard(proto: "Google_Protobuf_Timestamp"),
-    423: .standard(proto: "Google_Protobuf_Type"),
-    424: .standard(proto: "Google_Protobuf_UInt32Value"),
-    425: .standard(proto: "Google_Protobuf_UInt64Value"),
-    426: .standard(proto: "Google_Protobuf_UninterpretedOption"),
-    427: .standard(proto: "Google_Protobuf_Value"),
-    428: .same(proto: "goPackage"),
-    429: .same(proto: "group"),
-    430: .same(proto: "groupFieldNumberStack"),
-    431: .same(proto: "groupSize"),
-    432: .same(proto: "guard"),
-    433: .same(proto: "hadOneofValue"),
-    434: .same(proto: "handleConflictingOneOf"),
-    435: .same(proto: "hasAggregateValue"),
-    436: .same(proto: "hasAllowAlias"),
-    437: .same(proto: "hasBegin"),
-    438: .same(proto: "hasCcEnableArenas"),
-    439: .same(proto: "hasCcGenericServices"),
-    440: .same(proto: "hasClientStreaming"),
-    441: .same(proto: "hasCsharpNamespace"),
-    442: .same(proto: "hasCtype"),
-    443: .same(proto: "hasDebugRedact"),
-    444: .same(proto: "hasDefaultValue"),
-    445: .same(proto: "hasDeprecated"),
-    446: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
-    447: .same(proto: "hasDeprecationWarning"),
-    448: .same(proto: "hasDoubleValue"),
-    449: .same(proto: "hasEdition"),
-    450: .same(proto: "hasEditionDeprecated"),
-    451: .same(proto: "hasEditionIntroduced"),
-    452: .same(proto: "hasEditionRemoved"),
-    453: .same(proto: "hasEnd"),
-    454: .same(proto: "hasEnumType"),
-    455: .same(proto: "hasExtendee"),
-    456: .same(proto: "hasExtensionValue"),
-    457: .same(proto: "hasFeatures"),
-    458: .same(proto: "hasFeatureSupport"),
-    459: .same(proto: "hasFieldPresence"),
-    460: .same(proto: "hasFixedFeatures"),
-    461: .same(proto: "hasFullName"),
-    462: .same(proto: "hasGoPackage"),
-    463: .same(proto: "hash"),
-    464: .same(proto: "Hashable"),
-    465: .same(proto: "hasher"),
-    466: .same(proto: "HashVisitor"),
-    467: .same(proto: "hasIdempotencyLevel"),
-    468: .same(proto: "hasIdentifierValue"),
-    469: .same(proto: "hasInputType"),
-    470: .same(proto: "hasIsExtension"),
-    471: .same(proto: "hasJavaGenerateEqualsAndHash"),
-    472: .same(proto: "hasJavaGenericServices"),
-    473: .same(proto: "hasJavaMultipleFiles"),
-    474: .same(proto: "hasJavaOuterClassname"),
-    475: .same(proto: "hasJavaPackage"),
-    476: .same(proto: "hasJavaStringCheckUtf8"),
-    477: .same(proto: "hasJsonFormat"),
-    478: .same(proto: "hasJsonName"),
-    479: .same(proto: "hasJstype"),
-    480: .same(proto: "hasLabel"),
-    481: .same(proto: "hasLazy"),
-    482: .same(proto: "hasLeadingComments"),
-    483: .same(proto: "hasMapEntry"),
-    484: .same(proto: "hasMaximumEdition"),
-    485: .same(proto: "hasMessageEncoding"),
-    486: .same(proto: "hasMessageSetWireFormat"),
-    487: .same(proto: "hasMinimumEdition"),
-    488: .same(proto: "hasName"),
-    489: .same(proto: "hasNamePart"),
-    490: .same(proto: "hasNegativeIntValue"),
-    491: .same(proto: "hasNoStandardDescriptorAccessor"),
-    492: .same(proto: "hasNumber"),
-    493: .same(proto: "hasObjcClassPrefix"),
-    494: .same(proto: "hasOneofIndex"),
-    495: .same(proto: "hasOptimizeFor"),
-    496: .same(proto: "hasOptions"),
-    497: .same(proto: "hasOutputType"),
-    498: .same(proto: "hasOverridableFeatures"),
-    499: .same(proto: "hasPackage"),
-    500: .same(proto: "hasPacked"),
-    501: .same(proto: "hasPhpClassPrefix"),
-    502: .same(proto: "hasPhpMetadataNamespace"),
-    503: .same(proto: "hasPhpNamespace"),
-    504: .same(proto: "hasPositiveIntValue"),
-    505: .same(proto: "hasProto3Optional"),
-    506: .same(proto: "hasPyGenericServices"),
-    507: .same(proto: "hasRepeated"),
-    508: .same(proto: "hasRepeatedFieldEncoding"),
-    509: .same(proto: "hasReserved"),
-    510: .same(proto: "hasRetention"),
-    511: .same(proto: "hasRubyPackage"),
-    512: .same(proto: "hasSemantic"),
-    513: .same(proto: "hasServerStreaming"),
-    514: .same(proto: "hasSourceCodeInfo"),
-    515: .same(proto: "hasSourceContext"),
-    516: .same(proto: "hasSourceFile"),
-    517: .same(proto: "hasStart"),
-    518: .same(proto: "hasStringValue"),
-    519: .same(proto: "hasSwiftPrefix"),
-    520: .same(proto: "hasSyntax"),
-    521: .same(proto: "hasTrailingComments"),
-    522: .same(proto: "hasType"),
-    523: .same(proto: "hasTypeName"),
-    524: .same(proto: "hasUnverifiedLazy"),
-    525: .same(proto: "hasUtf8Validation"),
-    526: .same(proto: "hasValue"),
-    527: .same(proto: "hasVerification"),
-    528: .same(proto: "hasWeak"),
-    529: .same(proto: "hour"),
-    530: .same(proto: "i"),
-    531: .same(proto: "idempotencyLevel"),
-    532: .same(proto: "identifierValue"),
-    533: .same(proto: "if"),
-    534: .same(proto: "ignoreUnknownExtensionFields"),
-    535: .same(proto: "ignoreUnknownFields"),
-    536: .same(proto: "index"),
-    537: .same(proto: "init"),
-    538: .same(proto: "inout"),
-    539: .same(proto: "inputType"),
-    540: .same(proto: "insert"),
-    541: .same(proto: "Int"),
-    542: .same(proto: "Int32"),
-    543: .same(proto: "Int32Value"),
-    544: .same(proto: "Int64"),
-    545: .same(proto: "Int64Value"),
-    546: .same(proto: "Int8"),
-    547: .same(proto: "integerLiteral"),
-    548: .same(proto: "IntegerLiteralType"),
-    549: .same(proto: "intern"),
-    550: .same(proto: "Internal"),
-    551: .same(proto: "InternalState"),
-    552: .same(proto: "intersect"),
-    553: .same(proto: "into"),
-    554: .same(proto: "ints"),
-    555: .same(proto: "isA"),
-    556: .same(proto: "isEqual"),
-    557: .same(proto: "isEqualTo"),
-    558: .same(proto: "isExtension"),
-    559: .same(proto: "isInitialized"),
-    560: .same(proto: "isNegative"),
-    561: .same(proto: "isPathValid"),
-    562: .same(proto: "isValid"),
-    563: .same(proto: "itemTagsEncodedSize"),
-    564: .same(proto: "iterator"),
-    565: .same(proto: "javaGenerateEqualsAndHash"),
-    566: .same(proto: "javaGenericServices"),
-    567: .same(proto: "javaMultipleFiles"),
-    568: .same(proto: "javaOuterClassname"),
-    569: .same(proto: "javaPackage"),
-    570: .same(proto: "javaStringCheckUtf8"),
-    571: .same(proto: "JSONDecoder"),
-    572: .same(proto: "JSONDecodingError"),
-    573: .same(proto: "JSONDecodingOptions"),
-    574: .same(proto: "jsonEncoder"),
-    575: .same(proto: "JSONEncodingError"),
-    576: .same(proto: "JSONEncodingOptions"),
-    577: .same(proto: "JSONEncodingVisitor"),
-    578: .same(proto: "jsonFormat"),
-    579: .same(proto: "JSONMapEncodingVisitor"),
-    580: .same(proto: "jsonName"),
-    581: .same(proto: "jsonPath"),
-    582: .same(proto: "jsonPaths"),
-    583: .same(proto: "JSONScanner"),
-    584: .same(proto: "jsonString"),
-    585: .same(proto: "jsonText"),
-    586: .same(proto: "jsonUTF8Bytes"),
-    587: .same(proto: "jsonUTF8Data"),
-    588: .same(proto: "jstype"),
-    589: .same(proto: "k"),
-    590: .same(proto: "kChunkSize"),
-    591: .same(proto: "Key"),
-    592: .same(proto: "keyField"),
-    593: .same(proto: "keyFieldOpt"),
-    594: .same(proto: "KeyType"),
-    595: .same(proto: "kind"),
-    596: .same(proto: "l"),
-    597: .same(proto: "label"),
-    598: .same(proto: "lazy"),
-    599: .same(proto: "leadingComments"),
-    600: .same(proto: "leadingDetachedComments"),
-    601: .same(proto: "length"),
-    602: .same(proto: "lessThan"),
-    603: .same(proto: "let"),
-    604: .same(proto: "lhs"),
-    605: .same(proto: "line"),
-    606: .same(proto: "list"),
-    607: .same(proto: "listOfMessages"),
-    608: .same(proto: "listValue"),
-    609: .same(proto: "littleEndian"),
-    610: .same(proto: "load"),
-    611: .same(proto: "localHasher"),
-    612: .same(proto: "location"),
-    613: .same(proto: "M"),
-    614: .same(proto: "major"),
-    615: .same(proto: "makeAsyncIterator"),
-    616: .same(proto: "makeIterator"),
-    617: .same(proto: "malformedLength"),
-    618: .same(proto: "mapEntry"),
-    619: .same(proto: "MapKeyType"),
-    620: .same(proto: "mapToMessages"),
-    621: .same(proto: "MapValueType"),
-    622: .same(proto: "mapVisitor"),
-    623: .same(proto: "mask"),
-    624: .same(proto: "maximumEdition"),
-    625: .same(proto: "mdayStart"),
-    626: .same(proto: "merge"),
-    627: .same(proto: "MergeOptions"),
-    628: .same(proto: "message"),
-    629: .same(proto: "messageDepthLimit"),
-    630: .same(proto: "messageEncoding"),
-    631: .same(proto: "MessageExtension"),
-    632: .same(proto: "MessageImplementationBase"),
-    633: .same(proto: "MessageOptions"),
-    634: .same(proto: "MessageSet"),
-    635: .same(proto: "messageSetWireFormat"),
-    636: .same(proto: "messageSize"),
-    637: .same(proto: "messageType"),
-    638: .same(proto: "Method"),
-    639: .same(proto: "MethodDescriptorProto"),
-    640: .same(proto: "MethodOptions"),
-    641: .same(proto: "methods"),
-    642: .same(proto: "min"),
-    643: .same(proto: "minimumEdition"),
-    644: .same(proto: "minor"),
-    645: .same(proto: "Mixin"),
-    646: .same(proto: "mixins"),
-    647: .same(proto: "modify"),
-    648: .same(proto: "month"),
-    649: .same(proto: "msgExtension"),
-    650: .same(proto: "mutating"),
-    651: .same(proto: "n"),
-    652: .same(proto: "name"),
-    653: .same(proto: "NameDescription"),
-    654: .same(proto: "NameMap"),
-    655: .same(proto: "NamePart"),
-    656: .same(proto: "names"),
-    657: .same(proto: "nanos"),
-    658: .same(proto: "negativeIntValue"),
-    659: .same(proto: "nestedType"),
-    660: .same(proto: "newExtensible"),
-    661: .same(proto: "newL"),
-    662: .same(proto: "newList"),
-    663: .same(proto: "newMessage"),
-    664: .same(proto: "newValue"),
-    665: .same(proto: "next"),
-    666: .same(proto: "nextByte"),
-    667: .same(proto: "nextFieldNumber"),
-    668: .same(proto: "nextVarInt"),
-    669: .same(proto: "nil"),
-    670: .same(proto: "nilLiteral"),
-    671: .same(proto: "noBytesAvailable"),
-    672: .same(proto: "noStandardDescriptorAccessor"),
-    673: .same(proto: "nullValue"),
-    674: .same(proto: "number"),
-    675: .same(proto: "numberValue"),
-    676: .same(proto: "objcClassPrefix"),
-    677: .same(proto: "of"),
-    678: .same(proto: "oneofDecl"),
-    679: .same(proto: "OneofDescriptorProto"),
-    680: .same(proto: "oneofIndex"),
-    681: .same(proto: "OneofOptions"),
-    682: .same(proto: "oneofs"),
-    683: .standard(proto: "OneOf_Kind"),
-    684: .same(proto: "optimizeFor"),
-    685: .same(proto: "OptimizeMode"),
-    686: .same(proto: "Option"),
-    687: .same(proto: "OptionalEnumExtensionField"),
-    688: .same(proto: "OptionalExtensionField"),
-    689: .same(proto: "OptionalGroupExtensionField"),
-    690: .same(proto: "OptionalMessageExtensionField"),
-    691: .same(proto: "OptionRetention"),
-    692: .same(proto: "options"),
-    693: .same(proto: "OptionTargetType"),
-    694: .same(proto: "other"),
-    695: .same(proto: "others"),
-    696: .same(proto: "out"),
-    697: .same(proto: "outputType"),
-    698: .same(proto: "overridableFeatures"),
-    699: .same(proto: "p"),
-    700: .same(proto: "package"),
-    701: .same(proto: "packed"),
-    702: .same(proto: "PackedEnumExtensionField"),
-    703: .same(proto: "PackedExtensionField"),
-    704: .same(proto: "padding"),
-    705: .same(proto: "parent"),
-    706: .same(proto: "parse"),
-    707: .same(proto: "partial"),
-    708: .same(proto: "path"),
-    709: .same(proto: "PathDecoder"),
-    710: .same(proto: "PathDecodingError"),
-    711: .same(proto: "paths"),
-    712: .same(proto: "PathVisitor"),
-    713: .same(proto: "payload"),
-    714: .same(proto: "payloadSize"),
-    715: .same(proto: "phpClassPrefix"),
-    716: .same(proto: "phpMetadataNamespace"),
-    717: .same(proto: "phpNamespace"),
-    718: .same(proto: "pos"),
-    719: .same(proto: "positiveIntValue"),
-    720: .same(proto: "prefix"),
-    721: .same(proto: "preserveProtoFieldNames"),
-    722: .same(proto: "preTraverse"),
-    723: .same(proto: "prevPath"),
-    724: .same(proto: "printUnknownFields"),
-    725: .same(proto: "proto2"),
-    726: .same(proto: "proto3DefaultValue"),
-    727: .same(proto: "proto3Optional"),
-    728: .same(proto: "ProtobufAPIVersionCheck"),
-    729: .standard(proto: "ProtobufAPIVersion_2"),
-    730: .same(proto: "ProtobufBool"),
-    731: .same(proto: "ProtobufBytes"),
-    732: .same(proto: "ProtobufDouble"),
-    733: .same(proto: "ProtobufEnumMap"),
-    734: .same(proto: "protobufExtension"),
-    735: .same(proto: "ProtobufFixed32"),
-    736: .same(proto: "ProtobufFixed64"),
-    737: .same(proto: "ProtobufFloat"),
-    738: .same(proto: "ProtobufInt32"),
-    739: .same(proto: "ProtobufInt64"),
-    740: .same(proto: "ProtobufMap"),
-    741: .same(proto: "ProtobufMessageMap"),
-    742: .same(proto: "ProtobufSFixed32"),
-    743: .same(proto: "ProtobufSFixed64"),
-    744: .same(proto: "ProtobufSInt32"),
-    745: .same(proto: "ProtobufSInt64"),
-    746: .same(proto: "ProtobufString"),
-    747: .same(proto: "ProtobufUInt32"),
-    748: .same(proto: "ProtobufUInt64"),
-    749: .standard(proto: "protobuf_extensionFieldValues"),
-    750: .standard(proto: "protobuf_fieldNumber"),
-    751: .standard(proto: "protobuf_generated_isEqualTo"),
-    752: .standard(proto: "protobuf_nameMap"),
-    753: .standard(proto: "protobuf_newField"),
-    754: .standard(proto: "protobuf_package"),
-    755: .same(proto: "protocol"),
-    756: .same(proto: "protoFieldName"),
-    757: .same(proto: "protoMessageName"),
-    758: .same(proto: "ProtoNameProviding"),
-    759: .same(proto: "protoPaths"),
-    760: .same(proto: "public"),
-    761: .same(proto: "publicDependency"),
-    762: .same(proto: "putBoolValue"),
-    763: .same(proto: "putBytesValue"),
-    764: .same(proto: "putDoubleValue"),
-    765: .same(proto: "putEnumValue"),
-    766: .same(proto: "putFixedUInt32"),
-    767: .same(proto: "putFixedUInt64"),
-    768: .same(proto: "putFloatValue"),
-    769: .same(proto: "putInt64"),
-    770: .same(proto: "putStringValue"),
-    771: .same(proto: "putUInt64"),
-    772: .same(proto: "putUInt64Hex"),
-    773: .same(proto: "putVarInt"),
-    774: .same(proto: "putZigZagVarInt"),
-    775: .same(proto: "pyGenericServices"),
-    776: .same(proto: "R"),
-    777: .same(proto: "rawChars"),
-    778: .same(proto: "RawRepresentable"),
-    779: .same(proto: "RawValue"),
-    780: .same(proto: "read4HexDigits"),
-    781: .same(proto: "readBytes"),
-    782: .same(proto: "register"),
-    783: .same(proto: "removingAllFieldsOf"),
-    784: .same(proto: "repeated"),
-    785: .same(proto: "RepeatedEnumExtensionField"),
-    786: .same(proto: "RepeatedExtensionField"),
-    787: .same(proto: "repeatedFieldEncoding"),
-    788: .same(proto: "RepeatedGroupExtensionField"),
-    789: .same(proto: "RepeatedMessageExtensionField"),
-    790: .same(proto: "repeating"),
-    791: .same(proto: "replaceRepeatedFields"),
-    792: .same(proto: "requestStreaming"),
-    793: .same(proto: "requestTypeURL"),
-    794: .same(proto: "requiredSize"),
-    795: .same(proto: "responseStreaming"),
-    796: .same(proto: "responseTypeURL"),
-    797: .same(proto: "result"),
-    798: .same(proto: "retention"),
-    799: .same(proto: "rethrows"),
-    800: .same(proto: "return"),
-    801: .same(proto: "ReturnType"),
-    802: .same(proto: "revision"),
-    803: .same(proto: "rhs"),
-    804: .same(proto: "root"),
-    805: .same(proto: "rubyPackage"),
-    806: .same(proto: "s"),
-    807: .same(proto: "sawBackslash"),
-    808: .same(proto: "sawSection4Characters"),
-    809: .same(proto: "sawSection5Characters"),
-    810: .same(proto: "scan"),
-    811: .same(proto: "scanner"),
-    812: .same(proto: "seconds"),
-    813: .same(proto: "self"),
-    814: .same(proto: "semantic"),
-    815: .same(proto: "Sendable"),
-    816: .same(proto: "separator"),
-    817: .same(proto: "serialize"),
-    818: .same(proto: "serializedBytes"),
-    819: .same(proto: "serializedData"),
-    820: .same(proto: "serializedSize"),
-    821: .same(proto: "serverStreaming"),
-    822: .same(proto: "service"),
-    823: .same(proto: "ServiceDescriptorProto"),
-    824: .same(proto: "ServiceOptions"),
-    825: .same(proto: "set"),
-    826: .same(proto: "setExtensionValue"),
-    827: .same(proto: "shift"),
-    828: .same(proto: "SimpleExtensionMap"),
-    829: .same(proto: "size"),
-    830: .same(proto: "sizer"),
-    831: .same(proto: "source"),
-    832: .same(proto: "sourceCodeInfo"),
-    833: .same(proto: "sourceContext"),
-    834: .same(proto: "sourceEncoding"),
-    835: .same(proto: "sourceFile"),
-    836: .same(proto: "SourceLocation"),
-    837: .same(proto: "span"),
-    838: .same(proto: "split"),
-    839: .same(proto: "start"),
-    840: .same(proto: "startArray"),
-    841: .same(proto: "startArrayObject"),
-    842: .same(proto: "startField"),
-    843: .same(proto: "startIndex"),
-    844: .same(proto: "startMessageField"),
-    845: .same(proto: "startObject"),
-    846: .same(proto: "startRegularField"),
-    847: .same(proto: "state"),
-    848: .same(proto: "static"),
-    849: .same(proto: "StaticString"),
-    850: .same(proto: "storage"),
-    851: .same(proto: "String"),
-    852: .same(proto: "stringLiteral"),
-    853: .same(proto: "StringLiteralType"),
-    854: .same(proto: "stringResult"),
-    855: .same(proto: "stringValue"),
-    856: .same(proto: "struct"),
-    857: .same(proto: "structValue"),
-    858: .same(proto: "subDecoder"),
-    859: .same(proto: "subscript"),
-    860: .same(proto: "subtract"),
-    861: .same(proto: "subVisitor"),
-    862: .same(proto: "Swift"),
-    863: .same(proto: "swiftPrefix"),
-    864: .same(proto: "SwiftProtobufContiguousBytes"),
-    865: .same(proto: "SwiftProtobufError"),
-    866: .same(proto: "syntax"),
-    867: .same(proto: "T"),
-    868: .same(proto: "tag"),
-    869: .same(proto: "targets"),
-    870: .same(proto: "terminator"),
-    871: .same(proto: "testDecoder"),
-    872: .same(proto: "text"),
-    873: .same(proto: "textDecoder"),
-    874: .same(proto: "TextFormatDecoder"),
-    875: .same(proto: "TextFormatDecodingError"),
-    876: .same(proto: "TextFormatDecodingOptions"),
-    877: .same(proto: "TextFormatEncodingOptions"),
-    878: .same(proto: "TextFormatEncodingVisitor"),
-    879: .same(proto: "textFormatString"),
-    880: .same(proto: "throwOrIgnore"),
-    881: .same(proto: "throws"),
-    882: .same(proto: "timeInterval"),
-    883: .same(proto: "timeIntervalSince1970"),
-    884: .same(proto: "timeIntervalSinceReferenceDate"),
-    885: .same(proto: "Timestamp"),
-    886: .same(proto: "tmp"),
-    887: .same(proto: "tooLarge"),
-    888: .same(proto: "total"),
-    889: .same(proto: "totalArrayDepth"),
-    890: .same(proto: "totalSize"),
-    891: .same(proto: "trailingComments"),
-    892: .same(proto: "traverse"),
-    893: .same(proto: "trim"),
-    894: .same(proto: "true"),
-    895: .same(proto: "try"),
-    896: .same(proto: "type"),
-    897: .same(proto: "typealias"),
-    898: .same(proto: "TypeEnum"),
-    899: .same(proto: "typeName"),
-    900: .same(proto: "typePrefix"),
-    901: .same(proto: "typeStart"),
-    902: .same(proto: "typeUnknown"),
-    903: .same(proto: "typeURL"),
-    904: .same(proto: "UInt32"),
-    905: .same(proto: "UInt32Value"),
-    906: .same(proto: "UInt64"),
-    907: .same(proto: "UInt64Value"),
-    908: .same(proto: "UInt8"),
-    909: .same(proto: "unchecked"),
-    910: .same(proto: "unicodeScalarLiteral"),
-    911: .same(proto: "UnicodeScalarLiteralType"),
-    912: .same(proto: "unicodeScalars"),
-    913: .same(proto: "UnicodeScalarView"),
-    914: .same(proto: "uninterpretedOption"),
-    915: .same(proto: "union"),
-    916: .same(proto: "uniqueStorage"),
-    917: .same(proto: "unknown"),
-    918: .same(proto: "unknownFields"),
-    919: .same(proto: "UnknownStorage"),
-    920: .same(proto: "unpackTo"),
-    921: .same(proto: "UnsafeBufferPointer"),
-    922: .same(proto: "UnsafeMutablePointer"),
-    923: .same(proto: "UnsafeMutableRawBufferPointer"),
-    924: .same(proto: "UnsafeRawBufferPointer"),
-    925: .same(proto: "UnsafeRawPointer"),
-    926: .same(proto: "unverifiedLazy"),
-    927: .same(proto: "updatedOptions"),
-    928: .same(proto: "url"),
-    929: .same(proto: "useDeterministicOrdering"),
-    930: .same(proto: "utf8"),
-    931: .same(proto: "utf8Ptr"),
-    932: .same(proto: "utf8ToDouble"),
-    933: .same(proto: "utf8Validation"),
-    934: .same(proto: "UTF8View"),
-    935: .same(proto: "v"),
-    936: .same(proto: "value"),
-    937: .same(proto: "valueField"),
-    938: .same(proto: "values"),
-    939: .same(proto: "ValueType"),
-    940: .same(proto: "var"),
-    941: .same(proto: "verification"),
-    942: .same(proto: "VerificationState"),
-    943: .same(proto: "Version"),
-    944: .same(proto: "versionString"),
-    945: .same(proto: "visitExtensionFields"),
-    946: .same(proto: "visitExtensionFieldsAsMessageSet"),
-    947: .same(proto: "visitMapField"),
-    948: .same(proto: "visitor"),
-    949: .same(proto: "visitPacked"),
-    950: .same(proto: "visitPackedBoolField"),
-    951: .same(proto: "visitPackedDoubleField"),
-    952: .same(proto: "visitPackedEnumField"),
-    953: .same(proto: "visitPackedFixed32Field"),
-    954: .same(proto: "visitPackedFixed64Field"),
-    955: .same(proto: "visitPackedFloatField"),
-    956: .same(proto: "visitPackedInt32Field"),
-    957: .same(proto: "visitPackedInt64Field"),
-    958: .same(proto: "visitPackedSFixed32Field"),
-    959: .same(proto: "visitPackedSFixed64Field"),
-    960: .same(proto: "visitPackedSInt32Field"),
-    961: .same(proto: "visitPackedSInt64Field"),
-    962: .same(proto: "visitPackedUInt32Field"),
-    963: .same(proto: "visitPackedUInt64Field"),
-    964: .same(proto: "visitRepeated"),
-    965: .same(proto: "visitRepeatedBoolField"),
-    966: .same(proto: "visitRepeatedBytesField"),
-    967: .same(proto: "visitRepeatedDoubleField"),
-    968: .same(proto: "visitRepeatedEnumField"),
-    969: .same(proto: "visitRepeatedFixed32Field"),
-    970: .same(proto: "visitRepeatedFixed64Field"),
-    971: .same(proto: "visitRepeatedFloatField"),
-    972: .same(proto: "visitRepeatedGroupField"),
-    973: .same(proto: "visitRepeatedInt32Field"),
-    974: .same(proto: "visitRepeatedInt64Field"),
-    975: .same(proto: "visitRepeatedMessageField"),
-    976: .same(proto: "visitRepeatedSFixed32Field"),
-    977: .same(proto: "visitRepeatedSFixed64Field"),
-    978: .same(proto: "visitRepeatedSInt32Field"),
-    979: .same(proto: "visitRepeatedSInt64Field"),
-    980: .same(proto: "visitRepeatedStringField"),
-    981: .same(proto: "visitRepeatedUInt32Field"),
-    982: .same(proto: "visitRepeatedUInt64Field"),
-    983: .same(proto: "visitSingular"),
-    984: .same(proto: "visitSingularBoolField"),
-    985: .same(proto: "visitSingularBytesField"),
-    986: .same(proto: "visitSingularDoubleField"),
-    987: .same(proto: "visitSingularEnumField"),
-    988: .same(proto: "visitSingularFixed32Field"),
-    989: .same(proto: "visitSingularFixed64Field"),
-    990: .same(proto: "visitSingularFloatField"),
-    991: .same(proto: "visitSingularGroupField"),
-    992: .same(proto: "visitSingularInt32Field"),
-    993: .same(proto: "visitSingularInt64Field"),
-    994: .same(proto: "visitSingularMessageField"),
-    995: .same(proto: "visitSingularSFixed32Field"),
-    996: .same(proto: "visitSingularSFixed64Field"),
-    997: .same(proto: "visitSingularSInt32Field"),
-    998: .same(proto: "visitSingularSInt64Field"),
-    999: .same(proto: "visitSingularStringField"),
-    1000: .same(proto: "visitSingularUInt32Field"),
-    1001: .same(proto: "visitSingularUInt64Field"),
-    1002: .same(proto: "visitUnknown"),
-    1003: .same(proto: "wasDecoded"),
-    1004: .same(proto: "weak"),
-    1005: .same(proto: "weakDependency"),
-    1006: .same(proto: "where"),
-    1007: .same(proto: "wireFormat"),
-    1008: .same(proto: "with"),
-    1009: .same(proto: "withUnsafeBytes"),
-    1010: .same(proto: "withUnsafeMutableBytes"),
-    1011: .same(proto: "work"),
-    1012: .same(proto: "Wrapped"),
-    1013: .same(proto: "WrappedType"),
-    1014: .same(proto: "wrappedValue"),
-    1015: .same(proto: "written"),
-    1016: .same(proto: "yday"),
+    97: .same(proto: "clearEnforceNamingStyle"),
+    98: .same(proto: "clearEnumType"),
+    99: .same(proto: "clearExtendee"),
+    100: .same(proto: "clearExtensionValue"),
+    101: .same(proto: "clearFeatures"),
+    102: .same(proto: "clearFeatureSupport"),
+    103: .same(proto: "clearFieldPresence"),
+    104: .same(proto: "clearFixedFeatures"),
+    105: .same(proto: "clearFullName"),
+    106: .same(proto: "clearGoPackage"),
+    107: .same(proto: "clearIdempotencyLevel"),
+    108: .same(proto: "clearIdentifierValue"),
+    109: .same(proto: "clearInputType"),
+    110: .same(proto: "clearIsExtension"),
+    111: .same(proto: "clearJavaGenerateEqualsAndHash"),
+    112: .same(proto: "clearJavaGenericServices"),
+    113: .same(proto: "clearJavaMultipleFiles"),
+    114: .same(proto: "clearJavaOuterClassname"),
+    115: .same(proto: "clearJavaPackage"),
+    116: .same(proto: "clearJavaStringCheckUtf8"),
+    117: .same(proto: "clearJsonFormat"),
+    118: .same(proto: "clearJsonName"),
+    119: .same(proto: "clearJstype"),
+    120: .same(proto: "clearLabel"),
+    121: .same(proto: "clearLazy"),
+    122: .same(proto: "clearLeadingComments"),
+    123: .same(proto: "clearMapEntry"),
+    124: .same(proto: "clearMaximumEdition"),
+    125: .same(proto: "clearMessageEncoding"),
+    126: .same(proto: "clearMessageSetWireFormat"),
+    127: .same(proto: "clearMinimumEdition"),
+    128: .same(proto: "clearName"),
+    129: .same(proto: "clearNamePart"),
+    130: .same(proto: "clearNegativeIntValue"),
+    131: .same(proto: "clearNoStandardDescriptorAccessor"),
+    132: .same(proto: "clearNumber"),
+    133: .same(proto: "clearObjcClassPrefix"),
+    134: .same(proto: "clearOneofIndex"),
+    135: .same(proto: "clearOptimizeFor"),
+    136: .same(proto: "clearOptions"),
+    137: .same(proto: "clearOutputType"),
+    138: .same(proto: "clearOverridableFeatures"),
+    139: .same(proto: "clearPackage"),
+    140: .same(proto: "clearPacked"),
+    141: .same(proto: "clearPhpClassPrefix"),
+    142: .same(proto: "clearPhpMetadataNamespace"),
+    143: .same(proto: "clearPhpNamespace"),
+    144: .same(proto: "clearPositiveIntValue"),
+    145: .same(proto: "clearProto3Optional"),
+    146: .same(proto: "clearPyGenericServices"),
+    147: .same(proto: "clearRepeated"),
+    148: .same(proto: "clearRepeatedFieldEncoding"),
+    149: .same(proto: "clearReserved"),
+    150: .same(proto: "clearRetention"),
+    151: .same(proto: "clearRubyPackage"),
+    152: .same(proto: "clearSemantic"),
+    153: .same(proto: "clearServerStreaming"),
+    154: .same(proto: "clearSourceCodeInfo"),
+    155: .same(proto: "clearSourceContext"),
+    156: .same(proto: "clearSourceFile"),
+    157: .same(proto: "clearStart"),
+    158: .same(proto: "clearStringValue"),
+    159: .same(proto: "clearSwiftPrefix"),
+    160: .same(proto: "clearSyntax"),
+    161: .same(proto: "clearTrailingComments"),
+    162: .same(proto: "clearType"),
+    163: .same(proto: "clearTypeName"),
+    164: .same(proto: "clearUnverifiedLazy"),
+    165: .same(proto: "clearUtf8Validation"),
+    166: .same(proto: "clearValue"),
+    167: .same(proto: "clearVerification"),
+    168: .same(proto: "clearWeak"),
+    169: .same(proto: "clientStreaming"),
+    170: .same(proto: "code"),
+    171: .same(proto: "codePoint"),
+    172: .same(proto: "codeUnits"),
+    173: .same(proto: "Collection"),
+    174: .same(proto: "com"),
+    175: .same(proto: "comma"),
+    176: .same(proto: "consumedBytes"),
+    177: .same(proto: "contains"),
+    178: .same(proto: "contentsOf"),
+    179: .same(proto: "ContiguousBytes"),
+    180: .same(proto: "copy"),
+    181: .same(proto: "count"),
+    182: .same(proto: "countVarintsInBuffer"),
+    183: .same(proto: "csharpNamespace"),
+    184: .same(proto: "ctype"),
+    185: .same(proto: "customCodable"),
+    186: .same(proto: "CustomDebugStringConvertible"),
+    187: .same(proto: "CustomStringConvertible"),
+    188: .same(proto: "d"),
+    189: .same(proto: "Data"),
+    190: .same(proto: "dataResult"),
+    191: .same(proto: "date"),
+    192: .same(proto: "daySec"),
+    193: .same(proto: "daysSinceEpoch"),
+    194: .same(proto: "debugDescription"),
+    195: .same(proto: "debugRedact"),
+    196: .same(proto: "declaration"),
+    197: .same(proto: "decoded"),
+    198: .same(proto: "decodedFromJSONNull"),
+    199: .same(proto: "decodeExtensionField"),
+    200: .same(proto: "decodeExtensionFieldsAsMessageSet"),
+    201: .same(proto: "decodeJSON"),
+    202: .same(proto: "decodeMapField"),
+    203: .same(proto: "decodeMessage"),
+    204: .same(proto: "decoder"),
+    205: .same(proto: "decodeRepeated"),
+    206: .same(proto: "decodeRepeatedBoolField"),
+    207: .same(proto: "decodeRepeatedBytesField"),
+    208: .same(proto: "decodeRepeatedDoubleField"),
+    209: .same(proto: "decodeRepeatedEnumField"),
+    210: .same(proto: "decodeRepeatedFixed32Field"),
+    211: .same(proto: "decodeRepeatedFixed64Field"),
+    212: .same(proto: "decodeRepeatedFloatField"),
+    213: .same(proto: "decodeRepeatedGroupField"),
+    214: .same(proto: "decodeRepeatedInt32Field"),
+    215: .same(proto: "decodeRepeatedInt64Field"),
+    216: .same(proto: "decodeRepeatedMessageField"),
+    217: .same(proto: "decodeRepeatedSFixed32Field"),
+    218: .same(proto: "decodeRepeatedSFixed64Field"),
+    219: .same(proto: "decodeRepeatedSInt32Field"),
+    220: .same(proto: "decodeRepeatedSInt64Field"),
+    221: .same(proto: "decodeRepeatedStringField"),
+    222: .same(proto: "decodeRepeatedUInt32Field"),
+    223: .same(proto: "decodeRepeatedUInt64Field"),
+    224: .same(proto: "decodeSingular"),
+    225: .same(proto: "decodeSingularBoolField"),
+    226: .same(proto: "decodeSingularBytesField"),
+    227: .same(proto: "decodeSingularDoubleField"),
+    228: .same(proto: "decodeSingularEnumField"),
+    229: .same(proto: "decodeSingularFixed32Field"),
+    230: .same(proto: "decodeSingularFixed64Field"),
+    231: .same(proto: "decodeSingularFloatField"),
+    232: .same(proto: "decodeSingularGroupField"),
+    233: .same(proto: "decodeSingularInt32Field"),
+    234: .same(proto: "decodeSingularInt64Field"),
+    235: .same(proto: "decodeSingularMessageField"),
+    236: .same(proto: "decodeSingularSFixed32Field"),
+    237: .same(proto: "decodeSingularSFixed64Field"),
+    238: .same(proto: "decodeSingularSInt32Field"),
+    239: .same(proto: "decodeSingularSInt64Field"),
+    240: .same(proto: "decodeSingularStringField"),
+    241: .same(proto: "decodeSingularUInt32Field"),
+    242: .same(proto: "decodeSingularUInt64Field"),
+    243: .same(proto: "decodeTextFormat"),
+    244: .same(proto: "defaultAnyTypeURLPrefix"),
+    245: .same(proto: "defaults"),
+    246: .same(proto: "defaultValue"),
+    247: .same(proto: "dependency"),
+    248: .same(proto: "deprecated"),
+    249: .same(proto: "deprecatedLegacyJsonFieldConflicts"),
+    250: .same(proto: "deprecationWarning"),
+    251: .same(proto: "description"),
+    252: .same(proto: "DescriptorProto"),
+    253: .same(proto: "Dictionary"),
+    254: .same(proto: "dictionaryLiteral"),
+    255: .same(proto: "digit"),
+    256: .same(proto: "digit0"),
+    257: .same(proto: "digit1"),
+    258: .same(proto: "digitCount"),
+    259: .same(proto: "digits"),
+    260: .same(proto: "digitValue"),
+    261: .same(proto: "discardableResult"),
+    262: .same(proto: "discardUnknownFields"),
+    263: .same(proto: "Double"),
+    264: .same(proto: "doubleValue"),
+    265: .same(proto: "duration"),
+    266: .same(proto: "E"),
+    267: .same(proto: "edition"),
+    268: .same(proto: "EditionDefault"),
+    269: .same(proto: "editionDefaults"),
+    270: .same(proto: "editionDeprecated"),
+    271: .same(proto: "editionIntroduced"),
+    272: .same(proto: "editionRemoved"),
+    273: .same(proto: "Element"),
+    274: .same(proto: "elements"),
+    275: .same(proto: "else"),
+    276: .same(proto: "emitExtensionFieldName"),
+    277: .same(proto: "emitFieldName"),
+    278: .same(proto: "emitFieldNumber"),
+    279: .same(proto: "Empty"),
+    280: .same(proto: "emptyAnyTypeURL"),
+    281: .same(proto: "emptyData"),
+    282: .same(proto: "encodeAsBytes"),
+    283: .same(proto: "encoded"),
+    284: .same(proto: "encodedJSONString"),
+    285: .same(proto: "encodedSize"),
+    286: .same(proto: "encodeField"),
+    287: .same(proto: "encoder"),
+    288: .same(proto: "end"),
+    289: .same(proto: "endArray"),
+    290: .same(proto: "endMessageField"),
+    291: .same(proto: "endObject"),
+    292: .same(proto: "endRegularField"),
+    293: .same(proto: "enforceNamingStyle"),
+    294: .same(proto: "enum"),
+    295: .same(proto: "EnumDescriptorProto"),
+    296: .same(proto: "EnumOptions"),
+    297: .same(proto: "EnumReservedRange"),
+    298: .same(proto: "enumType"),
+    299: .same(proto: "enumvalue"),
+    300: .same(proto: "EnumValueDescriptorProto"),
+    301: .same(proto: "EnumValueOptions"),
+    302: .same(proto: "Equatable"),
+    303: .same(proto: "Error"),
+    304: .same(proto: "ExpressibleByArrayLiteral"),
+    305: .same(proto: "ExpressibleByDictionaryLiteral"),
+    306: .same(proto: "ext"),
+    307: .same(proto: "extDecoder"),
+    308: .same(proto: "extendedGraphemeClusterLiteral"),
+    309: .same(proto: "ExtendedGraphemeClusterLiteralType"),
+    310: .same(proto: "extendee"),
+    311: .same(proto: "ExtensibleMessage"),
+    312: .same(proto: "extension"),
+    313: .same(proto: "ExtensionField"),
+    314: .same(proto: "extensionFieldNumber"),
+    315: .same(proto: "ExtensionFieldValueSet"),
+    316: .same(proto: "ExtensionMap"),
+    317: .same(proto: "extensionRange"),
+    318: .same(proto: "ExtensionRangeOptions"),
+    319: .same(proto: "extensions"),
+    320: .same(proto: "extras"),
+    321: .same(proto: "F"),
+    322: .same(proto: "false"),
+    323: .same(proto: "features"),
+    324: .same(proto: "FeatureSet"),
+    325: .same(proto: "FeatureSetDefaults"),
+    326: .same(proto: "FeatureSetEditionDefault"),
+    327: .same(proto: "featureSupport"),
+    328: .same(proto: "field"),
+    329: .same(proto: "fieldData"),
+    330: .same(proto: "FieldDescriptorProto"),
+    331: .same(proto: "FieldMask"),
+    332: .same(proto: "FieldMaskError"),
+    333: .same(proto: "fieldName"),
+    334: .same(proto: "fieldNameCount"),
+    335: .same(proto: "fieldNum"),
+    336: .same(proto: "fieldNumber"),
+    337: .same(proto: "fieldNumberForProto"),
+    338: .same(proto: "FieldOptions"),
+    339: .same(proto: "fieldPresence"),
+    340: .same(proto: "fields"),
+    341: .same(proto: "fieldSize"),
+    342: .same(proto: "FieldTag"),
+    343: .same(proto: "FieldType"),
+    344: .same(proto: "file"),
+    345: .same(proto: "FileDescriptorProto"),
+    346: .same(proto: "FileDescriptorSet"),
+    347: .same(proto: "fileName"),
+    348: .same(proto: "FileOptions"),
+    349: .same(proto: "filter"),
+    350: .same(proto: "final"),
+    351: .same(proto: "finiteOnly"),
+    352: .same(proto: "first"),
+    353: .same(proto: "firstItem"),
+    354: .same(proto: "fixedFeatures"),
+    355: .same(proto: "Float"),
+    356: .same(proto: "floatLiteral"),
+    357: .same(proto: "FloatLiteralType"),
+    358: .same(proto: "FloatValue"),
+    359: .same(proto: "for"),
+    360: .same(proto: "forMessageName"),
+    361: .same(proto: "formUnion"),
+    362: .same(proto: "forReadingFrom"),
+    363: .same(proto: "forTypeURL"),
+    364: .same(proto: "ForwardParser"),
+    365: .same(proto: "forWritingInto"),
+    366: .same(proto: "from"),
+    367: .same(proto: "fromAscii2"),
+    368: .same(proto: "fromAscii4"),
+    369: .same(proto: "fromByteOffset"),
+    370: .same(proto: "fromHexDigit"),
+    371: .same(proto: "fullName"),
+    372: .same(proto: "func"),
+    373: .same(proto: "function"),
+    374: .same(proto: "G"),
+    375: .same(proto: "GeneratedCodeInfo"),
+    376: .same(proto: "get"),
+    377: .same(proto: "getExtensionValue"),
+    378: .same(proto: "googleapis"),
+    379: .standard(proto: "Google_Protobuf_Any"),
+    380: .standard(proto: "Google_Protobuf_Api"),
+    381: .standard(proto: "Google_Protobuf_BoolValue"),
+    382: .standard(proto: "Google_Protobuf_BytesValue"),
+    383: .standard(proto: "Google_Protobuf_DescriptorProto"),
+    384: .standard(proto: "Google_Protobuf_DoubleValue"),
+    385: .standard(proto: "Google_Protobuf_Duration"),
+    386: .standard(proto: "Google_Protobuf_Edition"),
+    387: .standard(proto: "Google_Protobuf_Empty"),
+    388: .standard(proto: "Google_Protobuf_Enum"),
+    389: .standard(proto: "Google_Protobuf_EnumDescriptorProto"),
+    390: .standard(proto: "Google_Protobuf_EnumOptions"),
+    391: .standard(proto: "Google_Protobuf_EnumValue"),
+    392: .standard(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    393: .standard(proto: "Google_Protobuf_EnumValueOptions"),
+    394: .standard(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    395: .standard(proto: "Google_Protobuf_FeatureSet"),
+    396: .standard(proto: "Google_Protobuf_FeatureSetDefaults"),
+    397: .standard(proto: "Google_Protobuf_Field"),
+    398: .standard(proto: "Google_Protobuf_FieldDescriptorProto"),
+    399: .standard(proto: "Google_Protobuf_FieldMask"),
+    400: .standard(proto: "Google_Protobuf_FieldOptions"),
+    401: .standard(proto: "Google_Protobuf_FileDescriptorProto"),
+    402: .standard(proto: "Google_Protobuf_FileDescriptorSet"),
+    403: .standard(proto: "Google_Protobuf_FileOptions"),
+    404: .standard(proto: "Google_Protobuf_FloatValue"),
+    405: .standard(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    406: .standard(proto: "Google_Protobuf_Int32Value"),
+    407: .standard(proto: "Google_Protobuf_Int64Value"),
+    408: .standard(proto: "Google_Protobuf_ListValue"),
+    409: .standard(proto: "Google_Protobuf_MessageOptions"),
+    410: .standard(proto: "Google_Protobuf_Method"),
+    411: .standard(proto: "Google_Protobuf_MethodDescriptorProto"),
+    412: .standard(proto: "Google_Protobuf_MethodOptions"),
+    413: .standard(proto: "Google_Protobuf_Mixin"),
+    414: .standard(proto: "Google_Protobuf_NullValue"),
+    415: .standard(proto: "Google_Protobuf_OneofDescriptorProto"),
+    416: .standard(proto: "Google_Protobuf_OneofOptions"),
+    417: .standard(proto: "Google_Protobuf_Option"),
+    418: .standard(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    419: .standard(proto: "Google_Protobuf_ServiceOptions"),
+    420: .standard(proto: "Google_Protobuf_SourceCodeInfo"),
+    421: .standard(proto: "Google_Protobuf_SourceContext"),
+    422: .standard(proto: "Google_Protobuf_StringValue"),
+    423: .standard(proto: "Google_Protobuf_Struct"),
+    424: .standard(proto: "Google_Protobuf_Syntax"),
+    425: .standard(proto: "Google_Protobuf_Timestamp"),
+    426: .standard(proto: "Google_Protobuf_Type"),
+    427: .standard(proto: "Google_Protobuf_UInt32Value"),
+    428: .standard(proto: "Google_Protobuf_UInt64Value"),
+    429: .standard(proto: "Google_Protobuf_UninterpretedOption"),
+    430: .standard(proto: "Google_Protobuf_Value"),
+    431: .same(proto: "goPackage"),
+    432: .same(proto: "group"),
+    433: .same(proto: "groupFieldNumberStack"),
+    434: .same(proto: "groupSize"),
+    435: .same(proto: "guard"),
+    436: .same(proto: "hadOneofValue"),
+    437: .same(proto: "handleConflictingOneOf"),
+    438: .same(proto: "hasAggregateValue"),
+    439: .same(proto: "hasAllowAlias"),
+    440: .same(proto: "hasBegin"),
+    441: .same(proto: "hasCcEnableArenas"),
+    442: .same(proto: "hasCcGenericServices"),
+    443: .same(proto: "hasClientStreaming"),
+    444: .same(proto: "hasCsharpNamespace"),
+    445: .same(proto: "hasCtype"),
+    446: .same(proto: "hasDebugRedact"),
+    447: .same(proto: "hasDefaultValue"),
+    448: .same(proto: "hasDeprecated"),
+    449: .same(proto: "hasDeprecatedLegacyJsonFieldConflicts"),
+    450: .same(proto: "hasDeprecationWarning"),
+    451: .same(proto: "hasDoubleValue"),
+    452: .same(proto: "hasEdition"),
+    453: .same(proto: "hasEditionDeprecated"),
+    454: .same(proto: "hasEditionIntroduced"),
+    455: .same(proto: "hasEditionRemoved"),
+    456: .same(proto: "hasEnd"),
+    457: .same(proto: "hasEnforceNamingStyle"),
+    458: .same(proto: "hasEnumType"),
+    459: .same(proto: "hasExtendee"),
+    460: .same(proto: "hasExtensionValue"),
+    461: .same(proto: "hasFeatures"),
+    462: .same(proto: "hasFeatureSupport"),
+    463: .same(proto: "hasFieldPresence"),
+    464: .same(proto: "hasFixedFeatures"),
+    465: .same(proto: "hasFullName"),
+    466: .same(proto: "hasGoPackage"),
+    467: .same(proto: "hash"),
+    468: .same(proto: "Hashable"),
+    469: .same(proto: "hasher"),
+    470: .same(proto: "HashVisitor"),
+    471: .same(proto: "hasIdempotencyLevel"),
+    472: .same(proto: "hasIdentifierValue"),
+    473: .same(proto: "hasInputType"),
+    474: .same(proto: "hasIsExtension"),
+    475: .same(proto: "hasJavaGenerateEqualsAndHash"),
+    476: .same(proto: "hasJavaGenericServices"),
+    477: .same(proto: "hasJavaMultipleFiles"),
+    478: .same(proto: "hasJavaOuterClassname"),
+    479: .same(proto: "hasJavaPackage"),
+    480: .same(proto: "hasJavaStringCheckUtf8"),
+    481: .same(proto: "hasJsonFormat"),
+    482: .same(proto: "hasJsonName"),
+    483: .same(proto: "hasJstype"),
+    484: .same(proto: "hasLabel"),
+    485: .same(proto: "hasLazy"),
+    486: .same(proto: "hasLeadingComments"),
+    487: .same(proto: "hasMapEntry"),
+    488: .same(proto: "hasMaximumEdition"),
+    489: .same(proto: "hasMessageEncoding"),
+    490: .same(proto: "hasMessageSetWireFormat"),
+    491: .same(proto: "hasMinimumEdition"),
+    492: .same(proto: "hasName"),
+    493: .same(proto: "hasNamePart"),
+    494: .same(proto: "hasNegativeIntValue"),
+    495: .same(proto: "hasNoStandardDescriptorAccessor"),
+    496: .same(proto: "hasNumber"),
+    497: .same(proto: "hasObjcClassPrefix"),
+    498: .same(proto: "hasOneofIndex"),
+    499: .same(proto: "hasOptimizeFor"),
+    500: .same(proto: "hasOptions"),
+    501: .same(proto: "hasOutputType"),
+    502: .same(proto: "hasOverridableFeatures"),
+    503: .same(proto: "hasPackage"),
+    504: .same(proto: "hasPacked"),
+    505: .same(proto: "hasPhpClassPrefix"),
+    506: .same(proto: "hasPhpMetadataNamespace"),
+    507: .same(proto: "hasPhpNamespace"),
+    508: .same(proto: "hasPositiveIntValue"),
+    509: .same(proto: "hasProto3Optional"),
+    510: .same(proto: "hasPyGenericServices"),
+    511: .same(proto: "hasRepeated"),
+    512: .same(proto: "hasRepeatedFieldEncoding"),
+    513: .same(proto: "hasReserved"),
+    514: .same(proto: "hasRetention"),
+    515: .same(proto: "hasRubyPackage"),
+    516: .same(proto: "hasSemantic"),
+    517: .same(proto: "hasServerStreaming"),
+    518: .same(proto: "hasSourceCodeInfo"),
+    519: .same(proto: "hasSourceContext"),
+    520: .same(proto: "hasSourceFile"),
+    521: .same(proto: "hasStart"),
+    522: .same(proto: "hasStringValue"),
+    523: .same(proto: "hasSwiftPrefix"),
+    524: .same(proto: "hasSyntax"),
+    525: .same(proto: "hasTrailingComments"),
+    526: .same(proto: "hasType"),
+    527: .same(proto: "hasTypeName"),
+    528: .same(proto: "hasUnverifiedLazy"),
+    529: .same(proto: "hasUtf8Validation"),
+    530: .same(proto: "hasValue"),
+    531: .same(proto: "hasVerification"),
+    532: .same(proto: "hasWeak"),
+    533: .same(proto: "hour"),
+    534: .same(proto: "i"),
+    535: .same(proto: "idempotencyLevel"),
+    536: .same(proto: "identifierValue"),
+    537: .same(proto: "if"),
+    538: .same(proto: "ignoreUnknownExtensionFields"),
+    539: .same(proto: "ignoreUnknownFields"),
+    540: .same(proto: "index"),
+    541: .same(proto: "init"),
+    542: .same(proto: "inout"),
+    543: .same(proto: "inputType"),
+    544: .same(proto: "insert"),
+    545: .same(proto: "Int"),
+    546: .same(proto: "Int32"),
+    547: .same(proto: "Int32Value"),
+    548: .same(proto: "Int64"),
+    549: .same(proto: "Int64Value"),
+    550: .same(proto: "Int8"),
+    551: .same(proto: "integerLiteral"),
+    552: .same(proto: "IntegerLiteralType"),
+    553: .same(proto: "intern"),
+    554: .same(proto: "Internal"),
+    555: .same(proto: "InternalState"),
+    556: .same(proto: "intersect"),
+    557: .same(proto: "into"),
+    558: .same(proto: "ints"),
+    559: .same(proto: "invalidAnyTypeURL"),
+    560: .same(proto: "isA"),
+    561: .same(proto: "isEqual"),
+    562: .same(proto: "isEqualTo"),
+    563: .same(proto: "isExtension"),
+    564: .same(proto: "isInitialized"),
+    565: .same(proto: "isNegative"),
+    566: .same(proto: "isPathValid"),
+    567: .same(proto: "isValid"),
+    568: .same(proto: "itemTagsEncodedSize"),
+    569: .same(proto: "iterator"),
+    570: .same(proto: "javaGenerateEqualsAndHash"),
+    571: .same(proto: "javaGenericServices"),
+    572: .same(proto: "javaMultipleFiles"),
+    573: .same(proto: "javaOuterClassname"),
+    574: .same(proto: "javaPackage"),
+    575: .same(proto: "javaStringCheckUtf8"),
+    576: .same(proto: "JSONDecoder"),
+    577: .same(proto: "JSONDecoding"),
+    578: .same(proto: "JSONDecodingError"),
+    579: .same(proto: "JSONDecodingOptions"),
+    580: .same(proto: "jsonEncoder"),
+    581: .same(proto: "JSONEncoding"),
+    582: .same(proto: "JSONEncodingError"),
+    583: .same(proto: "JSONEncodingOptions"),
+    584: .same(proto: "JSONEncodingVisitor"),
+    585: .same(proto: "jsonFormat"),
+    586: .same(proto: "JSONMapEncodingVisitor"),
+    587: .same(proto: "jsonName"),
+    588: .same(proto: "jsonPath"),
+    589: .same(proto: "jsonPaths"),
+    590: .same(proto: "JSONScanner"),
+    591: .same(proto: "jsonString"),
+    592: .same(proto: "jsonText"),
+    593: .same(proto: "jsonUTF8Bytes"),
+    594: .same(proto: "jsonUTF8Data"),
+    595: .same(proto: "jstype"),
+    596: .same(proto: "k"),
+    597: .same(proto: "kChunkSize"),
+    598: .same(proto: "Key"),
+    599: .same(proto: "keyField"),
+    600: .same(proto: "keyFieldOpt"),
+    601: .same(proto: "KeyType"),
+    602: .same(proto: "kind"),
+    603: .same(proto: "l"),
+    604: .same(proto: "label"),
+    605: .same(proto: "lazy"),
+    606: .same(proto: "leadingComments"),
+    607: .same(proto: "leadingDetachedComments"),
+    608: .same(proto: "length"),
+    609: .same(proto: "lessThan"),
+    610: .same(proto: "let"),
+    611: .same(proto: "lhs"),
+    612: .same(proto: "line"),
+    613: .same(proto: "list"),
+    614: .same(proto: "listOfMessages"),
+    615: .same(proto: "listValue"),
+    616: .same(proto: "littleEndian"),
+    617: .same(proto: "load"),
+    618: .same(proto: "localHasher"),
+    619: .same(proto: "location"),
+    620: .same(proto: "M"),
+    621: .same(proto: "major"),
+    622: .same(proto: "makeAsyncIterator"),
+    623: .same(proto: "makeIterator"),
+    624: .same(proto: "malformedLength"),
+    625: .same(proto: "mapEntry"),
+    626: .same(proto: "MapKeyType"),
+    627: .same(proto: "mapToMessages"),
+    628: .same(proto: "MapValueType"),
+    629: .same(proto: "mapVisitor"),
+    630: .same(proto: "mask"),
+    631: .same(proto: "maximumEdition"),
+    632: .same(proto: "mdayStart"),
+    633: .same(proto: "merge"),
+    634: .same(proto: "MergeOptions"),
+    635: .same(proto: "message"),
+    636: .same(proto: "messageDepthLimit"),
+    637: .same(proto: "messageEncoding"),
+    638: .same(proto: "MessageExtension"),
+    639: .same(proto: "MessageImplementationBase"),
+    640: .same(proto: "MessageOptions"),
+    641: .same(proto: "MessageSet"),
+    642: .same(proto: "messageSetWireFormat"),
+    643: .same(proto: "messageSize"),
+    644: .same(proto: "messageType"),
+    645: .same(proto: "Method"),
+    646: .same(proto: "MethodDescriptorProto"),
+    647: .same(proto: "MethodOptions"),
+    648: .same(proto: "methods"),
+    649: .same(proto: "min"),
+    650: .same(proto: "minimumEdition"),
+    651: .same(proto: "minor"),
+    652: .same(proto: "Mixin"),
+    653: .same(proto: "mixins"),
+    654: .same(proto: "modify"),
+    655: .same(proto: "month"),
+    656: .same(proto: "msgExtension"),
+    657: .same(proto: "mutating"),
+    658: .same(proto: "n"),
+    659: .same(proto: "name"),
+    660: .same(proto: "NameDescription"),
+    661: .same(proto: "NameMap"),
+    662: .same(proto: "NamePart"),
+    663: .same(proto: "names"),
+    664: .same(proto: "nanos"),
+    665: .same(proto: "negativeIntValue"),
+    666: .same(proto: "nestedType"),
+    667: .same(proto: "newExtensible"),
+    668: .same(proto: "newL"),
+    669: .same(proto: "newList"),
+    670: .same(proto: "newMessage"),
+    671: .same(proto: "newValue"),
+    672: .same(proto: "next"),
+    673: .same(proto: "nextByte"),
+    674: .same(proto: "nextFieldNumber"),
+    675: .same(proto: "nextVarInt"),
+    676: .same(proto: "nil"),
+    677: .same(proto: "nilLiteral"),
+    678: .same(proto: "noBytesAvailable"),
+    679: .same(proto: "noStandardDescriptorAccessor"),
+    680: .same(proto: "nullValue"),
+    681: .same(proto: "number"),
+    682: .same(proto: "numberValue"),
+    683: .same(proto: "objcClassPrefix"),
+    684: .same(proto: "of"),
+    685: .same(proto: "oneofDecl"),
+    686: .same(proto: "OneofDescriptorProto"),
+    687: .same(proto: "oneofIndex"),
+    688: .same(proto: "OneofOptions"),
+    689: .same(proto: "oneofs"),
+    690: .standard(proto: "OneOf_Kind"),
+    691: .same(proto: "optimizeFor"),
+    692: .same(proto: "OptimizeMode"),
+    693: .same(proto: "Option"),
+    694: .same(proto: "OptionalEnumExtensionField"),
+    695: .same(proto: "OptionalExtensionField"),
+    696: .same(proto: "OptionalGroupExtensionField"),
+    697: .same(proto: "OptionalMessageExtensionField"),
+    698: .same(proto: "OptionRetention"),
+    699: .same(proto: "options"),
+    700: .same(proto: "OptionTargetType"),
+    701: .same(proto: "other"),
+    702: .same(proto: "others"),
+    703: .same(proto: "out"),
+    704: .same(proto: "outputType"),
+    705: .same(proto: "overridableFeatures"),
+    706: .same(proto: "p"),
+    707: .same(proto: "package"),
+    708: .same(proto: "packed"),
+    709: .same(proto: "PackedEnumExtensionField"),
+    710: .same(proto: "PackedExtensionField"),
+    711: .same(proto: "padding"),
+    712: .same(proto: "parent"),
+    713: .same(proto: "parse"),
+    714: .same(proto: "partial"),
+    715: .same(proto: "path"),
+    716: .same(proto: "PathDecoder"),
+    717: .same(proto: "PathDecodingError"),
+    718: .same(proto: "paths"),
+    719: .same(proto: "PathVisitor"),
+    720: .same(proto: "payload"),
+    721: .same(proto: "payloadSize"),
+    722: .same(proto: "phpClassPrefix"),
+    723: .same(proto: "phpMetadataNamespace"),
+    724: .same(proto: "phpNamespace"),
+    725: .same(proto: "pos"),
+    726: .same(proto: "positiveIntValue"),
+    727: .same(proto: "prefix"),
+    728: .same(proto: "preserveProtoFieldNames"),
+    729: .same(proto: "preTraverse"),
+    730: .same(proto: "prevPath"),
+    731: .same(proto: "printUnknownFields"),
+    732: .same(proto: "proto2"),
+    733: .same(proto: "proto3DefaultValue"),
+    734: .same(proto: "proto3Optional"),
+    735: .same(proto: "ProtobufAPIVersionCheck"),
+    736: .standard(proto: "ProtobufAPIVersion_2"),
+    737: .same(proto: "ProtobufBool"),
+    738: .same(proto: "ProtobufBytes"),
+    739: .same(proto: "ProtobufDouble"),
+    740: .same(proto: "ProtobufEnumMap"),
+    741: .same(proto: "protobufExtension"),
+    742: .same(proto: "ProtobufFixed32"),
+    743: .same(proto: "ProtobufFixed64"),
+    744: .same(proto: "ProtobufFloat"),
+    745: .same(proto: "ProtobufInt32"),
+    746: .same(proto: "ProtobufInt64"),
+    747: .same(proto: "ProtobufMap"),
+    748: .same(proto: "ProtobufMessageMap"),
+    749: .same(proto: "ProtobufSFixed32"),
+    750: .same(proto: "ProtobufSFixed64"),
+    751: .same(proto: "ProtobufSInt32"),
+    752: .same(proto: "ProtobufSInt64"),
+    753: .same(proto: "ProtobufString"),
+    754: .same(proto: "ProtobufUInt32"),
+    755: .same(proto: "ProtobufUInt64"),
+    756: .standard(proto: "protobuf_extensionFieldValues"),
+    757: .standard(proto: "protobuf_fieldNumber"),
+    758: .standard(proto: "protobuf_generated_isEqualTo"),
+    759: .standard(proto: "protobuf_nameMap"),
+    760: .standard(proto: "protobuf_newField"),
+    761: .standard(proto: "protobuf_package"),
+    762: .same(proto: "protocol"),
+    763: .same(proto: "protoFieldName"),
+    764: .same(proto: "protoMessageName"),
+    765: .same(proto: "ProtoNameProviding"),
+    766: .same(proto: "protoPaths"),
+    767: .same(proto: "public"),
+    768: .same(proto: "publicDependency"),
+    769: .same(proto: "putBoolValue"),
+    770: .same(proto: "putBytesValue"),
+    771: .same(proto: "putDoubleValue"),
+    772: .same(proto: "putEnumValue"),
+    773: .same(proto: "putFixedUInt32"),
+    774: .same(proto: "putFixedUInt64"),
+    775: .same(proto: "putFloatValue"),
+    776: .same(proto: "putInt64"),
+    777: .same(proto: "putStringValue"),
+    778: .same(proto: "putUInt64"),
+    779: .same(proto: "putUInt64Hex"),
+    780: .same(proto: "putVarInt"),
+    781: .same(proto: "putZigZagVarInt"),
+    782: .same(proto: "pyGenericServices"),
+    783: .same(proto: "R"),
+    784: .same(proto: "rawChars"),
+    785: .same(proto: "RawRepresentable"),
+    786: .same(proto: "RawValue"),
+    787: .same(proto: "read4HexDigits"),
+    788: .same(proto: "readBytes"),
+    789: .same(proto: "register"),
+    790: .same(proto: "removingAllFieldsOf"),
+    791: .same(proto: "repeated"),
+    792: .same(proto: "RepeatedEnumExtensionField"),
+    793: .same(proto: "RepeatedExtensionField"),
+    794: .same(proto: "repeatedFieldEncoding"),
+    795: .same(proto: "RepeatedGroupExtensionField"),
+    796: .same(proto: "RepeatedMessageExtensionField"),
+    797: .same(proto: "repeating"),
+    798: .same(proto: "replaceRepeatedFields"),
+    799: .same(proto: "requestStreaming"),
+    800: .same(proto: "requestTypeURL"),
+    801: .same(proto: "requiredSize"),
+    802: .same(proto: "responseStreaming"),
+    803: .same(proto: "responseTypeURL"),
+    804: .same(proto: "result"),
+    805: .same(proto: "retention"),
+    806: .same(proto: "rethrows"),
+    807: .same(proto: "return"),
+    808: .same(proto: "ReturnType"),
+    809: .same(proto: "revision"),
+    810: .same(proto: "rhs"),
+    811: .same(proto: "root"),
+    812: .same(proto: "rubyPackage"),
+    813: .same(proto: "s"),
+    814: .same(proto: "sawBackslash"),
+    815: .same(proto: "sawSection4Characters"),
+    816: .same(proto: "sawSection5Characters"),
+    817: .same(proto: "scan"),
+    818: .same(proto: "scanner"),
+    819: .same(proto: "seconds"),
+    820: .same(proto: "self"),
+    821: .same(proto: "semantic"),
+    822: .same(proto: "Sendable"),
+    823: .same(proto: "separator"),
+    824: .same(proto: "serialize"),
+    825: .same(proto: "serializedBytes"),
+    826: .same(proto: "serializedData"),
+    827: .same(proto: "serializedSize"),
+    828: .same(proto: "serverStreaming"),
+    829: .same(proto: "service"),
+    830: .same(proto: "ServiceDescriptorProto"),
+    831: .same(proto: "ServiceOptions"),
+    832: .same(proto: "set"),
+    833: .same(proto: "setExtensionValue"),
+    834: .same(proto: "shift"),
+    835: .same(proto: "SimpleExtensionMap"),
+    836: .same(proto: "size"),
+    837: .same(proto: "sizer"),
+    838: .same(proto: "source"),
+    839: .same(proto: "sourceCodeInfo"),
+    840: .same(proto: "sourceContext"),
+    841: .same(proto: "sourceEncoding"),
+    842: .same(proto: "sourceFile"),
+    843: .same(proto: "SourceLocation"),
+    844: .same(proto: "span"),
+    845: .same(proto: "split"),
+    846: .same(proto: "start"),
+    847: .same(proto: "startArray"),
+    848: .same(proto: "startArrayObject"),
+    849: .same(proto: "startField"),
+    850: .same(proto: "startIndex"),
+    851: .same(proto: "startMessageField"),
+    852: .same(proto: "startObject"),
+    853: .same(proto: "startRegularField"),
+    854: .same(proto: "state"),
+    855: .same(proto: "static"),
+    856: .same(proto: "StaticString"),
+    857: .same(proto: "storage"),
+    858: .same(proto: "String"),
+    859: .same(proto: "stringLiteral"),
+    860: .same(proto: "StringLiteralType"),
+    861: .same(proto: "stringResult"),
+    862: .same(proto: "stringValue"),
+    863: .same(proto: "struct"),
+    864: .same(proto: "structValue"),
+    865: .same(proto: "subDecoder"),
+    866: .same(proto: "subscript"),
+    867: .same(proto: "subtract"),
+    868: .same(proto: "subVisitor"),
+    869: .same(proto: "Swift"),
+    870: .same(proto: "swiftPrefix"),
+    871: .same(proto: "SwiftProtobufContiguousBytes"),
+    872: .same(proto: "SwiftProtobufError"),
+    873: .same(proto: "syntax"),
+    874: .same(proto: "T"),
+    875: .same(proto: "tag"),
+    876: .same(proto: "targets"),
+    877: .same(proto: "terminator"),
+    878: .same(proto: "testDecoder"),
+    879: .same(proto: "text"),
+    880: .same(proto: "textDecoder"),
+    881: .same(proto: "TextFormatDecoder"),
+    882: .same(proto: "TextFormatDecodingError"),
+    883: .same(proto: "TextFormatDecodingOptions"),
+    884: .same(proto: "TextFormatEncodingOptions"),
+    885: .same(proto: "TextFormatEncodingVisitor"),
+    886: .same(proto: "textFormatString"),
+    887: .same(proto: "throwOrIgnore"),
+    888: .same(proto: "throws"),
+    889: .same(proto: "timeInterval"),
+    890: .same(proto: "timeIntervalSince1970"),
+    891: .same(proto: "timeIntervalSinceReferenceDate"),
+    892: .same(proto: "Timestamp"),
+    893: .same(proto: "tmp"),
+    894: .same(proto: "tooLarge"),
+    895: .same(proto: "total"),
+    896: .same(proto: "totalArrayDepth"),
+    897: .same(proto: "totalSize"),
+    898: .same(proto: "trailingComments"),
+    899: .same(proto: "traverse"),
+    900: .same(proto: "trim"),
+    901: .same(proto: "true"),
+    902: .same(proto: "try"),
+    903: .same(proto: "type"),
+    904: .same(proto: "typealias"),
+    905: .same(proto: "TypeEnum"),
+    906: .same(proto: "typeName"),
+    907: .same(proto: "typePrefix"),
+    908: .same(proto: "typeStart"),
+    909: .same(proto: "typeUnknown"),
+    910: .same(proto: "typeURL"),
+    911: .same(proto: "UInt32"),
+    912: .same(proto: "UInt32Value"),
+    913: .same(proto: "UInt64"),
+    914: .same(proto: "UInt64Value"),
+    915: .same(proto: "UInt8"),
+    916: .same(proto: "unchecked"),
+    917: .same(proto: "unicodeScalarLiteral"),
+    918: .same(proto: "UnicodeScalarLiteralType"),
+    919: .same(proto: "unicodeScalars"),
+    920: .same(proto: "UnicodeScalarView"),
+    921: .same(proto: "uninterpretedOption"),
+    922: .same(proto: "union"),
+    923: .same(proto: "uniqueStorage"),
+    924: .same(proto: "unknown"),
+    925: .same(proto: "unknownFields"),
+    926: .same(proto: "UnknownStorage"),
+    927: .same(proto: "unpackTo"),
+    928: .same(proto: "UnsafeBufferPointer"),
+    929: .same(proto: "UnsafeMutablePointer"),
+    930: .same(proto: "UnsafeMutableRawBufferPointer"),
+    931: .same(proto: "UnsafeRawBufferPointer"),
+    932: .same(proto: "UnsafeRawPointer"),
+    933: .same(proto: "unverifiedLazy"),
+    934: .same(proto: "updatedOptions"),
+    935: .same(proto: "url"),
+    936: .same(proto: "useDeterministicOrdering"),
+    937: .same(proto: "utf8"),
+    938: .same(proto: "utf8Ptr"),
+    939: .same(proto: "utf8ToDouble"),
+    940: .same(proto: "utf8Validation"),
+    941: .same(proto: "UTF8View"),
+    942: .same(proto: "v"),
+    943: .same(proto: "value"),
+    944: .same(proto: "valueField"),
+    945: .same(proto: "values"),
+    946: .same(proto: "ValueType"),
+    947: .same(proto: "var"),
+    948: .same(proto: "verification"),
+    949: .same(proto: "VerificationState"),
+    950: .same(proto: "Version"),
+    951: .same(proto: "versionString"),
+    952: .same(proto: "visitExtensionFields"),
+    953: .same(proto: "visitExtensionFieldsAsMessageSet"),
+    954: .same(proto: "visitMapField"),
+    955: .same(proto: "visitor"),
+    956: .same(proto: "visitPacked"),
+    957: .same(proto: "visitPackedBoolField"),
+    958: .same(proto: "visitPackedDoubleField"),
+    959: .same(proto: "visitPackedEnumField"),
+    960: .same(proto: "visitPackedFixed32Field"),
+    961: .same(proto: "visitPackedFixed64Field"),
+    962: .same(proto: "visitPackedFloatField"),
+    963: .same(proto: "visitPackedInt32Field"),
+    964: .same(proto: "visitPackedInt64Field"),
+    965: .same(proto: "visitPackedSFixed32Field"),
+    966: .same(proto: "visitPackedSFixed64Field"),
+    967: .same(proto: "visitPackedSInt32Field"),
+    968: .same(proto: "visitPackedSInt64Field"),
+    969: .same(proto: "visitPackedUInt32Field"),
+    970: .same(proto: "visitPackedUInt64Field"),
+    971: .same(proto: "visitRepeated"),
+    972: .same(proto: "visitRepeatedBoolField"),
+    973: .same(proto: "visitRepeatedBytesField"),
+    974: .same(proto: "visitRepeatedDoubleField"),
+    975: .same(proto: "visitRepeatedEnumField"),
+    976: .same(proto: "visitRepeatedFixed32Field"),
+    977: .same(proto: "visitRepeatedFixed64Field"),
+    978: .same(proto: "visitRepeatedFloatField"),
+    979: .same(proto: "visitRepeatedGroupField"),
+    980: .same(proto: "visitRepeatedInt32Field"),
+    981: .same(proto: "visitRepeatedInt64Field"),
+    982: .same(proto: "visitRepeatedMessageField"),
+    983: .same(proto: "visitRepeatedSFixed32Field"),
+    984: .same(proto: "visitRepeatedSFixed64Field"),
+    985: .same(proto: "visitRepeatedSInt32Field"),
+    986: .same(proto: "visitRepeatedSInt64Field"),
+    987: .same(proto: "visitRepeatedStringField"),
+    988: .same(proto: "visitRepeatedUInt32Field"),
+    989: .same(proto: "visitRepeatedUInt64Field"),
+    990: .same(proto: "visitSingular"),
+    991: .same(proto: "visitSingularBoolField"),
+    992: .same(proto: "visitSingularBytesField"),
+    993: .same(proto: "visitSingularDoubleField"),
+    994: .same(proto: "visitSingularEnumField"),
+    995: .same(proto: "visitSingularFixed32Field"),
+    996: .same(proto: "visitSingularFixed64Field"),
+    997: .same(proto: "visitSingularFloatField"),
+    998: .same(proto: "visitSingularGroupField"),
+    999: .same(proto: "visitSingularInt32Field"),
+    1000: .same(proto: "visitSingularInt64Field"),
+    1001: .same(proto: "visitSingularMessageField"),
+    1002: .same(proto: "visitSingularSFixed32Field"),
+    1003: .same(proto: "visitSingularSFixed64Field"),
+    1004: .same(proto: "visitSingularSInt32Field"),
+    1005: .same(proto: "visitSingularSInt64Field"),
+    1006: .same(proto: "visitSingularStringField"),
+    1007: .same(proto: "visitSingularUInt32Field"),
+    1008: .same(proto: "visitSingularUInt64Field"),
+    1009: .same(proto: "visitUnknown"),
+    1010: .same(proto: "wasDecoded"),
+    1011: .same(proto: "weak"),
+    1012: .same(proto: "weakDependency"),
+    1013: .same(proto: "where"),
+    1014: .same(proto: "wireFormat"),
+    1015: .same(proto: "with"),
+    1016: .same(proto: "withUnsafeBytes"),
+    1017: .same(proto: "withUnsafeMutableBytes"),
+    1018: .same(proto: "work"),
+    1019: .same(proto: "Wrapped"),
+    1020: .same(proto: "WrappedType"),
+    1021: .same(proto: "wrappedValue"),
+    1022: .same(proto: "written"),
+    1023: .same(proto: "yday"),
   ]
 
   fileprivate class _StorageClass {
@@ -6238,6 +6280,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _clearEditionIntroduced_p: Int32 = 0
     var _clearEditionRemoved_p: Int32 = 0
     var _clearEnd_p: Int32 = 0
+    var _clearEnforceNamingStyle_p: Int32 = 0
     var _clearEnumType_p: Int32 = 0
     var _clearExtendee_p: Int32 = 0
     var _clearExtensionValue_p: Int32 = 0
@@ -6420,6 +6463,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _emitFieldName: Int32 = 0
     var _emitFieldNumber: Int32 = 0
     var _empty: Int32 = 0
+    var _emptyAnyTypeURL: Int32 = 0
     var _emptyData: Int32 = 0
     var _encodeAsBytes: Int32 = 0
     var _encoded: Int32 = 0
@@ -6432,6 +6476,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _endMessageField: Int32 = 0
     var _endObject: Int32 = 0
     var _endRegularField: Int32 = 0
+    var _enforceNamingStyle: Int32 = 0
     var _enum: Int32 = 0
     var _enumDescriptorProto: Int32 = 0
     var _enumOptions: Int32 = 0
@@ -6595,6 +6640,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _hasEditionIntroduced_p: Int32 = 0
     var _hasEditionRemoved_p: Int32 = 0
     var _hasEnd_p: Int32 = 0
+    var _hasEnforceNamingStyle_p: Int32 = 0
     var _hasEnumType_p: Int32 = 0
     var _hasExtendee_p: Int32 = 0
     var _hasExtensionValue_p: Int32 = 0
@@ -6696,6 +6742,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _intersect: Int32 = 0
     var _into: Int32 = 0
     var _ints: Int32 = 0
+    var _invalidAnyTypeURL: Int32 = 0
     var _isA: Int32 = 0
     var _isEqual: Int32 = 0
     var _isEqualTo: Int32 = 0
@@ -6713,9 +6760,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
     var _javaPackage: Int32 = 0
     var _javaStringCheckUtf8: Int32 = 0
     var _jsondecoder: Int32 = 0
+    var _jsondecoding: Int32 = 0
     var _jsondecodingError: Int32 = 0
     var _jsondecodingOptions: Int32 = 0
     var _jsonEncoder: Int32 = 0
+    var _jsonencoding: Int32 = 0
     var _jsonencodingError: Int32 = 0
     var _jsonencodingOptions: Int32 = 0
     var _jsonencodingVisitor: Int32 = 0
@@ -7268,6 +7317,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _clearEditionIntroduced_p = source._clearEditionIntroduced_p
       _clearEditionRemoved_p = source._clearEditionRemoved_p
       _clearEnd_p = source._clearEnd_p
+      _clearEnforceNamingStyle_p = source._clearEnforceNamingStyle_p
       _clearEnumType_p = source._clearEnumType_p
       _clearExtendee_p = source._clearExtendee_p
       _clearExtensionValue_p = source._clearExtensionValue_p
@@ -7450,6 +7500,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _emitFieldName = source._emitFieldName
       _emitFieldNumber = source._emitFieldNumber
       _empty = source._empty
+      _emptyAnyTypeURL = source._emptyAnyTypeURL
       _emptyData = source._emptyData
       _encodeAsBytes = source._encodeAsBytes
       _encoded = source._encoded
@@ -7462,6 +7513,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _endMessageField = source._endMessageField
       _endObject = source._endObject
       _endRegularField = source._endRegularField
+      _enforceNamingStyle = source._enforceNamingStyle
       _enum = source._enum
       _enumDescriptorProto = source._enumDescriptorProto
       _enumOptions = source._enumOptions
@@ -7625,6 +7677,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _hasEditionIntroduced_p = source._hasEditionIntroduced_p
       _hasEditionRemoved_p = source._hasEditionRemoved_p
       _hasEnd_p = source._hasEnd_p
+      _hasEnforceNamingStyle_p = source._hasEnforceNamingStyle_p
       _hasEnumType_p = source._hasEnumType_p
       _hasExtendee_p = source._hasExtendee_p
       _hasExtensionValue_p = source._hasExtensionValue_p
@@ -7726,6 +7779,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _intersect = source._intersect
       _into = source._into
       _ints = source._ints
+      _invalidAnyTypeURL = source._invalidAnyTypeURL
       _isA = source._isA
       _isEqual = source._isEqual
       _isEqualTo = source._isEqualTo
@@ -7743,9 +7797,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       _javaPackage = source._javaPackage
       _javaStringCheckUtf8 = source._javaStringCheckUtf8
       _jsondecoder = source._jsondecoder
+      _jsondecoding = source._jsondecoding
       _jsondecodingError = source._jsondecodingError
       _jsondecodingOptions = source._jsondecodingOptions
       _jsonEncoder = source._jsonEncoder
+      _jsonencoding = source._jsonencoding
       _jsonencodingError = source._jsonencodingError
       _jsonencodingOptions = source._jsonencodingOptions
       _jsonencodingVisitor = source._jsonencodingVisitor
@@ -8302,926 +8358,933 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         case 94: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEditionIntroduced_p) }()
         case 95: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEditionRemoved_p) }()
         case 96: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnd_p) }()
-        case 97: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnumType_p) }()
-        case 98: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtendee_p) }()
-        case 99: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtensionValue_p) }()
-        case 100: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatures_p) }()
-        case 101: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatureSupport_p) }()
-        case 102: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFieldPresence_p) }()
-        case 103: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFixedFeatures_p) }()
-        case 104: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFullName_p) }()
-        case 105: try { try decoder.decodeSingularInt32Field(value: &_storage._clearGoPackage_p) }()
-        case 106: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdempotencyLevel_p) }()
-        case 107: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdentifierValue_p) }()
-        case 108: try { try decoder.decodeSingularInt32Field(value: &_storage._clearInputType_p) }()
-        case 109: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIsExtension_p) }()
-        case 110: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenerateEqualsAndHash_p) }()
-        case 111: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenericServices_p) }()
-        case 112: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaMultipleFiles_p) }()
-        case 113: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaOuterClassname_p) }()
-        case 114: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaPackage_p) }()
-        case 115: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaStringCheckUtf8_p) }()
-        case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonFormat_p) }()
-        case 117: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonName_p) }()
-        case 118: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJstype_p) }()
-        case 119: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLabel_p) }()
-        case 120: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLazy_p) }()
-        case 121: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLeadingComments_p) }()
-        case 122: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMapEntry_p) }()
-        case 123: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMaximumEdition_p) }()
-        case 124: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageEncoding_p) }()
-        case 125: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageSetWireFormat_p) }()
-        case 126: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMinimumEdition_p) }()
-        case 127: try { try decoder.decodeSingularInt32Field(value: &_storage._clearName_p) }()
-        case 128: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNamePart_p) }()
-        case 129: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNegativeIntValue_p) }()
-        case 130: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNoStandardDescriptorAccessor_p) }()
-        case 131: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNumber_p) }()
-        case 132: try { try decoder.decodeSingularInt32Field(value: &_storage._clearObjcClassPrefix_p) }()
-        case 133: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOneofIndex_p) }()
-        case 134: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptimizeFor_p) }()
-        case 135: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptions_p) }()
-        case 136: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOutputType_p) }()
-        case 137: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOverridableFeatures_p) }()
-        case 138: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPackage_p) }()
-        case 139: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPacked_p) }()
-        case 140: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpClassPrefix_p) }()
-        case 141: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpMetadataNamespace_p) }()
-        case 142: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpNamespace_p) }()
-        case 143: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPositiveIntValue_p) }()
-        case 144: try { try decoder.decodeSingularInt32Field(value: &_storage._clearProto3Optional_p) }()
-        case 145: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPyGenericServices_p) }()
-        case 146: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeated_p) }()
-        case 147: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeatedFieldEncoding_p) }()
-        case 148: try { try decoder.decodeSingularInt32Field(value: &_storage._clearReserved_p) }()
-        case 149: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRetention_p) }()
-        case 150: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRubyPackage_p) }()
-        case 151: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSemantic_p) }()
-        case 152: try { try decoder.decodeSingularInt32Field(value: &_storage._clearServerStreaming_p) }()
-        case 153: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceCodeInfo_p) }()
-        case 154: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceContext_p) }()
-        case 155: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceFile_p) }()
-        case 156: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStart_p) }()
-        case 157: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStringValue_p) }()
-        case 158: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSwiftPrefix_p) }()
-        case 159: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSyntax_p) }()
-        case 160: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTrailingComments_p) }()
-        case 161: try { try decoder.decodeSingularInt32Field(value: &_storage._clearType_p) }()
-        case 162: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTypeName_p) }()
-        case 163: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUnverifiedLazy_p) }()
-        case 164: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUtf8Validation_p) }()
-        case 165: try { try decoder.decodeSingularInt32Field(value: &_storage._clearValue_p) }()
-        case 166: try { try decoder.decodeSingularInt32Field(value: &_storage._clearVerification_p) }()
-        case 167: try { try decoder.decodeSingularInt32Field(value: &_storage._clearWeak_p) }()
-        case 168: try { try decoder.decodeSingularInt32Field(value: &_storage._clientStreaming) }()
-        case 169: try { try decoder.decodeSingularInt32Field(value: &_storage._code) }()
-        case 170: try { try decoder.decodeSingularInt32Field(value: &_storage._codePoint) }()
-        case 171: try { try decoder.decodeSingularInt32Field(value: &_storage._codeUnits) }()
-        case 172: try { try decoder.decodeSingularInt32Field(value: &_storage._collection) }()
-        case 173: try { try decoder.decodeSingularInt32Field(value: &_storage._com) }()
-        case 174: try { try decoder.decodeSingularInt32Field(value: &_storage._comma) }()
-        case 175: try { try decoder.decodeSingularInt32Field(value: &_storage._consumedBytes) }()
-        case 176: try { try decoder.decodeSingularInt32Field(value: &_storage._contains) }()
-        case 177: try { try decoder.decodeSingularInt32Field(value: &_storage._contentsOf) }()
-        case 178: try { try decoder.decodeSingularInt32Field(value: &_storage._contiguousBytes) }()
-        case 179: try { try decoder.decodeSingularInt32Field(value: &_storage._copy) }()
-        case 180: try { try decoder.decodeSingularInt32Field(value: &_storage._count) }()
-        case 181: try { try decoder.decodeSingularInt32Field(value: &_storage._countVarintsInBuffer) }()
-        case 182: try { try decoder.decodeSingularInt32Field(value: &_storage._csharpNamespace) }()
-        case 183: try { try decoder.decodeSingularInt32Field(value: &_storage._ctype) }()
-        case 184: try { try decoder.decodeSingularInt32Field(value: &_storage._customCodable) }()
-        case 185: try { try decoder.decodeSingularInt32Field(value: &_storage._customDebugStringConvertible) }()
-        case 186: try { try decoder.decodeSingularInt32Field(value: &_storage._customStringConvertible) }()
-        case 187: try { try decoder.decodeSingularInt32Field(value: &_storage._d) }()
-        case 188: try { try decoder.decodeSingularInt32Field(value: &_storage._data) }()
-        case 189: try { try decoder.decodeSingularInt32Field(value: &_storage._dataResult) }()
-        case 190: try { try decoder.decodeSingularInt32Field(value: &_storage._date) }()
-        case 191: try { try decoder.decodeSingularInt32Field(value: &_storage._daySec) }()
-        case 192: try { try decoder.decodeSingularInt32Field(value: &_storage._daysSinceEpoch) }()
-        case 193: try { try decoder.decodeSingularInt32Field(value: &_storage._debugDescription_p) }()
-        case 194: try { try decoder.decodeSingularInt32Field(value: &_storage._debugRedact) }()
-        case 195: try { try decoder.decodeSingularInt32Field(value: &_storage._declaration) }()
-        case 196: try { try decoder.decodeSingularInt32Field(value: &_storage._decoded) }()
-        case 197: try { try decoder.decodeSingularInt32Field(value: &_storage._decodedFromJsonnull) }()
-        case 198: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionField) }()
-        case 199: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionFieldsAsMessageSet) }()
-        case 200: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeJson) }()
-        case 201: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMapField) }()
-        case 202: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMessage) }()
-        case 203: try { try decoder.decodeSingularInt32Field(value: &_storage._decoder) }()
-        case 204: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeated) }()
-        case 205: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBoolField) }()
-        case 206: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBytesField) }()
-        case 207: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedDoubleField) }()
-        case 208: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedEnumField) }()
-        case 209: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed32Field) }()
-        case 210: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed64Field) }()
-        case 211: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFloatField) }()
-        case 212: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedGroupField) }()
-        case 213: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt32Field) }()
-        case 214: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt64Field) }()
-        case 215: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedMessageField) }()
-        case 216: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed32Field) }()
-        case 217: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed64Field) }()
-        case 218: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint32Field) }()
-        case 219: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint64Field) }()
-        case 220: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedStringField) }()
-        case 221: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint32Field) }()
-        case 222: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint64Field) }()
-        case 223: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingular) }()
-        case 224: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBoolField) }()
-        case 225: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBytesField) }()
-        case 226: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularDoubleField) }()
-        case 227: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularEnumField) }()
-        case 228: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed32Field) }()
-        case 229: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed64Field) }()
-        case 230: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFloatField) }()
-        case 231: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularGroupField) }()
-        case 232: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt32Field) }()
-        case 233: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt64Field) }()
-        case 234: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularMessageField) }()
-        case 235: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed32Field) }()
-        case 236: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed64Field) }()
-        case 237: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint32Field) }()
-        case 238: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint64Field) }()
-        case 239: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularStringField) }()
-        case 240: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint32Field) }()
-        case 241: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint64Field) }()
-        case 242: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeTextFormat) }()
-        case 243: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultAnyTypeUrlprefix) }()
-        case 244: try { try decoder.decodeSingularInt32Field(value: &_storage._defaults) }()
-        case 245: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultValue) }()
-        case 246: try { try decoder.decodeSingularInt32Field(value: &_storage._dependency) }()
-        case 247: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecated) }()
-        case 248: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecatedLegacyJsonFieldConflicts) }()
-        case 249: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecationWarning) }()
-        case 250: try { try decoder.decodeSingularInt32Field(value: &_storage._description_p) }()
-        case 251: try { try decoder.decodeSingularInt32Field(value: &_storage._descriptorProto) }()
-        case 252: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionary) }()
-        case 253: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionaryLiteral) }()
-        case 254: try { try decoder.decodeSingularInt32Field(value: &_storage._digit) }()
-        case 255: try { try decoder.decodeSingularInt32Field(value: &_storage._digit0) }()
-        case 256: try { try decoder.decodeSingularInt32Field(value: &_storage._digit1) }()
-        case 257: try { try decoder.decodeSingularInt32Field(value: &_storage._digitCount) }()
-        case 258: try { try decoder.decodeSingularInt32Field(value: &_storage._digits) }()
-        case 259: try { try decoder.decodeSingularInt32Field(value: &_storage._digitValue) }()
-        case 260: try { try decoder.decodeSingularInt32Field(value: &_storage._discardableResult) }()
-        case 261: try { try decoder.decodeSingularInt32Field(value: &_storage._discardUnknownFields) }()
-        case 262: try { try decoder.decodeSingularInt32Field(value: &_storage._double) }()
-        case 263: try { try decoder.decodeSingularInt32Field(value: &_storage._doubleValue) }()
-        case 264: try { try decoder.decodeSingularInt32Field(value: &_storage._duration) }()
-        case 265: try { try decoder.decodeSingularInt32Field(value: &_storage._e) }()
-        case 266: try { try decoder.decodeSingularInt32Field(value: &_storage._edition) }()
-        case 267: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefault) }()
-        case 268: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefaults) }()
-        case 269: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDeprecated) }()
-        case 270: try { try decoder.decodeSingularInt32Field(value: &_storage._editionIntroduced) }()
-        case 271: try { try decoder.decodeSingularInt32Field(value: &_storage._editionRemoved) }()
-        case 272: try { try decoder.decodeSingularInt32Field(value: &_storage._element) }()
-        case 273: try { try decoder.decodeSingularInt32Field(value: &_storage._elements) }()
-        case 274: try { try decoder.decodeSingularInt32Field(value: &_storage._else) }()
-        case 275: try { try decoder.decodeSingularInt32Field(value: &_storage._emitExtensionFieldName) }()
-        case 276: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldName) }()
-        case 277: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldNumber) }()
-        case 278: try { try decoder.decodeSingularInt32Field(value: &_storage._empty) }()
-        case 279: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyData) }()
-        case 280: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeAsBytes) }()
-        case 281: try { try decoder.decodeSingularInt32Field(value: &_storage._encoded) }()
-        case 282: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedJsonstring) }()
-        case 283: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedSize) }()
-        case 284: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeField) }()
-        case 285: try { try decoder.decodeSingularInt32Field(value: &_storage._encoder) }()
-        case 286: try { try decoder.decodeSingularInt32Field(value: &_storage._end) }()
-        case 287: try { try decoder.decodeSingularInt32Field(value: &_storage._endArray) }()
-        case 288: try { try decoder.decodeSingularInt32Field(value: &_storage._endMessageField) }()
-        case 289: try { try decoder.decodeSingularInt32Field(value: &_storage._endObject) }()
-        case 290: try { try decoder.decodeSingularInt32Field(value: &_storage._endRegularField) }()
-        case 291: try { try decoder.decodeSingularInt32Field(value: &_storage._enum) }()
-        case 292: try { try decoder.decodeSingularInt32Field(value: &_storage._enumDescriptorProto) }()
-        case 293: try { try decoder.decodeSingularInt32Field(value: &_storage._enumOptions) }()
-        case 294: try { try decoder.decodeSingularInt32Field(value: &_storage._enumReservedRange) }()
-        case 295: try { try decoder.decodeSingularInt32Field(value: &_storage._enumType) }()
-        case 296: try { try decoder.decodeSingularInt32Field(value: &_storage._enumvalue) }()
-        case 297: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueDescriptorProto) }()
-        case 298: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueOptions) }()
-        case 299: try { try decoder.decodeSingularInt32Field(value: &_storage._equatable) }()
-        case 300: try { try decoder.decodeSingularInt32Field(value: &_storage._error) }()
-        case 301: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByArrayLiteral) }()
-        case 302: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByDictionaryLiteral) }()
-        case 303: try { try decoder.decodeSingularInt32Field(value: &_storage._ext) }()
-        case 304: try { try decoder.decodeSingularInt32Field(value: &_storage._extDecoder) }()
-        case 305: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteral) }()
-        case 306: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteralType) }()
-        case 307: try { try decoder.decodeSingularInt32Field(value: &_storage._extendee) }()
-        case 308: try { try decoder.decodeSingularInt32Field(value: &_storage._extensibleMessage) }()
-        case 309: try { try decoder.decodeSingularInt32Field(value: &_storage._extension) }()
-        case 310: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionField) }()
-        case 311: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldNumber) }()
-        case 312: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldValueSet) }()
-        case 313: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionMap) }()
-        case 314: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRange) }()
-        case 315: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRangeOptions) }()
-        case 316: try { try decoder.decodeSingularInt32Field(value: &_storage._extensions) }()
-        case 317: try { try decoder.decodeSingularInt32Field(value: &_storage._extras) }()
-        case 318: try { try decoder.decodeSingularInt32Field(value: &_storage._f) }()
-        case 319: try { try decoder.decodeSingularInt32Field(value: &_storage._false) }()
-        case 320: try { try decoder.decodeSingularInt32Field(value: &_storage._features) }()
-        case 321: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSet) }()
-        case 322: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetDefaults) }()
-        case 323: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetEditionDefault) }()
-        case 324: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSupport) }()
-        case 325: try { try decoder.decodeSingularInt32Field(value: &_storage._field) }()
-        case 326: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldData) }()
-        case 327: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldDescriptorProto) }()
-        case 328: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMask) }()
-        case 329: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMaskError) }()
-        case 330: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName) }()
-        case 331: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNameCount) }()
-        case 332: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNum) }()
-        case 333: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumber) }()
-        case 334: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumberForProto) }()
-        case 335: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldOptions) }()
-        case 336: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldPresence) }()
-        case 337: try { try decoder.decodeSingularInt32Field(value: &_storage._fields) }()
-        case 338: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldSize) }()
-        case 339: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldTag) }()
-        case 340: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldType) }()
-        case 341: try { try decoder.decodeSingularInt32Field(value: &_storage._file) }()
-        case 342: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorProto) }()
-        case 343: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorSet) }()
-        case 344: try { try decoder.decodeSingularInt32Field(value: &_storage._fileName) }()
-        case 345: try { try decoder.decodeSingularInt32Field(value: &_storage._fileOptions) }()
-        case 346: try { try decoder.decodeSingularInt32Field(value: &_storage._filter) }()
-        case 347: try { try decoder.decodeSingularInt32Field(value: &_storage._final) }()
-        case 348: try { try decoder.decodeSingularInt32Field(value: &_storage._finiteOnly) }()
-        case 349: try { try decoder.decodeSingularInt32Field(value: &_storage._first) }()
-        case 350: try { try decoder.decodeSingularInt32Field(value: &_storage._firstItem) }()
-        case 351: try { try decoder.decodeSingularInt32Field(value: &_storage._fixedFeatures) }()
-        case 352: try { try decoder.decodeSingularInt32Field(value: &_storage._float) }()
-        case 353: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteral) }()
-        case 354: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteralType) }()
-        case 355: try { try decoder.decodeSingularInt32Field(value: &_storage._floatValue) }()
-        case 356: try { try decoder.decodeSingularInt32Field(value: &_storage._for) }()
-        case 357: try { try decoder.decodeSingularInt32Field(value: &_storage._forMessageName) }()
-        case 358: try { try decoder.decodeSingularInt32Field(value: &_storage._formUnion) }()
-        case 359: try { try decoder.decodeSingularInt32Field(value: &_storage._forReadingFrom) }()
-        case 360: try { try decoder.decodeSingularInt32Field(value: &_storage._forTypeURL) }()
-        case 361: try { try decoder.decodeSingularInt32Field(value: &_storage._forwardParser) }()
-        case 362: try { try decoder.decodeSingularInt32Field(value: &_storage._forWritingInto) }()
-        case 363: try { try decoder.decodeSingularInt32Field(value: &_storage._from) }()
-        case 364: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii2) }()
-        case 365: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii4) }()
-        case 366: try { try decoder.decodeSingularInt32Field(value: &_storage._fromByteOffset) }()
-        case 367: try { try decoder.decodeSingularInt32Field(value: &_storage._fromHexDigit) }()
-        case 368: try { try decoder.decodeSingularInt32Field(value: &_storage._fullName) }()
-        case 369: try { try decoder.decodeSingularInt32Field(value: &_storage._func) }()
-        case 370: try { try decoder.decodeSingularInt32Field(value: &_storage._function) }()
-        case 371: try { try decoder.decodeSingularInt32Field(value: &_storage._g) }()
-        case 372: try { try decoder.decodeSingularInt32Field(value: &_storage._generatedCodeInfo) }()
-        case 373: try { try decoder.decodeSingularInt32Field(value: &_storage._get) }()
-        case 374: try { try decoder.decodeSingularInt32Field(value: &_storage._getExtensionValue) }()
-        case 375: try { try decoder.decodeSingularInt32Field(value: &_storage._googleapis) }()
-        case 376: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufAny) }()
-        case 377: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufApi) }()
-        case 378: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBoolValue) }()
-        case 379: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBytesValue) }()
-        case 380: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDescriptorProto) }()
-        case 381: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDoubleValue) }()
-        case 382: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDuration) }()
-        case 383: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEdition) }()
-        case 384: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEmpty) }()
-        case 385: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnum) }()
-        case 386: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumDescriptorProto) }()
-        case 387: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumOptions) }()
-        case 388: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValue) }()
-        case 389: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueDescriptorProto) }()
-        case 390: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueOptions) }()
-        case 391: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufExtensionRangeOptions) }()
-        case 392: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSet) }()
-        case 393: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSetDefaults) }()
-        case 394: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufField) }()
-        case 395: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldDescriptorProto) }()
-        case 396: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldMask) }()
-        case 397: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldOptions) }()
-        case 398: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorProto) }()
-        case 399: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorSet) }()
-        case 400: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileOptions) }()
-        case 401: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFloatValue) }()
-        case 402: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufGeneratedCodeInfo) }()
-        case 403: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt32Value) }()
-        case 404: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt64Value) }()
-        case 405: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufListValue) }()
-        case 406: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMessageOptions) }()
-        case 407: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethod) }()
-        case 408: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodDescriptorProto) }()
-        case 409: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodOptions) }()
-        case 410: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMixin) }()
-        case 411: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufNullValue) }()
-        case 412: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofDescriptorProto) }()
-        case 413: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofOptions) }()
-        case 414: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOption) }()
-        case 415: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceDescriptorProto) }()
-        case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceOptions) }()
-        case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceCodeInfo) }()
-        case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceContext) }()
-        case 419: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStringValue) }()
-        case 420: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStruct) }()
-        case 421: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSyntax) }()
-        case 422: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufTimestamp) }()
-        case 423: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufType) }()
-        case 424: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint32Value) }()
-        case 425: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint64Value) }()
-        case 426: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUninterpretedOption) }()
-        case 427: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufValue) }()
-        case 428: try { try decoder.decodeSingularInt32Field(value: &_storage._goPackage) }()
-        case 429: try { try decoder.decodeSingularInt32Field(value: &_storage._group) }()
-        case 430: try { try decoder.decodeSingularInt32Field(value: &_storage._groupFieldNumberStack) }()
-        case 431: try { try decoder.decodeSingularInt32Field(value: &_storage._groupSize) }()
-        case 432: try { try decoder.decodeSingularInt32Field(value: &_storage._guard) }()
-        case 433: try { try decoder.decodeSingularInt32Field(value: &_storage._hadOneofValue) }()
-        case 434: try { try decoder.decodeSingularInt32Field(value: &_storage._handleConflictingOneOf) }()
-        case 435: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAggregateValue_p) }()
-        case 436: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAllowAlias_p) }()
-        case 437: try { try decoder.decodeSingularInt32Field(value: &_storage._hasBegin_p) }()
-        case 438: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcEnableArenas_p) }()
-        case 439: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcGenericServices_p) }()
-        case 440: try { try decoder.decodeSingularInt32Field(value: &_storage._hasClientStreaming_p) }()
-        case 441: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCsharpNamespace_p) }()
-        case 442: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCtype_p) }()
-        case 443: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDebugRedact_p) }()
-        case 444: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDefaultValue_p) }()
-        case 445: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecated_p) }()
-        case 446: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecatedLegacyJsonFieldConflicts_p) }()
-        case 447: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecationWarning_p) }()
-        case 448: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDoubleValue_p) }()
-        case 449: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEdition_p) }()
-        case 450: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionDeprecated_p) }()
-        case 451: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionIntroduced_p) }()
-        case 452: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionRemoved_p) }()
-        case 453: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnd_p) }()
-        case 454: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnumType_p) }()
-        case 455: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtendee_p) }()
-        case 456: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtensionValue_p) }()
-        case 457: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatures_p) }()
-        case 458: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatureSupport_p) }()
-        case 459: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFieldPresence_p) }()
-        case 460: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFixedFeatures_p) }()
-        case 461: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFullName_p) }()
-        case 462: try { try decoder.decodeSingularInt32Field(value: &_storage._hasGoPackage_p) }()
-        case 463: try { try decoder.decodeSingularInt32Field(value: &_storage._hash) }()
-        case 464: try { try decoder.decodeSingularInt32Field(value: &_storage._hashable) }()
-        case 465: try { try decoder.decodeSingularInt32Field(value: &_storage._hasher) }()
-        case 466: try { try decoder.decodeSingularInt32Field(value: &_storage._hashVisitor) }()
-        case 467: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdempotencyLevel_p) }()
-        case 468: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdentifierValue_p) }()
-        case 469: try { try decoder.decodeSingularInt32Field(value: &_storage._hasInputType_p) }()
-        case 470: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIsExtension_p) }()
-        case 471: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenerateEqualsAndHash_p) }()
-        case 472: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenericServices_p) }()
-        case 473: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaMultipleFiles_p) }()
-        case 474: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaOuterClassname_p) }()
-        case 475: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaPackage_p) }()
-        case 476: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaStringCheckUtf8_p) }()
-        case 477: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonFormat_p) }()
-        case 478: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonName_p) }()
-        case 479: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJstype_p) }()
-        case 480: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLabel_p) }()
-        case 481: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLazy_p) }()
-        case 482: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLeadingComments_p) }()
-        case 483: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMapEntry_p) }()
-        case 484: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMaximumEdition_p) }()
-        case 485: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageEncoding_p) }()
-        case 486: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageSetWireFormat_p) }()
-        case 487: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMinimumEdition_p) }()
-        case 488: try { try decoder.decodeSingularInt32Field(value: &_storage._hasName_p) }()
-        case 489: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNamePart_p) }()
-        case 490: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNegativeIntValue_p) }()
-        case 491: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNoStandardDescriptorAccessor_p) }()
-        case 492: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNumber_p) }()
-        case 493: try { try decoder.decodeSingularInt32Field(value: &_storage._hasObjcClassPrefix_p) }()
-        case 494: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOneofIndex_p) }()
-        case 495: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptimizeFor_p) }()
-        case 496: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptions_p) }()
-        case 497: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOutputType_p) }()
-        case 498: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOverridableFeatures_p) }()
-        case 499: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPackage_p) }()
-        case 500: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPacked_p) }()
-        case 501: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpClassPrefix_p) }()
-        case 502: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpMetadataNamespace_p) }()
-        case 503: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpNamespace_p) }()
-        case 504: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPositiveIntValue_p) }()
-        case 505: try { try decoder.decodeSingularInt32Field(value: &_storage._hasProto3Optional_p) }()
-        case 506: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPyGenericServices_p) }()
-        case 507: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeated_p) }()
-        case 508: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeatedFieldEncoding_p) }()
-        case 509: try { try decoder.decodeSingularInt32Field(value: &_storage._hasReserved_p) }()
-        case 510: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRetention_p) }()
-        case 511: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRubyPackage_p) }()
-        case 512: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSemantic_p) }()
-        case 513: try { try decoder.decodeSingularInt32Field(value: &_storage._hasServerStreaming_p) }()
-        case 514: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceCodeInfo_p) }()
-        case 515: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceContext_p) }()
-        case 516: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceFile_p) }()
-        case 517: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStart_p) }()
-        case 518: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStringValue_p) }()
-        case 519: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSwiftPrefix_p) }()
-        case 520: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSyntax_p) }()
-        case 521: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTrailingComments_p) }()
-        case 522: try { try decoder.decodeSingularInt32Field(value: &_storage._hasType_p) }()
-        case 523: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTypeName_p) }()
-        case 524: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUnverifiedLazy_p) }()
-        case 525: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUtf8Validation_p) }()
-        case 526: try { try decoder.decodeSingularInt32Field(value: &_storage._hasValue_p) }()
-        case 527: try { try decoder.decodeSingularInt32Field(value: &_storage._hasVerification_p) }()
-        case 528: try { try decoder.decodeSingularInt32Field(value: &_storage._hasWeak_p) }()
-        case 529: try { try decoder.decodeSingularInt32Field(value: &_storage._hour) }()
-        case 530: try { try decoder.decodeSingularInt32Field(value: &_storage._i) }()
-        case 531: try { try decoder.decodeSingularInt32Field(value: &_storage._idempotencyLevel) }()
-        case 532: try { try decoder.decodeSingularInt32Field(value: &_storage._identifierValue) }()
-        case 533: try { try decoder.decodeSingularInt32Field(value: &_storage._if) }()
-        case 534: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownExtensionFields) }()
-        case 535: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownFields) }()
-        case 536: try { try decoder.decodeSingularInt32Field(value: &_storage._index) }()
-        case 537: try { try decoder.decodeSingularInt32Field(value: &_storage._init_p) }()
-        case 538: try { try decoder.decodeSingularInt32Field(value: &_storage._inout) }()
-        case 539: try { try decoder.decodeSingularInt32Field(value: &_storage._inputType) }()
-        case 540: try { try decoder.decodeSingularInt32Field(value: &_storage._insert) }()
-        case 541: try { try decoder.decodeSingularInt32Field(value: &_storage._int) }()
-        case 542: try { try decoder.decodeSingularInt32Field(value: &_storage._int32) }()
-        case 543: try { try decoder.decodeSingularInt32Field(value: &_storage._int32Value) }()
-        case 544: try { try decoder.decodeSingularInt32Field(value: &_storage._int64) }()
-        case 545: try { try decoder.decodeSingularInt32Field(value: &_storage._int64Value) }()
-        case 546: try { try decoder.decodeSingularInt32Field(value: &_storage._int8) }()
-        case 547: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteral) }()
-        case 548: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteralType) }()
-        case 549: try { try decoder.decodeSingularInt32Field(value: &_storage._intern) }()
-        case 550: try { try decoder.decodeSingularInt32Field(value: &_storage._internal) }()
-        case 551: try { try decoder.decodeSingularInt32Field(value: &_storage._internalState) }()
-        case 552: try { try decoder.decodeSingularInt32Field(value: &_storage._intersect) }()
-        case 553: try { try decoder.decodeSingularInt32Field(value: &_storage._into) }()
-        case 554: try { try decoder.decodeSingularInt32Field(value: &_storage._ints) }()
-        case 555: try { try decoder.decodeSingularInt32Field(value: &_storage._isA) }()
-        case 556: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqual) }()
-        case 557: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqualTo) }()
-        case 558: try { try decoder.decodeSingularInt32Field(value: &_storage._isExtension) }()
-        case 559: try { try decoder.decodeSingularInt32Field(value: &_storage._isInitialized_p) }()
-        case 560: try { try decoder.decodeSingularInt32Field(value: &_storage._isNegative) }()
-        case 561: try { try decoder.decodeSingularInt32Field(value: &_storage._isPathValid) }()
-        case 562: try { try decoder.decodeSingularInt32Field(value: &_storage._isValid) }()
-        case 563: try { try decoder.decodeSingularInt32Field(value: &_storage._itemTagsEncodedSize) }()
-        case 564: try { try decoder.decodeSingularInt32Field(value: &_storage._iterator) }()
-        case 565: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenerateEqualsAndHash) }()
-        case 566: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenericServices) }()
-        case 567: try { try decoder.decodeSingularInt32Field(value: &_storage._javaMultipleFiles) }()
-        case 568: try { try decoder.decodeSingularInt32Field(value: &_storage._javaOuterClassname) }()
-        case 569: try { try decoder.decodeSingularInt32Field(value: &_storage._javaPackage) }()
-        case 570: try { try decoder.decodeSingularInt32Field(value: &_storage._javaStringCheckUtf8) }()
-        case 571: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoder) }()
-        case 572: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingError) }()
-        case 573: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingOptions) }()
-        case 574: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonEncoder) }()
-        case 575: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingError) }()
-        case 576: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingOptions) }()
-        case 577: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingVisitor) }()
-        case 578: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonFormat) }()
-        case 579: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonmapEncodingVisitor) }()
-        case 580: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonName) }()
-        case 581: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPath) }()
-        case 582: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPaths) }()
-        case 583: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonscanner) }()
-        case 584: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonString) }()
-        case 585: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonText) }()
-        case 586: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Bytes) }()
-        case 587: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Data) }()
-        case 588: try { try decoder.decodeSingularInt32Field(value: &_storage._jstype) }()
-        case 589: try { try decoder.decodeSingularInt32Field(value: &_storage._k) }()
-        case 590: try { try decoder.decodeSingularInt32Field(value: &_storage._kChunkSize) }()
-        case 591: try { try decoder.decodeSingularInt32Field(value: &_storage._key) }()
-        case 592: try { try decoder.decodeSingularInt32Field(value: &_storage._keyField) }()
-        case 593: try { try decoder.decodeSingularInt32Field(value: &_storage._keyFieldOpt) }()
-        case 594: try { try decoder.decodeSingularInt32Field(value: &_storage._keyType) }()
-        case 595: try { try decoder.decodeSingularInt32Field(value: &_storage._kind) }()
-        case 596: try { try decoder.decodeSingularInt32Field(value: &_storage._l) }()
-        case 597: try { try decoder.decodeSingularInt32Field(value: &_storage._label) }()
-        case 598: try { try decoder.decodeSingularInt32Field(value: &_storage._lazy) }()
-        case 599: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingComments) }()
-        case 600: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingDetachedComments) }()
-        case 601: try { try decoder.decodeSingularInt32Field(value: &_storage._length) }()
-        case 602: try { try decoder.decodeSingularInt32Field(value: &_storage._lessThan) }()
-        case 603: try { try decoder.decodeSingularInt32Field(value: &_storage._let) }()
-        case 604: try { try decoder.decodeSingularInt32Field(value: &_storage._lhs) }()
-        case 605: try { try decoder.decodeSingularInt32Field(value: &_storage._line) }()
-        case 606: try { try decoder.decodeSingularInt32Field(value: &_storage._list) }()
-        case 607: try { try decoder.decodeSingularInt32Field(value: &_storage._listOfMessages) }()
-        case 608: try { try decoder.decodeSingularInt32Field(value: &_storage._listValue) }()
-        case 609: try { try decoder.decodeSingularInt32Field(value: &_storage._littleEndian) }()
-        case 610: try { try decoder.decodeSingularInt32Field(value: &_storage._load) }()
-        case 611: try { try decoder.decodeSingularInt32Field(value: &_storage._localHasher) }()
-        case 612: try { try decoder.decodeSingularInt32Field(value: &_storage._location) }()
-        case 613: try { try decoder.decodeSingularInt32Field(value: &_storage._m) }()
-        case 614: try { try decoder.decodeSingularInt32Field(value: &_storage._major) }()
-        case 615: try { try decoder.decodeSingularInt32Field(value: &_storage._makeAsyncIterator) }()
-        case 616: try { try decoder.decodeSingularInt32Field(value: &_storage._makeIterator) }()
-        case 617: try { try decoder.decodeSingularInt32Field(value: &_storage._malformedLength) }()
-        case 618: try { try decoder.decodeSingularInt32Field(value: &_storage._mapEntry) }()
-        case 619: try { try decoder.decodeSingularInt32Field(value: &_storage._mapKeyType) }()
-        case 620: try { try decoder.decodeSingularInt32Field(value: &_storage._mapToMessages) }()
-        case 621: try { try decoder.decodeSingularInt32Field(value: &_storage._mapValueType) }()
-        case 622: try { try decoder.decodeSingularInt32Field(value: &_storage._mapVisitor) }()
-        case 623: try { try decoder.decodeSingularInt32Field(value: &_storage._mask) }()
-        case 624: try { try decoder.decodeSingularInt32Field(value: &_storage._maximumEdition) }()
-        case 625: try { try decoder.decodeSingularInt32Field(value: &_storage._mdayStart) }()
-        case 626: try { try decoder.decodeSingularInt32Field(value: &_storage._merge) }()
-        case 627: try { try decoder.decodeSingularInt32Field(value: &_storage._mergeOptions) }()
-        case 628: try { try decoder.decodeSingularInt32Field(value: &_storage._message) }()
-        case 629: try { try decoder.decodeSingularInt32Field(value: &_storage._messageDepthLimit) }()
-        case 630: try { try decoder.decodeSingularInt32Field(value: &_storage._messageEncoding) }()
-        case 631: try { try decoder.decodeSingularInt32Field(value: &_storage._messageExtension) }()
-        case 632: try { try decoder.decodeSingularInt32Field(value: &_storage._messageImplementationBase) }()
-        case 633: try { try decoder.decodeSingularInt32Field(value: &_storage._messageOptions) }()
-        case 634: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSet) }()
-        case 635: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSetWireFormat) }()
-        case 636: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSize) }()
-        case 637: try { try decoder.decodeSingularInt32Field(value: &_storage._messageType) }()
-        case 638: try { try decoder.decodeSingularInt32Field(value: &_storage._method) }()
-        case 639: try { try decoder.decodeSingularInt32Field(value: &_storage._methodDescriptorProto) }()
-        case 640: try { try decoder.decodeSingularInt32Field(value: &_storage._methodOptions) }()
-        case 641: try { try decoder.decodeSingularInt32Field(value: &_storage._methods) }()
-        case 642: try { try decoder.decodeSingularInt32Field(value: &_storage._min) }()
-        case 643: try { try decoder.decodeSingularInt32Field(value: &_storage._minimumEdition) }()
-        case 644: try { try decoder.decodeSingularInt32Field(value: &_storage._minor) }()
-        case 645: try { try decoder.decodeSingularInt32Field(value: &_storage._mixin) }()
-        case 646: try { try decoder.decodeSingularInt32Field(value: &_storage._mixins) }()
-        case 647: try { try decoder.decodeSingularInt32Field(value: &_storage._modify) }()
-        case 648: try { try decoder.decodeSingularInt32Field(value: &_storage._month) }()
-        case 649: try { try decoder.decodeSingularInt32Field(value: &_storage._msgExtension) }()
-        case 650: try { try decoder.decodeSingularInt32Field(value: &_storage._mutating) }()
-        case 651: try { try decoder.decodeSingularInt32Field(value: &_storage._n) }()
-        case 652: try { try decoder.decodeSingularInt32Field(value: &_storage._name) }()
-        case 653: try { try decoder.decodeSingularInt32Field(value: &_storage._nameDescription) }()
-        case 654: try { try decoder.decodeSingularInt32Field(value: &_storage._nameMap) }()
-        case 655: try { try decoder.decodeSingularInt32Field(value: &_storage._namePart) }()
-        case 656: try { try decoder.decodeSingularInt32Field(value: &_storage._names) }()
-        case 657: try { try decoder.decodeSingularInt32Field(value: &_storage._nanos) }()
-        case 658: try { try decoder.decodeSingularInt32Field(value: &_storage._negativeIntValue) }()
-        case 659: try { try decoder.decodeSingularInt32Field(value: &_storage._nestedType) }()
-        case 660: try { try decoder.decodeSingularInt32Field(value: &_storage._newExtensible) }()
-        case 661: try { try decoder.decodeSingularInt32Field(value: &_storage._newL) }()
-        case 662: try { try decoder.decodeSingularInt32Field(value: &_storage._newList) }()
-        case 663: try { try decoder.decodeSingularInt32Field(value: &_storage._newMessage) }()
-        case 664: try { try decoder.decodeSingularInt32Field(value: &_storage._newValue) }()
-        case 665: try { try decoder.decodeSingularInt32Field(value: &_storage._next) }()
-        case 666: try { try decoder.decodeSingularInt32Field(value: &_storage._nextByte) }()
-        case 667: try { try decoder.decodeSingularInt32Field(value: &_storage._nextFieldNumber) }()
-        case 668: try { try decoder.decodeSingularInt32Field(value: &_storage._nextVarInt) }()
-        case 669: try { try decoder.decodeSingularInt32Field(value: &_storage._nil) }()
-        case 670: try { try decoder.decodeSingularInt32Field(value: &_storage._nilLiteral) }()
-        case 671: try { try decoder.decodeSingularInt32Field(value: &_storage._noBytesAvailable) }()
-        case 672: try { try decoder.decodeSingularInt32Field(value: &_storage._noStandardDescriptorAccessor) }()
-        case 673: try { try decoder.decodeSingularInt32Field(value: &_storage._nullValue) }()
-        case 674: try { try decoder.decodeSingularInt32Field(value: &_storage._number) }()
-        case 675: try { try decoder.decodeSingularInt32Field(value: &_storage._numberValue) }()
-        case 676: try { try decoder.decodeSingularInt32Field(value: &_storage._objcClassPrefix) }()
-        case 677: try { try decoder.decodeSingularInt32Field(value: &_storage._of) }()
-        case 678: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDecl) }()
-        case 679: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDescriptorProto) }()
-        case 680: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofIndex) }()
-        case 681: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofOptions) }()
-        case 682: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofs) }()
-        case 683: try { try decoder.decodeSingularInt32Field(value: &_storage._oneOfKind) }()
-        case 684: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeFor) }()
-        case 685: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeMode) }()
-        case 686: try { try decoder.decodeSingularInt32Field(value: &_storage._option) }()
-        case 687: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalEnumExtensionField) }()
-        case 688: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalExtensionField) }()
-        case 689: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalGroupExtensionField) }()
-        case 690: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalMessageExtensionField) }()
-        case 691: try { try decoder.decodeSingularInt32Field(value: &_storage._optionRetention) }()
-        case 692: try { try decoder.decodeSingularInt32Field(value: &_storage._options) }()
-        case 693: try { try decoder.decodeSingularInt32Field(value: &_storage._optionTargetType) }()
-        case 694: try { try decoder.decodeSingularInt32Field(value: &_storage._other) }()
-        case 695: try { try decoder.decodeSingularInt32Field(value: &_storage._others) }()
-        case 696: try { try decoder.decodeSingularInt32Field(value: &_storage._out) }()
-        case 697: try { try decoder.decodeSingularInt32Field(value: &_storage._outputType) }()
-        case 698: try { try decoder.decodeSingularInt32Field(value: &_storage._overridableFeatures) }()
-        case 699: try { try decoder.decodeSingularInt32Field(value: &_storage._p) }()
-        case 700: try { try decoder.decodeSingularInt32Field(value: &_storage._package) }()
-        case 701: try { try decoder.decodeSingularInt32Field(value: &_storage._packed) }()
-        case 702: try { try decoder.decodeSingularInt32Field(value: &_storage._packedEnumExtensionField) }()
-        case 703: try { try decoder.decodeSingularInt32Field(value: &_storage._packedExtensionField) }()
-        case 704: try { try decoder.decodeSingularInt32Field(value: &_storage._padding) }()
-        case 705: try { try decoder.decodeSingularInt32Field(value: &_storage._parent) }()
-        case 706: try { try decoder.decodeSingularInt32Field(value: &_storage._parse) }()
-        case 707: try { try decoder.decodeSingularInt32Field(value: &_storage._partial) }()
-        case 708: try { try decoder.decodeSingularInt32Field(value: &_storage._path) }()
-        case 709: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecoder) }()
-        case 710: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecodingError) }()
-        case 711: try { try decoder.decodeSingularInt32Field(value: &_storage._paths) }()
-        case 712: try { try decoder.decodeSingularInt32Field(value: &_storage._pathVisitor) }()
-        case 713: try { try decoder.decodeSingularInt32Field(value: &_storage._payload) }()
-        case 714: try { try decoder.decodeSingularInt32Field(value: &_storage._payloadSize) }()
-        case 715: try { try decoder.decodeSingularInt32Field(value: &_storage._phpClassPrefix) }()
-        case 716: try { try decoder.decodeSingularInt32Field(value: &_storage._phpMetadataNamespace) }()
-        case 717: try { try decoder.decodeSingularInt32Field(value: &_storage._phpNamespace) }()
-        case 718: try { try decoder.decodeSingularInt32Field(value: &_storage._pos) }()
-        case 719: try { try decoder.decodeSingularInt32Field(value: &_storage._positiveIntValue) }()
-        case 720: try { try decoder.decodeSingularInt32Field(value: &_storage._prefix) }()
-        case 721: try { try decoder.decodeSingularInt32Field(value: &_storage._preserveProtoFieldNames) }()
-        case 722: try { try decoder.decodeSingularInt32Field(value: &_storage._preTraverse) }()
-        case 723: try { try decoder.decodeSingularInt32Field(value: &_storage._prevPath) }()
-        case 724: try { try decoder.decodeSingularInt32Field(value: &_storage._printUnknownFields) }()
-        case 725: try { try decoder.decodeSingularInt32Field(value: &_storage._proto2) }()
-        case 726: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3DefaultValue) }()
-        case 727: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3Optional) }()
-        case 728: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversionCheck) }()
-        case 729: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversion2) }()
-        case 730: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBool) }()
-        case 731: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBytes) }()
-        case 732: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufDouble) }()
-        case 733: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufEnumMap) }()
-        case 734: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtension) }()
-        case 735: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed32) }()
-        case 736: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed64) }()
-        case 737: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFloat) }()
-        case 738: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt32) }()
-        case 739: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt64) }()
-        case 740: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMap) }()
-        case 741: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMessageMap) }()
-        case 742: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed32) }()
-        case 743: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed64) }()
-        case 744: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint32) }()
-        case 745: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint64) }()
-        case 746: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufString) }()
-        case 747: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint32) }()
-        case 748: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint64) }()
-        case 749: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtensionFieldValues) }()
-        case 750: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFieldNumber) }()
-        case 751: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufGeneratedIsEqualTo) }()
-        case 752: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNameMap) }()
-        case 753: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNewField) }()
-        case 754: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufPackage) }()
-        case 755: try { try decoder.decodeSingularInt32Field(value: &_storage._protocol) }()
-        case 756: try { try decoder.decodeSingularInt32Field(value: &_storage._protoFieldName) }()
-        case 757: try { try decoder.decodeSingularInt32Field(value: &_storage._protoMessageName) }()
-        case 758: try { try decoder.decodeSingularInt32Field(value: &_storage._protoNameProviding) }()
-        case 759: try { try decoder.decodeSingularInt32Field(value: &_storage._protoPaths) }()
-        case 760: try { try decoder.decodeSingularInt32Field(value: &_storage._public) }()
-        case 761: try { try decoder.decodeSingularInt32Field(value: &_storage._publicDependency) }()
-        case 762: try { try decoder.decodeSingularInt32Field(value: &_storage._putBoolValue) }()
-        case 763: try { try decoder.decodeSingularInt32Field(value: &_storage._putBytesValue) }()
-        case 764: try { try decoder.decodeSingularInt32Field(value: &_storage._putDoubleValue) }()
-        case 765: try { try decoder.decodeSingularInt32Field(value: &_storage._putEnumValue) }()
-        case 766: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint32) }()
-        case 767: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint64) }()
-        case 768: try { try decoder.decodeSingularInt32Field(value: &_storage._putFloatValue) }()
-        case 769: try { try decoder.decodeSingularInt32Field(value: &_storage._putInt64) }()
-        case 770: try { try decoder.decodeSingularInt32Field(value: &_storage._putStringValue) }()
-        case 771: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64) }()
-        case 772: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64Hex) }()
-        case 773: try { try decoder.decodeSingularInt32Field(value: &_storage._putVarInt) }()
-        case 774: try { try decoder.decodeSingularInt32Field(value: &_storage._putZigZagVarInt) }()
-        case 775: try { try decoder.decodeSingularInt32Field(value: &_storage._pyGenericServices) }()
-        case 776: try { try decoder.decodeSingularInt32Field(value: &_storage._r) }()
-        case 777: try { try decoder.decodeSingularInt32Field(value: &_storage._rawChars) }()
-        case 778: try { try decoder.decodeSingularInt32Field(value: &_storage._rawRepresentable) }()
-        case 779: try { try decoder.decodeSingularInt32Field(value: &_storage._rawValue) }()
-        case 780: try { try decoder.decodeSingularInt32Field(value: &_storage._read4HexDigits) }()
-        case 781: try { try decoder.decodeSingularInt32Field(value: &_storage._readBytes) }()
-        case 782: try { try decoder.decodeSingularInt32Field(value: &_storage._register) }()
-        case 783: try { try decoder.decodeSingularInt32Field(value: &_storage._removingAllFieldsOf) }()
-        case 784: try { try decoder.decodeSingularInt32Field(value: &_storage._repeated) }()
-        case 785: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedEnumExtensionField) }()
-        case 786: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedExtensionField) }()
-        case 787: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedFieldEncoding) }()
-        case 788: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedGroupExtensionField) }()
-        case 789: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedMessageExtensionField) }()
-        case 790: try { try decoder.decodeSingularInt32Field(value: &_storage._repeating) }()
-        case 791: try { try decoder.decodeSingularInt32Field(value: &_storage._replaceRepeatedFields) }()
-        case 792: try { try decoder.decodeSingularInt32Field(value: &_storage._requestStreaming) }()
-        case 793: try { try decoder.decodeSingularInt32Field(value: &_storage._requestTypeURL) }()
-        case 794: try { try decoder.decodeSingularInt32Field(value: &_storage._requiredSize) }()
-        case 795: try { try decoder.decodeSingularInt32Field(value: &_storage._responseStreaming) }()
-        case 796: try { try decoder.decodeSingularInt32Field(value: &_storage._responseTypeURL) }()
-        case 797: try { try decoder.decodeSingularInt32Field(value: &_storage._result) }()
-        case 798: try { try decoder.decodeSingularInt32Field(value: &_storage._retention) }()
-        case 799: try { try decoder.decodeSingularInt32Field(value: &_storage._rethrows) }()
-        case 800: try { try decoder.decodeSingularInt32Field(value: &_storage._return) }()
-        case 801: try { try decoder.decodeSingularInt32Field(value: &_storage._returnType) }()
-        case 802: try { try decoder.decodeSingularInt32Field(value: &_storage._revision) }()
-        case 803: try { try decoder.decodeSingularInt32Field(value: &_storage._rhs) }()
-        case 804: try { try decoder.decodeSingularInt32Field(value: &_storage._root) }()
-        case 805: try { try decoder.decodeSingularInt32Field(value: &_storage._rubyPackage) }()
-        case 806: try { try decoder.decodeSingularInt32Field(value: &_storage._s) }()
-        case 807: try { try decoder.decodeSingularInt32Field(value: &_storage._sawBackslash) }()
-        case 808: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection4Characters) }()
-        case 809: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection5Characters) }()
-        case 810: try { try decoder.decodeSingularInt32Field(value: &_storage._scan) }()
-        case 811: try { try decoder.decodeSingularInt32Field(value: &_storage._scanner) }()
-        case 812: try { try decoder.decodeSingularInt32Field(value: &_storage._seconds) }()
-        case 813: try { try decoder.decodeSingularInt32Field(value: &_storage._self_p) }()
-        case 814: try { try decoder.decodeSingularInt32Field(value: &_storage._semantic) }()
-        case 815: try { try decoder.decodeSingularInt32Field(value: &_storage._sendable) }()
-        case 816: try { try decoder.decodeSingularInt32Field(value: &_storage._separator) }()
-        case 817: try { try decoder.decodeSingularInt32Field(value: &_storage._serialize) }()
-        case 818: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedBytes) }()
-        case 819: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedData) }()
-        case 820: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedSize) }()
-        case 821: try { try decoder.decodeSingularInt32Field(value: &_storage._serverStreaming) }()
-        case 822: try { try decoder.decodeSingularInt32Field(value: &_storage._service) }()
-        case 823: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceDescriptorProto) }()
-        case 824: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceOptions) }()
-        case 825: try { try decoder.decodeSingularInt32Field(value: &_storage._set) }()
-        case 826: try { try decoder.decodeSingularInt32Field(value: &_storage._setExtensionValue) }()
-        case 827: try { try decoder.decodeSingularInt32Field(value: &_storage._shift) }()
-        case 828: try { try decoder.decodeSingularInt32Field(value: &_storage._simpleExtensionMap) }()
-        case 829: try { try decoder.decodeSingularInt32Field(value: &_storage._size) }()
-        case 830: try { try decoder.decodeSingularInt32Field(value: &_storage._sizer) }()
-        case 831: try { try decoder.decodeSingularInt32Field(value: &_storage._source) }()
-        case 832: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceCodeInfo) }()
-        case 833: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceContext) }()
-        case 834: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceEncoding) }()
-        case 835: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceFile) }()
-        case 836: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceLocation) }()
-        case 837: try { try decoder.decodeSingularInt32Field(value: &_storage._span) }()
-        case 838: try { try decoder.decodeSingularInt32Field(value: &_storage._split) }()
-        case 839: try { try decoder.decodeSingularInt32Field(value: &_storage._start) }()
-        case 840: try { try decoder.decodeSingularInt32Field(value: &_storage._startArray) }()
-        case 841: try { try decoder.decodeSingularInt32Field(value: &_storage._startArrayObject) }()
-        case 842: try { try decoder.decodeSingularInt32Field(value: &_storage._startField) }()
-        case 843: try { try decoder.decodeSingularInt32Field(value: &_storage._startIndex) }()
-        case 844: try { try decoder.decodeSingularInt32Field(value: &_storage._startMessageField) }()
-        case 845: try { try decoder.decodeSingularInt32Field(value: &_storage._startObject) }()
-        case 846: try { try decoder.decodeSingularInt32Field(value: &_storage._startRegularField) }()
-        case 847: try { try decoder.decodeSingularInt32Field(value: &_storage._state) }()
-        case 848: try { try decoder.decodeSingularInt32Field(value: &_storage._static) }()
-        case 849: try { try decoder.decodeSingularInt32Field(value: &_storage._staticString) }()
-        case 850: try { try decoder.decodeSingularInt32Field(value: &_storage._storage) }()
-        case 851: try { try decoder.decodeSingularInt32Field(value: &_storage._string) }()
-        case 852: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteral) }()
-        case 853: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteralType) }()
-        case 854: try { try decoder.decodeSingularInt32Field(value: &_storage._stringResult) }()
-        case 855: try { try decoder.decodeSingularInt32Field(value: &_storage._stringValue) }()
-        case 856: try { try decoder.decodeSingularInt32Field(value: &_storage._struct) }()
-        case 857: try { try decoder.decodeSingularInt32Field(value: &_storage._structValue) }()
-        case 858: try { try decoder.decodeSingularInt32Field(value: &_storage._subDecoder) }()
-        case 859: try { try decoder.decodeSingularInt32Field(value: &_storage._subscript) }()
-        case 860: try { try decoder.decodeSingularInt32Field(value: &_storage._subtract) }()
-        case 861: try { try decoder.decodeSingularInt32Field(value: &_storage._subVisitor) }()
-        case 862: try { try decoder.decodeSingularInt32Field(value: &_storage._swift) }()
-        case 863: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftPrefix) }()
-        case 864: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufContiguousBytes) }()
-        case 865: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufError) }()
-        case 866: try { try decoder.decodeSingularInt32Field(value: &_storage._syntax) }()
-        case 867: try { try decoder.decodeSingularInt32Field(value: &_storage._t) }()
-        case 868: try { try decoder.decodeSingularInt32Field(value: &_storage._tag) }()
-        case 869: try { try decoder.decodeSingularInt32Field(value: &_storage._targets) }()
-        case 870: try { try decoder.decodeSingularInt32Field(value: &_storage._terminator) }()
-        case 871: try { try decoder.decodeSingularInt32Field(value: &_storage._testDecoder) }()
-        case 872: try { try decoder.decodeSingularInt32Field(value: &_storage._text) }()
-        case 873: try { try decoder.decodeSingularInt32Field(value: &_storage._textDecoder) }()
-        case 874: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecoder) }()
-        case 875: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingError) }()
-        case 876: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingOptions) }()
-        case 877: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingOptions) }()
-        case 878: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingVisitor) }()
-        case 879: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatString) }()
-        case 880: try { try decoder.decodeSingularInt32Field(value: &_storage._throwOrIgnore) }()
-        case 881: try { try decoder.decodeSingularInt32Field(value: &_storage._throws) }()
-        case 882: try { try decoder.decodeSingularInt32Field(value: &_storage._timeInterval) }()
-        case 883: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSince1970) }()
-        case 884: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSinceReferenceDate) }()
-        case 885: try { try decoder.decodeSingularInt32Field(value: &_storage._timestamp) }()
-        case 886: try { try decoder.decodeSingularInt32Field(value: &_storage._tmp) }()
-        case 887: try { try decoder.decodeSingularInt32Field(value: &_storage._tooLarge) }()
-        case 888: try { try decoder.decodeSingularInt32Field(value: &_storage._total) }()
-        case 889: try { try decoder.decodeSingularInt32Field(value: &_storage._totalArrayDepth) }()
-        case 890: try { try decoder.decodeSingularInt32Field(value: &_storage._totalSize) }()
-        case 891: try { try decoder.decodeSingularInt32Field(value: &_storage._trailingComments) }()
-        case 892: try { try decoder.decodeSingularInt32Field(value: &_storage._traverse) }()
-        case 893: try { try decoder.decodeSingularInt32Field(value: &_storage._trim) }()
-        case 894: try { try decoder.decodeSingularInt32Field(value: &_storage._true) }()
-        case 895: try { try decoder.decodeSingularInt32Field(value: &_storage._try) }()
-        case 896: try { try decoder.decodeSingularInt32Field(value: &_storage._type) }()
-        case 897: try { try decoder.decodeSingularInt32Field(value: &_storage._typealias) }()
-        case 898: try { try decoder.decodeSingularInt32Field(value: &_storage._typeEnum) }()
-        case 899: try { try decoder.decodeSingularInt32Field(value: &_storage._typeName) }()
-        case 900: try { try decoder.decodeSingularInt32Field(value: &_storage._typePrefix) }()
-        case 901: try { try decoder.decodeSingularInt32Field(value: &_storage._typeStart) }()
-        case 902: try { try decoder.decodeSingularInt32Field(value: &_storage._typeUnknown) }()
-        case 903: try { try decoder.decodeSingularInt32Field(value: &_storage._typeURL) }()
-        case 904: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32) }()
-        case 905: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32Value) }()
-        case 906: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64) }()
-        case 907: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64Value) }()
-        case 908: try { try decoder.decodeSingularInt32Field(value: &_storage._uint8) }()
-        case 909: try { try decoder.decodeSingularInt32Field(value: &_storage._unchecked) }()
-        case 910: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteral) }()
-        case 911: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteralType) }()
-        case 912: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalars) }()
-        case 913: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarView) }()
-        case 914: try { try decoder.decodeSingularInt32Field(value: &_storage._uninterpretedOption) }()
-        case 915: try { try decoder.decodeSingularInt32Field(value: &_storage._union) }()
-        case 916: try { try decoder.decodeSingularInt32Field(value: &_storage._uniqueStorage) }()
-        case 917: try { try decoder.decodeSingularInt32Field(value: &_storage._unknown) }()
-        case 918: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownFields_p) }()
-        case 919: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownStorage) }()
-        case 920: try { try decoder.decodeSingularInt32Field(value: &_storage._unpackTo) }()
-        case 921: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeBufferPointer) }()
-        case 922: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutablePointer) }()
-        case 923: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutableRawBufferPointer) }()
-        case 924: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawBufferPointer) }()
-        case 925: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawPointer) }()
-        case 926: try { try decoder.decodeSingularInt32Field(value: &_storage._unverifiedLazy) }()
-        case 927: try { try decoder.decodeSingularInt32Field(value: &_storage._updatedOptions) }()
-        case 928: try { try decoder.decodeSingularInt32Field(value: &_storage._url) }()
-        case 929: try { try decoder.decodeSingularInt32Field(value: &_storage._useDeterministicOrdering) }()
-        case 930: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8) }()
-        case 931: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Ptr) }()
-        case 932: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8ToDouble) }()
-        case 933: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Validation) }()
-        case 934: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8View) }()
-        case 935: try { try decoder.decodeSingularInt32Field(value: &_storage._v) }()
-        case 936: try { try decoder.decodeSingularInt32Field(value: &_storage._value) }()
-        case 937: try { try decoder.decodeSingularInt32Field(value: &_storage._valueField) }()
-        case 938: try { try decoder.decodeSingularInt32Field(value: &_storage._values) }()
-        case 939: try { try decoder.decodeSingularInt32Field(value: &_storage._valueType) }()
-        case 940: try { try decoder.decodeSingularInt32Field(value: &_storage._var) }()
-        case 941: try { try decoder.decodeSingularInt32Field(value: &_storage._verification) }()
-        case 942: try { try decoder.decodeSingularInt32Field(value: &_storage._verificationState) }()
-        case 943: try { try decoder.decodeSingularInt32Field(value: &_storage._version) }()
-        case 944: try { try decoder.decodeSingularInt32Field(value: &_storage._versionString) }()
-        case 945: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFields) }()
-        case 946: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFieldsAsMessageSet) }()
-        case 947: try { try decoder.decodeSingularInt32Field(value: &_storage._visitMapField) }()
-        case 948: try { try decoder.decodeSingularInt32Field(value: &_storage._visitor) }()
-        case 949: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPacked) }()
-        case 950: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedBoolField) }()
-        case 951: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedDoubleField) }()
-        case 952: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedEnumField) }()
-        case 953: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed32Field) }()
-        case 954: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed64Field) }()
-        case 955: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFloatField) }()
-        case 956: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt32Field) }()
-        case 957: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt64Field) }()
-        case 958: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed32Field) }()
-        case 959: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed64Field) }()
-        case 960: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint32Field) }()
-        case 961: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint64Field) }()
-        case 962: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint32Field) }()
-        case 963: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint64Field) }()
-        case 964: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeated) }()
-        case 965: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBoolField) }()
-        case 966: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBytesField) }()
-        case 967: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedDoubleField) }()
-        case 968: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedEnumField) }()
-        case 969: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed32Field) }()
-        case 970: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed64Field) }()
-        case 971: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFloatField) }()
-        case 972: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedGroupField) }()
-        case 973: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt32Field) }()
-        case 974: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt64Field) }()
-        case 975: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedMessageField) }()
-        case 976: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed32Field) }()
-        case 977: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed64Field) }()
-        case 978: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint32Field) }()
-        case 979: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint64Field) }()
-        case 980: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedStringField) }()
-        case 981: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint32Field) }()
-        case 982: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint64Field) }()
-        case 983: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingular) }()
-        case 984: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBoolField) }()
-        case 985: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBytesField) }()
-        case 986: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularDoubleField) }()
-        case 987: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularEnumField) }()
-        case 988: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed32Field) }()
-        case 989: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed64Field) }()
-        case 990: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFloatField) }()
-        case 991: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularGroupField) }()
-        case 992: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt32Field) }()
-        case 993: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt64Field) }()
-        case 994: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularMessageField) }()
-        case 995: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed32Field) }()
-        case 996: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed64Field) }()
-        case 997: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint32Field) }()
-        case 998: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint64Field) }()
-        case 999: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularStringField) }()
-        case 1000: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint32Field) }()
-        case 1001: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint64Field) }()
-        case 1002: try { try decoder.decodeSingularInt32Field(value: &_storage._visitUnknown) }()
-        case 1003: try { try decoder.decodeSingularInt32Field(value: &_storage._wasDecoded) }()
-        case 1004: try { try decoder.decodeSingularInt32Field(value: &_storage._weak) }()
-        case 1005: try { try decoder.decodeSingularInt32Field(value: &_storage._weakDependency) }()
-        case 1006: try { try decoder.decodeSingularInt32Field(value: &_storage._where) }()
-        case 1007: try { try decoder.decodeSingularInt32Field(value: &_storage._wireFormat) }()
-        case 1008: try { try decoder.decodeSingularInt32Field(value: &_storage._with) }()
-        case 1009: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeBytes) }()
-        case 1010: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeMutableBytes) }()
-        case 1011: try { try decoder.decodeSingularInt32Field(value: &_storage._work) }()
-        case 1012: try { try decoder.decodeSingularInt32Field(value: &_storage._wrapped) }()
-        case 1013: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedType) }()
-        case 1014: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedValue) }()
-        case 1015: try { try decoder.decodeSingularInt32Field(value: &_storage._written) }()
-        case 1016: try { try decoder.decodeSingularInt32Field(value: &_storage._yday) }()
+        case 97: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnforceNamingStyle_p) }()
+        case 98: try { try decoder.decodeSingularInt32Field(value: &_storage._clearEnumType_p) }()
+        case 99: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtendee_p) }()
+        case 100: try { try decoder.decodeSingularInt32Field(value: &_storage._clearExtensionValue_p) }()
+        case 101: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatures_p) }()
+        case 102: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFeatureSupport_p) }()
+        case 103: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFieldPresence_p) }()
+        case 104: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFixedFeatures_p) }()
+        case 105: try { try decoder.decodeSingularInt32Field(value: &_storage._clearFullName_p) }()
+        case 106: try { try decoder.decodeSingularInt32Field(value: &_storage._clearGoPackage_p) }()
+        case 107: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdempotencyLevel_p) }()
+        case 108: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIdentifierValue_p) }()
+        case 109: try { try decoder.decodeSingularInt32Field(value: &_storage._clearInputType_p) }()
+        case 110: try { try decoder.decodeSingularInt32Field(value: &_storage._clearIsExtension_p) }()
+        case 111: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenerateEqualsAndHash_p) }()
+        case 112: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaGenericServices_p) }()
+        case 113: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaMultipleFiles_p) }()
+        case 114: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaOuterClassname_p) }()
+        case 115: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaPackage_p) }()
+        case 116: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJavaStringCheckUtf8_p) }()
+        case 117: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonFormat_p) }()
+        case 118: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJsonName_p) }()
+        case 119: try { try decoder.decodeSingularInt32Field(value: &_storage._clearJstype_p) }()
+        case 120: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLabel_p) }()
+        case 121: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLazy_p) }()
+        case 122: try { try decoder.decodeSingularInt32Field(value: &_storage._clearLeadingComments_p) }()
+        case 123: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMapEntry_p) }()
+        case 124: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMaximumEdition_p) }()
+        case 125: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageEncoding_p) }()
+        case 126: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMessageSetWireFormat_p) }()
+        case 127: try { try decoder.decodeSingularInt32Field(value: &_storage._clearMinimumEdition_p) }()
+        case 128: try { try decoder.decodeSingularInt32Field(value: &_storage._clearName_p) }()
+        case 129: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNamePart_p) }()
+        case 130: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNegativeIntValue_p) }()
+        case 131: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNoStandardDescriptorAccessor_p) }()
+        case 132: try { try decoder.decodeSingularInt32Field(value: &_storage._clearNumber_p) }()
+        case 133: try { try decoder.decodeSingularInt32Field(value: &_storage._clearObjcClassPrefix_p) }()
+        case 134: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOneofIndex_p) }()
+        case 135: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptimizeFor_p) }()
+        case 136: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOptions_p) }()
+        case 137: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOutputType_p) }()
+        case 138: try { try decoder.decodeSingularInt32Field(value: &_storage._clearOverridableFeatures_p) }()
+        case 139: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPackage_p) }()
+        case 140: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPacked_p) }()
+        case 141: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpClassPrefix_p) }()
+        case 142: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpMetadataNamespace_p) }()
+        case 143: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPhpNamespace_p) }()
+        case 144: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPositiveIntValue_p) }()
+        case 145: try { try decoder.decodeSingularInt32Field(value: &_storage._clearProto3Optional_p) }()
+        case 146: try { try decoder.decodeSingularInt32Field(value: &_storage._clearPyGenericServices_p) }()
+        case 147: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeated_p) }()
+        case 148: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRepeatedFieldEncoding_p) }()
+        case 149: try { try decoder.decodeSingularInt32Field(value: &_storage._clearReserved_p) }()
+        case 150: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRetention_p) }()
+        case 151: try { try decoder.decodeSingularInt32Field(value: &_storage._clearRubyPackage_p) }()
+        case 152: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSemantic_p) }()
+        case 153: try { try decoder.decodeSingularInt32Field(value: &_storage._clearServerStreaming_p) }()
+        case 154: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceCodeInfo_p) }()
+        case 155: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceContext_p) }()
+        case 156: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSourceFile_p) }()
+        case 157: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStart_p) }()
+        case 158: try { try decoder.decodeSingularInt32Field(value: &_storage._clearStringValue_p) }()
+        case 159: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSwiftPrefix_p) }()
+        case 160: try { try decoder.decodeSingularInt32Field(value: &_storage._clearSyntax_p) }()
+        case 161: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTrailingComments_p) }()
+        case 162: try { try decoder.decodeSingularInt32Field(value: &_storage._clearType_p) }()
+        case 163: try { try decoder.decodeSingularInt32Field(value: &_storage._clearTypeName_p) }()
+        case 164: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUnverifiedLazy_p) }()
+        case 165: try { try decoder.decodeSingularInt32Field(value: &_storage._clearUtf8Validation_p) }()
+        case 166: try { try decoder.decodeSingularInt32Field(value: &_storage._clearValue_p) }()
+        case 167: try { try decoder.decodeSingularInt32Field(value: &_storage._clearVerification_p) }()
+        case 168: try { try decoder.decodeSingularInt32Field(value: &_storage._clearWeak_p) }()
+        case 169: try { try decoder.decodeSingularInt32Field(value: &_storage._clientStreaming) }()
+        case 170: try { try decoder.decodeSingularInt32Field(value: &_storage._code) }()
+        case 171: try { try decoder.decodeSingularInt32Field(value: &_storage._codePoint) }()
+        case 172: try { try decoder.decodeSingularInt32Field(value: &_storage._codeUnits) }()
+        case 173: try { try decoder.decodeSingularInt32Field(value: &_storage._collection) }()
+        case 174: try { try decoder.decodeSingularInt32Field(value: &_storage._com) }()
+        case 175: try { try decoder.decodeSingularInt32Field(value: &_storage._comma) }()
+        case 176: try { try decoder.decodeSingularInt32Field(value: &_storage._consumedBytes) }()
+        case 177: try { try decoder.decodeSingularInt32Field(value: &_storage._contains) }()
+        case 178: try { try decoder.decodeSingularInt32Field(value: &_storage._contentsOf) }()
+        case 179: try { try decoder.decodeSingularInt32Field(value: &_storage._contiguousBytes) }()
+        case 180: try { try decoder.decodeSingularInt32Field(value: &_storage._copy) }()
+        case 181: try { try decoder.decodeSingularInt32Field(value: &_storage._count) }()
+        case 182: try { try decoder.decodeSingularInt32Field(value: &_storage._countVarintsInBuffer) }()
+        case 183: try { try decoder.decodeSingularInt32Field(value: &_storage._csharpNamespace) }()
+        case 184: try { try decoder.decodeSingularInt32Field(value: &_storage._ctype) }()
+        case 185: try { try decoder.decodeSingularInt32Field(value: &_storage._customCodable) }()
+        case 186: try { try decoder.decodeSingularInt32Field(value: &_storage._customDebugStringConvertible) }()
+        case 187: try { try decoder.decodeSingularInt32Field(value: &_storage._customStringConvertible) }()
+        case 188: try { try decoder.decodeSingularInt32Field(value: &_storage._d) }()
+        case 189: try { try decoder.decodeSingularInt32Field(value: &_storage._data) }()
+        case 190: try { try decoder.decodeSingularInt32Field(value: &_storage._dataResult) }()
+        case 191: try { try decoder.decodeSingularInt32Field(value: &_storage._date) }()
+        case 192: try { try decoder.decodeSingularInt32Field(value: &_storage._daySec) }()
+        case 193: try { try decoder.decodeSingularInt32Field(value: &_storage._daysSinceEpoch) }()
+        case 194: try { try decoder.decodeSingularInt32Field(value: &_storage._debugDescription_p) }()
+        case 195: try { try decoder.decodeSingularInt32Field(value: &_storage._debugRedact) }()
+        case 196: try { try decoder.decodeSingularInt32Field(value: &_storage._declaration) }()
+        case 197: try { try decoder.decodeSingularInt32Field(value: &_storage._decoded) }()
+        case 198: try { try decoder.decodeSingularInt32Field(value: &_storage._decodedFromJsonnull) }()
+        case 199: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionField) }()
+        case 200: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeExtensionFieldsAsMessageSet) }()
+        case 201: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeJson) }()
+        case 202: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMapField) }()
+        case 203: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeMessage) }()
+        case 204: try { try decoder.decodeSingularInt32Field(value: &_storage._decoder) }()
+        case 205: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeated) }()
+        case 206: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBoolField) }()
+        case 207: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedBytesField) }()
+        case 208: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedDoubleField) }()
+        case 209: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedEnumField) }()
+        case 210: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed32Field) }()
+        case 211: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFixed64Field) }()
+        case 212: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedFloatField) }()
+        case 213: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedGroupField) }()
+        case 214: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt32Field) }()
+        case 215: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedInt64Field) }()
+        case 216: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedMessageField) }()
+        case 217: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed32Field) }()
+        case 218: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSfixed64Field) }()
+        case 219: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint32Field) }()
+        case 220: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedSint64Field) }()
+        case 221: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedStringField) }()
+        case 222: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint32Field) }()
+        case 223: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeRepeatedUint64Field) }()
+        case 224: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingular) }()
+        case 225: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBoolField) }()
+        case 226: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularBytesField) }()
+        case 227: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularDoubleField) }()
+        case 228: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularEnumField) }()
+        case 229: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed32Field) }()
+        case 230: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFixed64Field) }()
+        case 231: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularFloatField) }()
+        case 232: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularGroupField) }()
+        case 233: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt32Field) }()
+        case 234: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularInt64Field) }()
+        case 235: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularMessageField) }()
+        case 236: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed32Field) }()
+        case 237: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSfixed64Field) }()
+        case 238: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint32Field) }()
+        case 239: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularSint64Field) }()
+        case 240: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularStringField) }()
+        case 241: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint32Field) }()
+        case 242: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeSingularUint64Field) }()
+        case 243: try { try decoder.decodeSingularInt32Field(value: &_storage._decodeTextFormat) }()
+        case 244: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultAnyTypeUrlprefix) }()
+        case 245: try { try decoder.decodeSingularInt32Field(value: &_storage._defaults) }()
+        case 246: try { try decoder.decodeSingularInt32Field(value: &_storage._defaultValue) }()
+        case 247: try { try decoder.decodeSingularInt32Field(value: &_storage._dependency) }()
+        case 248: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecated) }()
+        case 249: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecatedLegacyJsonFieldConflicts) }()
+        case 250: try { try decoder.decodeSingularInt32Field(value: &_storage._deprecationWarning) }()
+        case 251: try { try decoder.decodeSingularInt32Field(value: &_storage._description_p) }()
+        case 252: try { try decoder.decodeSingularInt32Field(value: &_storage._descriptorProto) }()
+        case 253: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionary) }()
+        case 254: try { try decoder.decodeSingularInt32Field(value: &_storage._dictionaryLiteral) }()
+        case 255: try { try decoder.decodeSingularInt32Field(value: &_storage._digit) }()
+        case 256: try { try decoder.decodeSingularInt32Field(value: &_storage._digit0) }()
+        case 257: try { try decoder.decodeSingularInt32Field(value: &_storage._digit1) }()
+        case 258: try { try decoder.decodeSingularInt32Field(value: &_storage._digitCount) }()
+        case 259: try { try decoder.decodeSingularInt32Field(value: &_storage._digits) }()
+        case 260: try { try decoder.decodeSingularInt32Field(value: &_storage._digitValue) }()
+        case 261: try { try decoder.decodeSingularInt32Field(value: &_storage._discardableResult) }()
+        case 262: try { try decoder.decodeSingularInt32Field(value: &_storage._discardUnknownFields) }()
+        case 263: try { try decoder.decodeSingularInt32Field(value: &_storage._double) }()
+        case 264: try { try decoder.decodeSingularInt32Field(value: &_storage._doubleValue) }()
+        case 265: try { try decoder.decodeSingularInt32Field(value: &_storage._duration) }()
+        case 266: try { try decoder.decodeSingularInt32Field(value: &_storage._e) }()
+        case 267: try { try decoder.decodeSingularInt32Field(value: &_storage._edition) }()
+        case 268: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefault) }()
+        case 269: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDefaults) }()
+        case 270: try { try decoder.decodeSingularInt32Field(value: &_storage._editionDeprecated) }()
+        case 271: try { try decoder.decodeSingularInt32Field(value: &_storage._editionIntroduced) }()
+        case 272: try { try decoder.decodeSingularInt32Field(value: &_storage._editionRemoved) }()
+        case 273: try { try decoder.decodeSingularInt32Field(value: &_storage._element) }()
+        case 274: try { try decoder.decodeSingularInt32Field(value: &_storage._elements) }()
+        case 275: try { try decoder.decodeSingularInt32Field(value: &_storage._else) }()
+        case 276: try { try decoder.decodeSingularInt32Field(value: &_storage._emitExtensionFieldName) }()
+        case 277: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldName) }()
+        case 278: try { try decoder.decodeSingularInt32Field(value: &_storage._emitFieldNumber) }()
+        case 279: try { try decoder.decodeSingularInt32Field(value: &_storage._empty) }()
+        case 280: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyAnyTypeURL) }()
+        case 281: try { try decoder.decodeSingularInt32Field(value: &_storage._emptyData) }()
+        case 282: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeAsBytes) }()
+        case 283: try { try decoder.decodeSingularInt32Field(value: &_storage._encoded) }()
+        case 284: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedJsonstring) }()
+        case 285: try { try decoder.decodeSingularInt32Field(value: &_storage._encodedSize) }()
+        case 286: try { try decoder.decodeSingularInt32Field(value: &_storage._encodeField) }()
+        case 287: try { try decoder.decodeSingularInt32Field(value: &_storage._encoder) }()
+        case 288: try { try decoder.decodeSingularInt32Field(value: &_storage._end) }()
+        case 289: try { try decoder.decodeSingularInt32Field(value: &_storage._endArray) }()
+        case 290: try { try decoder.decodeSingularInt32Field(value: &_storage._endMessageField) }()
+        case 291: try { try decoder.decodeSingularInt32Field(value: &_storage._endObject) }()
+        case 292: try { try decoder.decodeSingularInt32Field(value: &_storage._endRegularField) }()
+        case 293: try { try decoder.decodeSingularInt32Field(value: &_storage._enforceNamingStyle) }()
+        case 294: try { try decoder.decodeSingularInt32Field(value: &_storage._enum) }()
+        case 295: try { try decoder.decodeSingularInt32Field(value: &_storage._enumDescriptorProto) }()
+        case 296: try { try decoder.decodeSingularInt32Field(value: &_storage._enumOptions) }()
+        case 297: try { try decoder.decodeSingularInt32Field(value: &_storage._enumReservedRange) }()
+        case 298: try { try decoder.decodeSingularInt32Field(value: &_storage._enumType) }()
+        case 299: try { try decoder.decodeSingularInt32Field(value: &_storage._enumvalue) }()
+        case 300: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueDescriptorProto) }()
+        case 301: try { try decoder.decodeSingularInt32Field(value: &_storage._enumValueOptions) }()
+        case 302: try { try decoder.decodeSingularInt32Field(value: &_storage._equatable) }()
+        case 303: try { try decoder.decodeSingularInt32Field(value: &_storage._error) }()
+        case 304: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByArrayLiteral) }()
+        case 305: try { try decoder.decodeSingularInt32Field(value: &_storage._expressibleByDictionaryLiteral) }()
+        case 306: try { try decoder.decodeSingularInt32Field(value: &_storage._ext) }()
+        case 307: try { try decoder.decodeSingularInt32Field(value: &_storage._extDecoder) }()
+        case 308: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteral) }()
+        case 309: try { try decoder.decodeSingularInt32Field(value: &_storage._extendedGraphemeClusterLiteralType) }()
+        case 310: try { try decoder.decodeSingularInt32Field(value: &_storage._extendee) }()
+        case 311: try { try decoder.decodeSingularInt32Field(value: &_storage._extensibleMessage) }()
+        case 312: try { try decoder.decodeSingularInt32Field(value: &_storage._extension) }()
+        case 313: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionField) }()
+        case 314: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldNumber) }()
+        case 315: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionFieldValueSet) }()
+        case 316: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionMap) }()
+        case 317: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRange) }()
+        case 318: try { try decoder.decodeSingularInt32Field(value: &_storage._extensionRangeOptions) }()
+        case 319: try { try decoder.decodeSingularInt32Field(value: &_storage._extensions) }()
+        case 320: try { try decoder.decodeSingularInt32Field(value: &_storage._extras) }()
+        case 321: try { try decoder.decodeSingularInt32Field(value: &_storage._f) }()
+        case 322: try { try decoder.decodeSingularInt32Field(value: &_storage._false) }()
+        case 323: try { try decoder.decodeSingularInt32Field(value: &_storage._features) }()
+        case 324: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSet) }()
+        case 325: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetDefaults) }()
+        case 326: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSetEditionDefault) }()
+        case 327: try { try decoder.decodeSingularInt32Field(value: &_storage._featureSupport) }()
+        case 328: try { try decoder.decodeSingularInt32Field(value: &_storage._field) }()
+        case 329: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldData) }()
+        case 330: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldDescriptorProto) }()
+        case 331: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMask) }()
+        case 332: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldMaskError) }()
+        case 333: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldName) }()
+        case 334: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNameCount) }()
+        case 335: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNum) }()
+        case 336: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumber) }()
+        case 337: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldNumberForProto) }()
+        case 338: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldOptions) }()
+        case 339: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldPresence) }()
+        case 340: try { try decoder.decodeSingularInt32Field(value: &_storage._fields) }()
+        case 341: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldSize) }()
+        case 342: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldTag) }()
+        case 343: try { try decoder.decodeSingularInt32Field(value: &_storage._fieldType) }()
+        case 344: try { try decoder.decodeSingularInt32Field(value: &_storage._file) }()
+        case 345: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorProto) }()
+        case 346: try { try decoder.decodeSingularInt32Field(value: &_storage._fileDescriptorSet) }()
+        case 347: try { try decoder.decodeSingularInt32Field(value: &_storage._fileName) }()
+        case 348: try { try decoder.decodeSingularInt32Field(value: &_storage._fileOptions) }()
+        case 349: try { try decoder.decodeSingularInt32Field(value: &_storage._filter) }()
+        case 350: try { try decoder.decodeSingularInt32Field(value: &_storage._final) }()
+        case 351: try { try decoder.decodeSingularInt32Field(value: &_storage._finiteOnly) }()
+        case 352: try { try decoder.decodeSingularInt32Field(value: &_storage._first) }()
+        case 353: try { try decoder.decodeSingularInt32Field(value: &_storage._firstItem) }()
+        case 354: try { try decoder.decodeSingularInt32Field(value: &_storage._fixedFeatures) }()
+        case 355: try { try decoder.decodeSingularInt32Field(value: &_storage._float) }()
+        case 356: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteral) }()
+        case 357: try { try decoder.decodeSingularInt32Field(value: &_storage._floatLiteralType) }()
+        case 358: try { try decoder.decodeSingularInt32Field(value: &_storage._floatValue) }()
+        case 359: try { try decoder.decodeSingularInt32Field(value: &_storage._for) }()
+        case 360: try { try decoder.decodeSingularInt32Field(value: &_storage._forMessageName) }()
+        case 361: try { try decoder.decodeSingularInt32Field(value: &_storage._formUnion) }()
+        case 362: try { try decoder.decodeSingularInt32Field(value: &_storage._forReadingFrom) }()
+        case 363: try { try decoder.decodeSingularInt32Field(value: &_storage._forTypeURL) }()
+        case 364: try { try decoder.decodeSingularInt32Field(value: &_storage._forwardParser) }()
+        case 365: try { try decoder.decodeSingularInt32Field(value: &_storage._forWritingInto) }()
+        case 366: try { try decoder.decodeSingularInt32Field(value: &_storage._from) }()
+        case 367: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii2) }()
+        case 368: try { try decoder.decodeSingularInt32Field(value: &_storage._fromAscii4) }()
+        case 369: try { try decoder.decodeSingularInt32Field(value: &_storage._fromByteOffset) }()
+        case 370: try { try decoder.decodeSingularInt32Field(value: &_storage._fromHexDigit) }()
+        case 371: try { try decoder.decodeSingularInt32Field(value: &_storage._fullName) }()
+        case 372: try { try decoder.decodeSingularInt32Field(value: &_storage._func) }()
+        case 373: try { try decoder.decodeSingularInt32Field(value: &_storage._function) }()
+        case 374: try { try decoder.decodeSingularInt32Field(value: &_storage._g) }()
+        case 375: try { try decoder.decodeSingularInt32Field(value: &_storage._generatedCodeInfo) }()
+        case 376: try { try decoder.decodeSingularInt32Field(value: &_storage._get) }()
+        case 377: try { try decoder.decodeSingularInt32Field(value: &_storage._getExtensionValue) }()
+        case 378: try { try decoder.decodeSingularInt32Field(value: &_storage._googleapis) }()
+        case 379: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufAny) }()
+        case 380: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufApi) }()
+        case 381: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBoolValue) }()
+        case 382: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufBytesValue) }()
+        case 383: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDescriptorProto) }()
+        case 384: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDoubleValue) }()
+        case 385: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufDuration) }()
+        case 386: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEdition) }()
+        case 387: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEmpty) }()
+        case 388: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnum) }()
+        case 389: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumDescriptorProto) }()
+        case 390: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumOptions) }()
+        case 391: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValue) }()
+        case 392: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueDescriptorProto) }()
+        case 393: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufEnumValueOptions) }()
+        case 394: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufExtensionRangeOptions) }()
+        case 395: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSet) }()
+        case 396: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFeatureSetDefaults) }()
+        case 397: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufField) }()
+        case 398: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldDescriptorProto) }()
+        case 399: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldMask) }()
+        case 400: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFieldOptions) }()
+        case 401: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorProto) }()
+        case 402: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileDescriptorSet) }()
+        case 403: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFileOptions) }()
+        case 404: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufFloatValue) }()
+        case 405: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufGeneratedCodeInfo) }()
+        case 406: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt32Value) }()
+        case 407: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufInt64Value) }()
+        case 408: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufListValue) }()
+        case 409: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMessageOptions) }()
+        case 410: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethod) }()
+        case 411: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodDescriptorProto) }()
+        case 412: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMethodOptions) }()
+        case 413: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufMixin) }()
+        case 414: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufNullValue) }()
+        case 415: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofDescriptorProto) }()
+        case 416: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOneofOptions) }()
+        case 417: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufOption) }()
+        case 418: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceDescriptorProto) }()
+        case 419: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufServiceOptions) }()
+        case 420: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceCodeInfo) }()
+        case 421: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSourceContext) }()
+        case 422: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStringValue) }()
+        case 423: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufStruct) }()
+        case 424: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufSyntax) }()
+        case 425: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufTimestamp) }()
+        case 426: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufType) }()
+        case 427: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint32Value) }()
+        case 428: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUint64Value) }()
+        case 429: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufUninterpretedOption) }()
+        case 430: try { try decoder.decodeSingularInt32Field(value: &_storage._googleProtobufValue) }()
+        case 431: try { try decoder.decodeSingularInt32Field(value: &_storage._goPackage) }()
+        case 432: try { try decoder.decodeSingularInt32Field(value: &_storage._group) }()
+        case 433: try { try decoder.decodeSingularInt32Field(value: &_storage._groupFieldNumberStack) }()
+        case 434: try { try decoder.decodeSingularInt32Field(value: &_storage._groupSize) }()
+        case 435: try { try decoder.decodeSingularInt32Field(value: &_storage._guard) }()
+        case 436: try { try decoder.decodeSingularInt32Field(value: &_storage._hadOneofValue) }()
+        case 437: try { try decoder.decodeSingularInt32Field(value: &_storage._handleConflictingOneOf) }()
+        case 438: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAggregateValue_p) }()
+        case 439: try { try decoder.decodeSingularInt32Field(value: &_storage._hasAllowAlias_p) }()
+        case 440: try { try decoder.decodeSingularInt32Field(value: &_storage._hasBegin_p) }()
+        case 441: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcEnableArenas_p) }()
+        case 442: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCcGenericServices_p) }()
+        case 443: try { try decoder.decodeSingularInt32Field(value: &_storage._hasClientStreaming_p) }()
+        case 444: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCsharpNamespace_p) }()
+        case 445: try { try decoder.decodeSingularInt32Field(value: &_storage._hasCtype_p) }()
+        case 446: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDebugRedact_p) }()
+        case 447: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDefaultValue_p) }()
+        case 448: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecated_p) }()
+        case 449: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecatedLegacyJsonFieldConflicts_p) }()
+        case 450: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDeprecationWarning_p) }()
+        case 451: try { try decoder.decodeSingularInt32Field(value: &_storage._hasDoubleValue_p) }()
+        case 452: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEdition_p) }()
+        case 453: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionDeprecated_p) }()
+        case 454: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionIntroduced_p) }()
+        case 455: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEditionRemoved_p) }()
+        case 456: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnd_p) }()
+        case 457: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnforceNamingStyle_p) }()
+        case 458: try { try decoder.decodeSingularInt32Field(value: &_storage._hasEnumType_p) }()
+        case 459: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtendee_p) }()
+        case 460: try { try decoder.decodeSingularInt32Field(value: &_storage._hasExtensionValue_p) }()
+        case 461: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatures_p) }()
+        case 462: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFeatureSupport_p) }()
+        case 463: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFieldPresence_p) }()
+        case 464: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFixedFeatures_p) }()
+        case 465: try { try decoder.decodeSingularInt32Field(value: &_storage._hasFullName_p) }()
+        case 466: try { try decoder.decodeSingularInt32Field(value: &_storage._hasGoPackage_p) }()
+        case 467: try { try decoder.decodeSingularInt32Field(value: &_storage._hash) }()
+        case 468: try { try decoder.decodeSingularInt32Field(value: &_storage._hashable) }()
+        case 469: try { try decoder.decodeSingularInt32Field(value: &_storage._hasher) }()
+        case 470: try { try decoder.decodeSingularInt32Field(value: &_storage._hashVisitor) }()
+        case 471: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdempotencyLevel_p) }()
+        case 472: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIdentifierValue_p) }()
+        case 473: try { try decoder.decodeSingularInt32Field(value: &_storage._hasInputType_p) }()
+        case 474: try { try decoder.decodeSingularInt32Field(value: &_storage._hasIsExtension_p) }()
+        case 475: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenerateEqualsAndHash_p) }()
+        case 476: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaGenericServices_p) }()
+        case 477: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaMultipleFiles_p) }()
+        case 478: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaOuterClassname_p) }()
+        case 479: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaPackage_p) }()
+        case 480: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJavaStringCheckUtf8_p) }()
+        case 481: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonFormat_p) }()
+        case 482: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJsonName_p) }()
+        case 483: try { try decoder.decodeSingularInt32Field(value: &_storage._hasJstype_p) }()
+        case 484: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLabel_p) }()
+        case 485: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLazy_p) }()
+        case 486: try { try decoder.decodeSingularInt32Field(value: &_storage._hasLeadingComments_p) }()
+        case 487: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMapEntry_p) }()
+        case 488: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMaximumEdition_p) }()
+        case 489: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageEncoding_p) }()
+        case 490: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMessageSetWireFormat_p) }()
+        case 491: try { try decoder.decodeSingularInt32Field(value: &_storage._hasMinimumEdition_p) }()
+        case 492: try { try decoder.decodeSingularInt32Field(value: &_storage._hasName_p) }()
+        case 493: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNamePart_p) }()
+        case 494: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNegativeIntValue_p) }()
+        case 495: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNoStandardDescriptorAccessor_p) }()
+        case 496: try { try decoder.decodeSingularInt32Field(value: &_storage._hasNumber_p) }()
+        case 497: try { try decoder.decodeSingularInt32Field(value: &_storage._hasObjcClassPrefix_p) }()
+        case 498: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOneofIndex_p) }()
+        case 499: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptimizeFor_p) }()
+        case 500: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOptions_p) }()
+        case 501: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOutputType_p) }()
+        case 502: try { try decoder.decodeSingularInt32Field(value: &_storage._hasOverridableFeatures_p) }()
+        case 503: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPackage_p) }()
+        case 504: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPacked_p) }()
+        case 505: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpClassPrefix_p) }()
+        case 506: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpMetadataNamespace_p) }()
+        case 507: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPhpNamespace_p) }()
+        case 508: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPositiveIntValue_p) }()
+        case 509: try { try decoder.decodeSingularInt32Field(value: &_storage._hasProto3Optional_p) }()
+        case 510: try { try decoder.decodeSingularInt32Field(value: &_storage._hasPyGenericServices_p) }()
+        case 511: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeated_p) }()
+        case 512: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRepeatedFieldEncoding_p) }()
+        case 513: try { try decoder.decodeSingularInt32Field(value: &_storage._hasReserved_p) }()
+        case 514: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRetention_p) }()
+        case 515: try { try decoder.decodeSingularInt32Field(value: &_storage._hasRubyPackage_p) }()
+        case 516: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSemantic_p) }()
+        case 517: try { try decoder.decodeSingularInt32Field(value: &_storage._hasServerStreaming_p) }()
+        case 518: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceCodeInfo_p) }()
+        case 519: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceContext_p) }()
+        case 520: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSourceFile_p) }()
+        case 521: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStart_p) }()
+        case 522: try { try decoder.decodeSingularInt32Field(value: &_storage._hasStringValue_p) }()
+        case 523: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSwiftPrefix_p) }()
+        case 524: try { try decoder.decodeSingularInt32Field(value: &_storage._hasSyntax_p) }()
+        case 525: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTrailingComments_p) }()
+        case 526: try { try decoder.decodeSingularInt32Field(value: &_storage._hasType_p) }()
+        case 527: try { try decoder.decodeSingularInt32Field(value: &_storage._hasTypeName_p) }()
+        case 528: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUnverifiedLazy_p) }()
+        case 529: try { try decoder.decodeSingularInt32Field(value: &_storage._hasUtf8Validation_p) }()
+        case 530: try { try decoder.decodeSingularInt32Field(value: &_storage._hasValue_p) }()
+        case 531: try { try decoder.decodeSingularInt32Field(value: &_storage._hasVerification_p) }()
+        case 532: try { try decoder.decodeSingularInt32Field(value: &_storage._hasWeak_p) }()
+        case 533: try { try decoder.decodeSingularInt32Field(value: &_storage._hour) }()
+        case 534: try { try decoder.decodeSingularInt32Field(value: &_storage._i) }()
+        case 535: try { try decoder.decodeSingularInt32Field(value: &_storage._idempotencyLevel) }()
+        case 536: try { try decoder.decodeSingularInt32Field(value: &_storage._identifierValue) }()
+        case 537: try { try decoder.decodeSingularInt32Field(value: &_storage._if) }()
+        case 538: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownExtensionFields) }()
+        case 539: try { try decoder.decodeSingularInt32Field(value: &_storage._ignoreUnknownFields) }()
+        case 540: try { try decoder.decodeSingularInt32Field(value: &_storage._index) }()
+        case 541: try { try decoder.decodeSingularInt32Field(value: &_storage._init_p) }()
+        case 542: try { try decoder.decodeSingularInt32Field(value: &_storage._inout) }()
+        case 543: try { try decoder.decodeSingularInt32Field(value: &_storage._inputType) }()
+        case 544: try { try decoder.decodeSingularInt32Field(value: &_storage._insert) }()
+        case 545: try { try decoder.decodeSingularInt32Field(value: &_storage._int) }()
+        case 546: try { try decoder.decodeSingularInt32Field(value: &_storage._int32) }()
+        case 547: try { try decoder.decodeSingularInt32Field(value: &_storage._int32Value) }()
+        case 548: try { try decoder.decodeSingularInt32Field(value: &_storage._int64) }()
+        case 549: try { try decoder.decodeSingularInt32Field(value: &_storage._int64Value) }()
+        case 550: try { try decoder.decodeSingularInt32Field(value: &_storage._int8) }()
+        case 551: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteral) }()
+        case 552: try { try decoder.decodeSingularInt32Field(value: &_storage._integerLiteralType) }()
+        case 553: try { try decoder.decodeSingularInt32Field(value: &_storage._intern) }()
+        case 554: try { try decoder.decodeSingularInt32Field(value: &_storage._internal) }()
+        case 555: try { try decoder.decodeSingularInt32Field(value: &_storage._internalState) }()
+        case 556: try { try decoder.decodeSingularInt32Field(value: &_storage._intersect) }()
+        case 557: try { try decoder.decodeSingularInt32Field(value: &_storage._into) }()
+        case 558: try { try decoder.decodeSingularInt32Field(value: &_storage._ints) }()
+        case 559: try { try decoder.decodeSingularInt32Field(value: &_storage._invalidAnyTypeURL) }()
+        case 560: try { try decoder.decodeSingularInt32Field(value: &_storage._isA) }()
+        case 561: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqual) }()
+        case 562: try { try decoder.decodeSingularInt32Field(value: &_storage._isEqualTo) }()
+        case 563: try { try decoder.decodeSingularInt32Field(value: &_storage._isExtension) }()
+        case 564: try { try decoder.decodeSingularInt32Field(value: &_storage._isInitialized_p) }()
+        case 565: try { try decoder.decodeSingularInt32Field(value: &_storage._isNegative) }()
+        case 566: try { try decoder.decodeSingularInt32Field(value: &_storage._isPathValid) }()
+        case 567: try { try decoder.decodeSingularInt32Field(value: &_storage._isValid) }()
+        case 568: try { try decoder.decodeSingularInt32Field(value: &_storage._itemTagsEncodedSize) }()
+        case 569: try { try decoder.decodeSingularInt32Field(value: &_storage._iterator) }()
+        case 570: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenerateEqualsAndHash) }()
+        case 571: try { try decoder.decodeSingularInt32Field(value: &_storage._javaGenericServices) }()
+        case 572: try { try decoder.decodeSingularInt32Field(value: &_storage._javaMultipleFiles) }()
+        case 573: try { try decoder.decodeSingularInt32Field(value: &_storage._javaOuterClassname) }()
+        case 574: try { try decoder.decodeSingularInt32Field(value: &_storage._javaPackage) }()
+        case 575: try { try decoder.decodeSingularInt32Field(value: &_storage._javaStringCheckUtf8) }()
+        case 576: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoder) }()
+        case 577: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecoding) }()
+        case 578: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingError) }()
+        case 579: try { try decoder.decodeSingularInt32Field(value: &_storage._jsondecodingOptions) }()
+        case 580: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonEncoder) }()
+        case 581: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencoding) }()
+        case 582: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingError) }()
+        case 583: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingOptions) }()
+        case 584: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonencodingVisitor) }()
+        case 585: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonFormat) }()
+        case 586: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonmapEncodingVisitor) }()
+        case 587: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonName) }()
+        case 588: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPath) }()
+        case 589: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonPaths) }()
+        case 590: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonscanner) }()
+        case 591: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonString) }()
+        case 592: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonText) }()
+        case 593: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Bytes) }()
+        case 594: try { try decoder.decodeSingularInt32Field(value: &_storage._jsonUtf8Data) }()
+        case 595: try { try decoder.decodeSingularInt32Field(value: &_storage._jstype) }()
+        case 596: try { try decoder.decodeSingularInt32Field(value: &_storage._k) }()
+        case 597: try { try decoder.decodeSingularInt32Field(value: &_storage._kChunkSize) }()
+        case 598: try { try decoder.decodeSingularInt32Field(value: &_storage._key) }()
+        case 599: try { try decoder.decodeSingularInt32Field(value: &_storage._keyField) }()
+        case 600: try { try decoder.decodeSingularInt32Field(value: &_storage._keyFieldOpt) }()
+        case 601: try { try decoder.decodeSingularInt32Field(value: &_storage._keyType) }()
+        case 602: try { try decoder.decodeSingularInt32Field(value: &_storage._kind) }()
+        case 603: try { try decoder.decodeSingularInt32Field(value: &_storage._l) }()
+        case 604: try { try decoder.decodeSingularInt32Field(value: &_storage._label) }()
+        case 605: try { try decoder.decodeSingularInt32Field(value: &_storage._lazy) }()
+        case 606: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingComments) }()
+        case 607: try { try decoder.decodeSingularInt32Field(value: &_storage._leadingDetachedComments) }()
+        case 608: try { try decoder.decodeSingularInt32Field(value: &_storage._length) }()
+        case 609: try { try decoder.decodeSingularInt32Field(value: &_storage._lessThan) }()
+        case 610: try { try decoder.decodeSingularInt32Field(value: &_storage._let) }()
+        case 611: try { try decoder.decodeSingularInt32Field(value: &_storage._lhs) }()
+        case 612: try { try decoder.decodeSingularInt32Field(value: &_storage._line) }()
+        case 613: try { try decoder.decodeSingularInt32Field(value: &_storage._list) }()
+        case 614: try { try decoder.decodeSingularInt32Field(value: &_storage._listOfMessages) }()
+        case 615: try { try decoder.decodeSingularInt32Field(value: &_storage._listValue) }()
+        case 616: try { try decoder.decodeSingularInt32Field(value: &_storage._littleEndian) }()
+        case 617: try { try decoder.decodeSingularInt32Field(value: &_storage._load) }()
+        case 618: try { try decoder.decodeSingularInt32Field(value: &_storage._localHasher) }()
+        case 619: try { try decoder.decodeSingularInt32Field(value: &_storage._location) }()
+        case 620: try { try decoder.decodeSingularInt32Field(value: &_storage._m) }()
+        case 621: try { try decoder.decodeSingularInt32Field(value: &_storage._major) }()
+        case 622: try { try decoder.decodeSingularInt32Field(value: &_storage._makeAsyncIterator) }()
+        case 623: try { try decoder.decodeSingularInt32Field(value: &_storage._makeIterator) }()
+        case 624: try { try decoder.decodeSingularInt32Field(value: &_storage._malformedLength) }()
+        case 625: try { try decoder.decodeSingularInt32Field(value: &_storage._mapEntry) }()
+        case 626: try { try decoder.decodeSingularInt32Field(value: &_storage._mapKeyType) }()
+        case 627: try { try decoder.decodeSingularInt32Field(value: &_storage._mapToMessages) }()
+        case 628: try { try decoder.decodeSingularInt32Field(value: &_storage._mapValueType) }()
+        case 629: try { try decoder.decodeSingularInt32Field(value: &_storage._mapVisitor) }()
+        case 630: try { try decoder.decodeSingularInt32Field(value: &_storage._mask) }()
+        case 631: try { try decoder.decodeSingularInt32Field(value: &_storage._maximumEdition) }()
+        case 632: try { try decoder.decodeSingularInt32Field(value: &_storage._mdayStart) }()
+        case 633: try { try decoder.decodeSingularInt32Field(value: &_storage._merge) }()
+        case 634: try { try decoder.decodeSingularInt32Field(value: &_storage._mergeOptions) }()
+        case 635: try { try decoder.decodeSingularInt32Field(value: &_storage._message) }()
+        case 636: try { try decoder.decodeSingularInt32Field(value: &_storage._messageDepthLimit) }()
+        case 637: try { try decoder.decodeSingularInt32Field(value: &_storage._messageEncoding) }()
+        case 638: try { try decoder.decodeSingularInt32Field(value: &_storage._messageExtension) }()
+        case 639: try { try decoder.decodeSingularInt32Field(value: &_storage._messageImplementationBase) }()
+        case 640: try { try decoder.decodeSingularInt32Field(value: &_storage._messageOptions) }()
+        case 641: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSet) }()
+        case 642: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSetWireFormat) }()
+        case 643: try { try decoder.decodeSingularInt32Field(value: &_storage._messageSize) }()
+        case 644: try { try decoder.decodeSingularInt32Field(value: &_storage._messageType) }()
+        case 645: try { try decoder.decodeSingularInt32Field(value: &_storage._method) }()
+        case 646: try { try decoder.decodeSingularInt32Field(value: &_storage._methodDescriptorProto) }()
+        case 647: try { try decoder.decodeSingularInt32Field(value: &_storage._methodOptions) }()
+        case 648: try { try decoder.decodeSingularInt32Field(value: &_storage._methods) }()
+        case 649: try { try decoder.decodeSingularInt32Field(value: &_storage._min) }()
+        case 650: try { try decoder.decodeSingularInt32Field(value: &_storage._minimumEdition) }()
+        case 651: try { try decoder.decodeSingularInt32Field(value: &_storage._minor) }()
+        case 652: try { try decoder.decodeSingularInt32Field(value: &_storage._mixin) }()
+        case 653: try { try decoder.decodeSingularInt32Field(value: &_storage._mixins) }()
+        case 654: try { try decoder.decodeSingularInt32Field(value: &_storage._modify) }()
+        case 655: try { try decoder.decodeSingularInt32Field(value: &_storage._month) }()
+        case 656: try { try decoder.decodeSingularInt32Field(value: &_storage._msgExtension) }()
+        case 657: try { try decoder.decodeSingularInt32Field(value: &_storage._mutating) }()
+        case 658: try { try decoder.decodeSingularInt32Field(value: &_storage._n) }()
+        case 659: try { try decoder.decodeSingularInt32Field(value: &_storage._name) }()
+        case 660: try { try decoder.decodeSingularInt32Field(value: &_storage._nameDescription) }()
+        case 661: try { try decoder.decodeSingularInt32Field(value: &_storage._nameMap) }()
+        case 662: try { try decoder.decodeSingularInt32Field(value: &_storage._namePart) }()
+        case 663: try { try decoder.decodeSingularInt32Field(value: &_storage._names) }()
+        case 664: try { try decoder.decodeSingularInt32Field(value: &_storage._nanos) }()
+        case 665: try { try decoder.decodeSingularInt32Field(value: &_storage._negativeIntValue) }()
+        case 666: try { try decoder.decodeSingularInt32Field(value: &_storage._nestedType) }()
+        case 667: try { try decoder.decodeSingularInt32Field(value: &_storage._newExtensible) }()
+        case 668: try { try decoder.decodeSingularInt32Field(value: &_storage._newL) }()
+        case 669: try { try decoder.decodeSingularInt32Field(value: &_storage._newList) }()
+        case 670: try { try decoder.decodeSingularInt32Field(value: &_storage._newMessage) }()
+        case 671: try { try decoder.decodeSingularInt32Field(value: &_storage._newValue) }()
+        case 672: try { try decoder.decodeSingularInt32Field(value: &_storage._next) }()
+        case 673: try { try decoder.decodeSingularInt32Field(value: &_storage._nextByte) }()
+        case 674: try { try decoder.decodeSingularInt32Field(value: &_storage._nextFieldNumber) }()
+        case 675: try { try decoder.decodeSingularInt32Field(value: &_storage._nextVarInt) }()
+        case 676: try { try decoder.decodeSingularInt32Field(value: &_storage._nil) }()
+        case 677: try { try decoder.decodeSingularInt32Field(value: &_storage._nilLiteral) }()
+        case 678: try { try decoder.decodeSingularInt32Field(value: &_storage._noBytesAvailable) }()
+        case 679: try { try decoder.decodeSingularInt32Field(value: &_storage._noStandardDescriptorAccessor) }()
+        case 680: try { try decoder.decodeSingularInt32Field(value: &_storage._nullValue) }()
+        case 681: try { try decoder.decodeSingularInt32Field(value: &_storage._number) }()
+        case 682: try { try decoder.decodeSingularInt32Field(value: &_storage._numberValue) }()
+        case 683: try { try decoder.decodeSingularInt32Field(value: &_storage._objcClassPrefix) }()
+        case 684: try { try decoder.decodeSingularInt32Field(value: &_storage._of) }()
+        case 685: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDecl) }()
+        case 686: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofDescriptorProto) }()
+        case 687: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofIndex) }()
+        case 688: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofOptions) }()
+        case 689: try { try decoder.decodeSingularInt32Field(value: &_storage._oneofs) }()
+        case 690: try { try decoder.decodeSingularInt32Field(value: &_storage._oneOfKind) }()
+        case 691: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeFor) }()
+        case 692: try { try decoder.decodeSingularInt32Field(value: &_storage._optimizeMode) }()
+        case 693: try { try decoder.decodeSingularInt32Field(value: &_storage._option) }()
+        case 694: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalEnumExtensionField) }()
+        case 695: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalExtensionField) }()
+        case 696: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalGroupExtensionField) }()
+        case 697: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalMessageExtensionField) }()
+        case 698: try { try decoder.decodeSingularInt32Field(value: &_storage._optionRetention) }()
+        case 699: try { try decoder.decodeSingularInt32Field(value: &_storage._options) }()
+        case 700: try { try decoder.decodeSingularInt32Field(value: &_storage._optionTargetType) }()
+        case 701: try { try decoder.decodeSingularInt32Field(value: &_storage._other) }()
+        case 702: try { try decoder.decodeSingularInt32Field(value: &_storage._others) }()
+        case 703: try { try decoder.decodeSingularInt32Field(value: &_storage._out) }()
+        case 704: try { try decoder.decodeSingularInt32Field(value: &_storage._outputType) }()
+        case 705: try { try decoder.decodeSingularInt32Field(value: &_storage._overridableFeatures) }()
+        case 706: try { try decoder.decodeSingularInt32Field(value: &_storage._p) }()
+        case 707: try { try decoder.decodeSingularInt32Field(value: &_storage._package) }()
+        case 708: try { try decoder.decodeSingularInt32Field(value: &_storage._packed) }()
+        case 709: try { try decoder.decodeSingularInt32Field(value: &_storage._packedEnumExtensionField) }()
+        case 710: try { try decoder.decodeSingularInt32Field(value: &_storage._packedExtensionField) }()
+        case 711: try { try decoder.decodeSingularInt32Field(value: &_storage._padding) }()
+        case 712: try { try decoder.decodeSingularInt32Field(value: &_storage._parent) }()
+        case 713: try { try decoder.decodeSingularInt32Field(value: &_storage._parse) }()
+        case 714: try { try decoder.decodeSingularInt32Field(value: &_storage._partial) }()
+        case 715: try { try decoder.decodeSingularInt32Field(value: &_storage._path) }()
+        case 716: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecoder) }()
+        case 717: try { try decoder.decodeSingularInt32Field(value: &_storage._pathDecodingError) }()
+        case 718: try { try decoder.decodeSingularInt32Field(value: &_storage._paths) }()
+        case 719: try { try decoder.decodeSingularInt32Field(value: &_storage._pathVisitor) }()
+        case 720: try { try decoder.decodeSingularInt32Field(value: &_storage._payload) }()
+        case 721: try { try decoder.decodeSingularInt32Field(value: &_storage._payloadSize) }()
+        case 722: try { try decoder.decodeSingularInt32Field(value: &_storage._phpClassPrefix) }()
+        case 723: try { try decoder.decodeSingularInt32Field(value: &_storage._phpMetadataNamespace) }()
+        case 724: try { try decoder.decodeSingularInt32Field(value: &_storage._phpNamespace) }()
+        case 725: try { try decoder.decodeSingularInt32Field(value: &_storage._pos) }()
+        case 726: try { try decoder.decodeSingularInt32Field(value: &_storage._positiveIntValue) }()
+        case 727: try { try decoder.decodeSingularInt32Field(value: &_storage._prefix) }()
+        case 728: try { try decoder.decodeSingularInt32Field(value: &_storage._preserveProtoFieldNames) }()
+        case 729: try { try decoder.decodeSingularInt32Field(value: &_storage._preTraverse) }()
+        case 730: try { try decoder.decodeSingularInt32Field(value: &_storage._prevPath) }()
+        case 731: try { try decoder.decodeSingularInt32Field(value: &_storage._printUnknownFields) }()
+        case 732: try { try decoder.decodeSingularInt32Field(value: &_storage._proto2) }()
+        case 733: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3DefaultValue) }()
+        case 734: try { try decoder.decodeSingularInt32Field(value: &_storage._proto3Optional) }()
+        case 735: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversionCheck) }()
+        case 736: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufApiversion2) }()
+        case 737: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBool) }()
+        case 738: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufBytes) }()
+        case 739: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufDouble) }()
+        case 740: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufEnumMap) }()
+        case 741: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtension) }()
+        case 742: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed32) }()
+        case 743: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFixed64) }()
+        case 744: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFloat) }()
+        case 745: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt32) }()
+        case 746: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufInt64) }()
+        case 747: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMap) }()
+        case 748: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufMessageMap) }()
+        case 749: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed32) }()
+        case 750: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSfixed64) }()
+        case 751: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint32) }()
+        case 752: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufSint64) }()
+        case 753: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufString) }()
+        case 754: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint32) }()
+        case 755: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufUint64) }()
+        case 756: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufExtensionFieldValues) }()
+        case 757: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufFieldNumber) }()
+        case 758: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufGeneratedIsEqualTo) }()
+        case 759: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNameMap) }()
+        case 760: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufNewField) }()
+        case 761: try { try decoder.decodeSingularInt32Field(value: &_storage._protobufPackage) }()
+        case 762: try { try decoder.decodeSingularInt32Field(value: &_storage._protocol) }()
+        case 763: try { try decoder.decodeSingularInt32Field(value: &_storage._protoFieldName) }()
+        case 764: try { try decoder.decodeSingularInt32Field(value: &_storage._protoMessageName) }()
+        case 765: try { try decoder.decodeSingularInt32Field(value: &_storage._protoNameProviding) }()
+        case 766: try { try decoder.decodeSingularInt32Field(value: &_storage._protoPaths) }()
+        case 767: try { try decoder.decodeSingularInt32Field(value: &_storage._public) }()
+        case 768: try { try decoder.decodeSingularInt32Field(value: &_storage._publicDependency) }()
+        case 769: try { try decoder.decodeSingularInt32Field(value: &_storage._putBoolValue) }()
+        case 770: try { try decoder.decodeSingularInt32Field(value: &_storage._putBytesValue) }()
+        case 771: try { try decoder.decodeSingularInt32Field(value: &_storage._putDoubleValue) }()
+        case 772: try { try decoder.decodeSingularInt32Field(value: &_storage._putEnumValue) }()
+        case 773: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint32) }()
+        case 774: try { try decoder.decodeSingularInt32Field(value: &_storage._putFixedUint64) }()
+        case 775: try { try decoder.decodeSingularInt32Field(value: &_storage._putFloatValue) }()
+        case 776: try { try decoder.decodeSingularInt32Field(value: &_storage._putInt64) }()
+        case 777: try { try decoder.decodeSingularInt32Field(value: &_storage._putStringValue) }()
+        case 778: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64) }()
+        case 779: try { try decoder.decodeSingularInt32Field(value: &_storage._putUint64Hex) }()
+        case 780: try { try decoder.decodeSingularInt32Field(value: &_storage._putVarInt) }()
+        case 781: try { try decoder.decodeSingularInt32Field(value: &_storage._putZigZagVarInt) }()
+        case 782: try { try decoder.decodeSingularInt32Field(value: &_storage._pyGenericServices) }()
+        case 783: try { try decoder.decodeSingularInt32Field(value: &_storage._r) }()
+        case 784: try { try decoder.decodeSingularInt32Field(value: &_storage._rawChars) }()
+        case 785: try { try decoder.decodeSingularInt32Field(value: &_storage._rawRepresentable) }()
+        case 786: try { try decoder.decodeSingularInt32Field(value: &_storage._rawValue) }()
+        case 787: try { try decoder.decodeSingularInt32Field(value: &_storage._read4HexDigits) }()
+        case 788: try { try decoder.decodeSingularInt32Field(value: &_storage._readBytes) }()
+        case 789: try { try decoder.decodeSingularInt32Field(value: &_storage._register) }()
+        case 790: try { try decoder.decodeSingularInt32Field(value: &_storage._removingAllFieldsOf) }()
+        case 791: try { try decoder.decodeSingularInt32Field(value: &_storage._repeated) }()
+        case 792: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedEnumExtensionField) }()
+        case 793: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedExtensionField) }()
+        case 794: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedFieldEncoding) }()
+        case 795: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedGroupExtensionField) }()
+        case 796: try { try decoder.decodeSingularInt32Field(value: &_storage._repeatedMessageExtensionField) }()
+        case 797: try { try decoder.decodeSingularInt32Field(value: &_storage._repeating) }()
+        case 798: try { try decoder.decodeSingularInt32Field(value: &_storage._replaceRepeatedFields) }()
+        case 799: try { try decoder.decodeSingularInt32Field(value: &_storage._requestStreaming) }()
+        case 800: try { try decoder.decodeSingularInt32Field(value: &_storage._requestTypeURL) }()
+        case 801: try { try decoder.decodeSingularInt32Field(value: &_storage._requiredSize) }()
+        case 802: try { try decoder.decodeSingularInt32Field(value: &_storage._responseStreaming) }()
+        case 803: try { try decoder.decodeSingularInt32Field(value: &_storage._responseTypeURL) }()
+        case 804: try { try decoder.decodeSingularInt32Field(value: &_storage._result) }()
+        case 805: try { try decoder.decodeSingularInt32Field(value: &_storage._retention) }()
+        case 806: try { try decoder.decodeSingularInt32Field(value: &_storage._rethrows) }()
+        case 807: try { try decoder.decodeSingularInt32Field(value: &_storage._return) }()
+        case 808: try { try decoder.decodeSingularInt32Field(value: &_storage._returnType) }()
+        case 809: try { try decoder.decodeSingularInt32Field(value: &_storage._revision) }()
+        case 810: try { try decoder.decodeSingularInt32Field(value: &_storage._rhs) }()
+        case 811: try { try decoder.decodeSingularInt32Field(value: &_storage._root) }()
+        case 812: try { try decoder.decodeSingularInt32Field(value: &_storage._rubyPackage) }()
+        case 813: try { try decoder.decodeSingularInt32Field(value: &_storage._s) }()
+        case 814: try { try decoder.decodeSingularInt32Field(value: &_storage._sawBackslash) }()
+        case 815: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection4Characters) }()
+        case 816: try { try decoder.decodeSingularInt32Field(value: &_storage._sawSection5Characters) }()
+        case 817: try { try decoder.decodeSingularInt32Field(value: &_storage._scan) }()
+        case 818: try { try decoder.decodeSingularInt32Field(value: &_storage._scanner) }()
+        case 819: try { try decoder.decodeSingularInt32Field(value: &_storage._seconds) }()
+        case 820: try { try decoder.decodeSingularInt32Field(value: &_storage._self_p) }()
+        case 821: try { try decoder.decodeSingularInt32Field(value: &_storage._semantic) }()
+        case 822: try { try decoder.decodeSingularInt32Field(value: &_storage._sendable) }()
+        case 823: try { try decoder.decodeSingularInt32Field(value: &_storage._separator) }()
+        case 824: try { try decoder.decodeSingularInt32Field(value: &_storage._serialize) }()
+        case 825: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedBytes) }()
+        case 826: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedData) }()
+        case 827: try { try decoder.decodeSingularInt32Field(value: &_storage._serializedSize) }()
+        case 828: try { try decoder.decodeSingularInt32Field(value: &_storage._serverStreaming) }()
+        case 829: try { try decoder.decodeSingularInt32Field(value: &_storage._service) }()
+        case 830: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceDescriptorProto) }()
+        case 831: try { try decoder.decodeSingularInt32Field(value: &_storage._serviceOptions) }()
+        case 832: try { try decoder.decodeSingularInt32Field(value: &_storage._set) }()
+        case 833: try { try decoder.decodeSingularInt32Field(value: &_storage._setExtensionValue) }()
+        case 834: try { try decoder.decodeSingularInt32Field(value: &_storage._shift) }()
+        case 835: try { try decoder.decodeSingularInt32Field(value: &_storage._simpleExtensionMap) }()
+        case 836: try { try decoder.decodeSingularInt32Field(value: &_storage._size) }()
+        case 837: try { try decoder.decodeSingularInt32Field(value: &_storage._sizer) }()
+        case 838: try { try decoder.decodeSingularInt32Field(value: &_storage._source) }()
+        case 839: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceCodeInfo) }()
+        case 840: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceContext) }()
+        case 841: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceEncoding) }()
+        case 842: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceFile) }()
+        case 843: try { try decoder.decodeSingularInt32Field(value: &_storage._sourceLocation) }()
+        case 844: try { try decoder.decodeSingularInt32Field(value: &_storage._span) }()
+        case 845: try { try decoder.decodeSingularInt32Field(value: &_storage._split) }()
+        case 846: try { try decoder.decodeSingularInt32Field(value: &_storage._start) }()
+        case 847: try { try decoder.decodeSingularInt32Field(value: &_storage._startArray) }()
+        case 848: try { try decoder.decodeSingularInt32Field(value: &_storage._startArrayObject) }()
+        case 849: try { try decoder.decodeSingularInt32Field(value: &_storage._startField) }()
+        case 850: try { try decoder.decodeSingularInt32Field(value: &_storage._startIndex) }()
+        case 851: try { try decoder.decodeSingularInt32Field(value: &_storage._startMessageField) }()
+        case 852: try { try decoder.decodeSingularInt32Field(value: &_storage._startObject) }()
+        case 853: try { try decoder.decodeSingularInt32Field(value: &_storage._startRegularField) }()
+        case 854: try { try decoder.decodeSingularInt32Field(value: &_storage._state) }()
+        case 855: try { try decoder.decodeSingularInt32Field(value: &_storage._static) }()
+        case 856: try { try decoder.decodeSingularInt32Field(value: &_storage._staticString) }()
+        case 857: try { try decoder.decodeSingularInt32Field(value: &_storage._storage) }()
+        case 858: try { try decoder.decodeSingularInt32Field(value: &_storage._string) }()
+        case 859: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteral) }()
+        case 860: try { try decoder.decodeSingularInt32Field(value: &_storage._stringLiteralType) }()
+        case 861: try { try decoder.decodeSingularInt32Field(value: &_storage._stringResult) }()
+        case 862: try { try decoder.decodeSingularInt32Field(value: &_storage._stringValue) }()
+        case 863: try { try decoder.decodeSingularInt32Field(value: &_storage._struct) }()
+        case 864: try { try decoder.decodeSingularInt32Field(value: &_storage._structValue) }()
+        case 865: try { try decoder.decodeSingularInt32Field(value: &_storage._subDecoder) }()
+        case 866: try { try decoder.decodeSingularInt32Field(value: &_storage._subscript) }()
+        case 867: try { try decoder.decodeSingularInt32Field(value: &_storage._subtract) }()
+        case 868: try { try decoder.decodeSingularInt32Field(value: &_storage._subVisitor) }()
+        case 869: try { try decoder.decodeSingularInt32Field(value: &_storage._swift) }()
+        case 870: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftPrefix) }()
+        case 871: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufContiguousBytes) }()
+        case 872: try { try decoder.decodeSingularInt32Field(value: &_storage._swiftProtobufError) }()
+        case 873: try { try decoder.decodeSingularInt32Field(value: &_storage._syntax) }()
+        case 874: try { try decoder.decodeSingularInt32Field(value: &_storage._t) }()
+        case 875: try { try decoder.decodeSingularInt32Field(value: &_storage._tag) }()
+        case 876: try { try decoder.decodeSingularInt32Field(value: &_storage._targets) }()
+        case 877: try { try decoder.decodeSingularInt32Field(value: &_storage._terminator) }()
+        case 878: try { try decoder.decodeSingularInt32Field(value: &_storage._testDecoder) }()
+        case 879: try { try decoder.decodeSingularInt32Field(value: &_storage._text) }()
+        case 880: try { try decoder.decodeSingularInt32Field(value: &_storage._textDecoder) }()
+        case 881: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecoder) }()
+        case 882: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingError) }()
+        case 883: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatDecodingOptions) }()
+        case 884: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingOptions) }()
+        case 885: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatEncodingVisitor) }()
+        case 886: try { try decoder.decodeSingularInt32Field(value: &_storage._textFormatString) }()
+        case 887: try { try decoder.decodeSingularInt32Field(value: &_storage._throwOrIgnore) }()
+        case 888: try { try decoder.decodeSingularInt32Field(value: &_storage._throws) }()
+        case 889: try { try decoder.decodeSingularInt32Field(value: &_storage._timeInterval) }()
+        case 890: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSince1970) }()
+        case 891: try { try decoder.decodeSingularInt32Field(value: &_storage._timeIntervalSinceReferenceDate) }()
+        case 892: try { try decoder.decodeSingularInt32Field(value: &_storage._timestamp) }()
+        case 893: try { try decoder.decodeSingularInt32Field(value: &_storage._tmp) }()
+        case 894: try { try decoder.decodeSingularInt32Field(value: &_storage._tooLarge) }()
+        case 895: try { try decoder.decodeSingularInt32Field(value: &_storage._total) }()
+        case 896: try { try decoder.decodeSingularInt32Field(value: &_storage._totalArrayDepth) }()
+        case 897: try { try decoder.decodeSingularInt32Field(value: &_storage._totalSize) }()
+        case 898: try { try decoder.decodeSingularInt32Field(value: &_storage._trailingComments) }()
+        case 899: try { try decoder.decodeSingularInt32Field(value: &_storage._traverse) }()
+        case 900: try { try decoder.decodeSingularInt32Field(value: &_storage._trim) }()
+        case 901: try { try decoder.decodeSingularInt32Field(value: &_storage._true) }()
+        case 902: try { try decoder.decodeSingularInt32Field(value: &_storage._try) }()
+        case 903: try { try decoder.decodeSingularInt32Field(value: &_storage._type) }()
+        case 904: try { try decoder.decodeSingularInt32Field(value: &_storage._typealias) }()
+        case 905: try { try decoder.decodeSingularInt32Field(value: &_storage._typeEnum) }()
+        case 906: try { try decoder.decodeSingularInt32Field(value: &_storage._typeName) }()
+        case 907: try { try decoder.decodeSingularInt32Field(value: &_storage._typePrefix) }()
+        case 908: try { try decoder.decodeSingularInt32Field(value: &_storage._typeStart) }()
+        case 909: try { try decoder.decodeSingularInt32Field(value: &_storage._typeUnknown) }()
+        case 910: try { try decoder.decodeSingularInt32Field(value: &_storage._typeURL) }()
+        case 911: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32) }()
+        case 912: try { try decoder.decodeSingularInt32Field(value: &_storage._uint32Value) }()
+        case 913: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64) }()
+        case 914: try { try decoder.decodeSingularInt32Field(value: &_storage._uint64Value) }()
+        case 915: try { try decoder.decodeSingularInt32Field(value: &_storage._uint8) }()
+        case 916: try { try decoder.decodeSingularInt32Field(value: &_storage._unchecked) }()
+        case 917: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteral) }()
+        case 918: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarLiteralType) }()
+        case 919: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalars) }()
+        case 920: try { try decoder.decodeSingularInt32Field(value: &_storage._unicodeScalarView) }()
+        case 921: try { try decoder.decodeSingularInt32Field(value: &_storage._uninterpretedOption) }()
+        case 922: try { try decoder.decodeSingularInt32Field(value: &_storage._union) }()
+        case 923: try { try decoder.decodeSingularInt32Field(value: &_storage._uniqueStorage) }()
+        case 924: try { try decoder.decodeSingularInt32Field(value: &_storage._unknown) }()
+        case 925: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownFields_p) }()
+        case 926: try { try decoder.decodeSingularInt32Field(value: &_storage._unknownStorage) }()
+        case 927: try { try decoder.decodeSingularInt32Field(value: &_storage._unpackTo) }()
+        case 928: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeBufferPointer) }()
+        case 929: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutablePointer) }()
+        case 930: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeMutableRawBufferPointer) }()
+        case 931: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawBufferPointer) }()
+        case 932: try { try decoder.decodeSingularInt32Field(value: &_storage._unsafeRawPointer) }()
+        case 933: try { try decoder.decodeSingularInt32Field(value: &_storage._unverifiedLazy) }()
+        case 934: try { try decoder.decodeSingularInt32Field(value: &_storage._updatedOptions) }()
+        case 935: try { try decoder.decodeSingularInt32Field(value: &_storage._url) }()
+        case 936: try { try decoder.decodeSingularInt32Field(value: &_storage._useDeterministicOrdering) }()
+        case 937: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8) }()
+        case 938: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Ptr) }()
+        case 939: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8ToDouble) }()
+        case 940: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8Validation) }()
+        case 941: try { try decoder.decodeSingularInt32Field(value: &_storage._utf8View) }()
+        case 942: try { try decoder.decodeSingularInt32Field(value: &_storage._v) }()
+        case 943: try { try decoder.decodeSingularInt32Field(value: &_storage._value) }()
+        case 944: try { try decoder.decodeSingularInt32Field(value: &_storage._valueField) }()
+        case 945: try { try decoder.decodeSingularInt32Field(value: &_storage._values) }()
+        case 946: try { try decoder.decodeSingularInt32Field(value: &_storage._valueType) }()
+        case 947: try { try decoder.decodeSingularInt32Field(value: &_storage._var) }()
+        case 948: try { try decoder.decodeSingularInt32Field(value: &_storage._verification) }()
+        case 949: try { try decoder.decodeSingularInt32Field(value: &_storage._verificationState) }()
+        case 950: try { try decoder.decodeSingularInt32Field(value: &_storage._version) }()
+        case 951: try { try decoder.decodeSingularInt32Field(value: &_storage._versionString) }()
+        case 952: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFields) }()
+        case 953: try { try decoder.decodeSingularInt32Field(value: &_storage._visitExtensionFieldsAsMessageSet) }()
+        case 954: try { try decoder.decodeSingularInt32Field(value: &_storage._visitMapField) }()
+        case 955: try { try decoder.decodeSingularInt32Field(value: &_storage._visitor) }()
+        case 956: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPacked) }()
+        case 957: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedBoolField) }()
+        case 958: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedDoubleField) }()
+        case 959: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedEnumField) }()
+        case 960: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed32Field) }()
+        case 961: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFixed64Field) }()
+        case 962: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedFloatField) }()
+        case 963: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt32Field) }()
+        case 964: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedInt64Field) }()
+        case 965: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed32Field) }()
+        case 966: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSfixed64Field) }()
+        case 967: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint32Field) }()
+        case 968: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedSint64Field) }()
+        case 969: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint32Field) }()
+        case 970: try { try decoder.decodeSingularInt32Field(value: &_storage._visitPackedUint64Field) }()
+        case 971: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeated) }()
+        case 972: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBoolField) }()
+        case 973: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedBytesField) }()
+        case 974: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedDoubleField) }()
+        case 975: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedEnumField) }()
+        case 976: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed32Field) }()
+        case 977: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFixed64Field) }()
+        case 978: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedFloatField) }()
+        case 979: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedGroupField) }()
+        case 980: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt32Field) }()
+        case 981: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedInt64Field) }()
+        case 982: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedMessageField) }()
+        case 983: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed32Field) }()
+        case 984: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSfixed64Field) }()
+        case 985: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint32Field) }()
+        case 986: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedSint64Field) }()
+        case 987: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedStringField) }()
+        case 988: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint32Field) }()
+        case 989: try { try decoder.decodeSingularInt32Field(value: &_storage._visitRepeatedUint64Field) }()
+        case 990: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingular) }()
+        case 991: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBoolField) }()
+        case 992: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularBytesField) }()
+        case 993: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularDoubleField) }()
+        case 994: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularEnumField) }()
+        case 995: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed32Field) }()
+        case 996: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFixed64Field) }()
+        case 997: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularFloatField) }()
+        case 998: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularGroupField) }()
+        case 999: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt32Field) }()
+        case 1000: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularInt64Field) }()
+        case 1001: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularMessageField) }()
+        case 1002: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed32Field) }()
+        case 1003: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSfixed64Field) }()
+        case 1004: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint32Field) }()
+        case 1005: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularSint64Field) }()
+        case 1006: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularStringField) }()
+        case 1007: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint32Field) }()
+        case 1008: try { try decoder.decodeSingularInt32Field(value: &_storage._visitSingularUint64Field) }()
+        case 1009: try { try decoder.decodeSingularInt32Field(value: &_storage._visitUnknown) }()
+        case 1010: try { try decoder.decodeSingularInt32Field(value: &_storage._wasDecoded) }()
+        case 1011: try { try decoder.decodeSingularInt32Field(value: &_storage._weak) }()
+        case 1012: try { try decoder.decodeSingularInt32Field(value: &_storage._weakDependency) }()
+        case 1013: try { try decoder.decodeSingularInt32Field(value: &_storage._where) }()
+        case 1014: try { try decoder.decodeSingularInt32Field(value: &_storage._wireFormat) }()
+        case 1015: try { try decoder.decodeSingularInt32Field(value: &_storage._with) }()
+        case 1016: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeBytes) }()
+        case 1017: try { try decoder.decodeSingularInt32Field(value: &_storage._withUnsafeMutableBytes) }()
+        case 1018: try { try decoder.decodeSingularInt32Field(value: &_storage._work) }()
+        case 1019: try { try decoder.decodeSingularInt32Field(value: &_storage._wrapped) }()
+        case 1020: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedType) }()
+        case 1021: try { try decoder.decodeSingularInt32Field(value: &_storage._wrappedValue) }()
+        case 1022: try { try decoder.decodeSingularInt32Field(value: &_storage._written) }()
+        case 1023: try { try decoder.decodeSingularInt32Field(value: &_storage._yday) }()
         default: break
         }
       }
@@ -9518,2765 +9581,2786 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
       if _storage._clearEnd_p != 0 {
         try visitor.visitSingularInt32Field(value: _storage._clearEnd_p, fieldNumber: 96)
       }
+      if _storage._clearEnforceNamingStyle_p != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._clearEnforceNamingStyle_p, fieldNumber: 97)
+      }
       if _storage._clearEnumType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearEnumType_p, fieldNumber: 97)
+        try visitor.visitSingularInt32Field(value: _storage._clearEnumType_p, fieldNumber: 98)
       }
       if _storage._clearExtendee_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearExtendee_p, fieldNumber: 98)
+        try visitor.visitSingularInt32Field(value: _storage._clearExtendee_p, fieldNumber: 99)
       }
       if _storage._clearExtensionValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearExtensionValue_p, fieldNumber: 99)
+        try visitor.visitSingularInt32Field(value: _storage._clearExtensionValue_p, fieldNumber: 100)
       }
       if _storage._clearFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFeatures_p, fieldNumber: 100)
+        try visitor.visitSingularInt32Field(value: _storage._clearFeatures_p, fieldNumber: 101)
       }
       if _storage._clearFeatureSupport_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFeatureSupport_p, fieldNumber: 101)
+        try visitor.visitSingularInt32Field(value: _storage._clearFeatureSupport_p, fieldNumber: 102)
       }
       if _storage._clearFieldPresence_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFieldPresence_p, fieldNumber: 102)
+        try visitor.visitSingularInt32Field(value: _storage._clearFieldPresence_p, fieldNumber: 103)
       }
       if _storage._clearFixedFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFixedFeatures_p, fieldNumber: 103)
+        try visitor.visitSingularInt32Field(value: _storage._clearFixedFeatures_p, fieldNumber: 104)
       }
       if _storage._clearFullName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearFullName_p, fieldNumber: 104)
+        try visitor.visitSingularInt32Field(value: _storage._clearFullName_p, fieldNumber: 105)
       }
       if _storage._clearGoPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearGoPackage_p, fieldNumber: 105)
+        try visitor.visitSingularInt32Field(value: _storage._clearGoPackage_p, fieldNumber: 106)
       }
       if _storage._clearIdempotencyLevel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIdempotencyLevel_p, fieldNumber: 106)
+        try visitor.visitSingularInt32Field(value: _storage._clearIdempotencyLevel_p, fieldNumber: 107)
       }
       if _storage._clearIdentifierValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIdentifierValue_p, fieldNumber: 107)
+        try visitor.visitSingularInt32Field(value: _storage._clearIdentifierValue_p, fieldNumber: 108)
       }
       if _storage._clearInputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearInputType_p, fieldNumber: 108)
+        try visitor.visitSingularInt32Field(value: _storage._clearInputType_p, fieldNumber: 109)
       }
       if _storage._clearIsExtension_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearIsExtension_p, fieldNumber: 109)
+        try visitor.visitSingularInt32Field(value: _storage._clearIsExtension_p, fieldNumber: 110)
       }
       if _storage._clearJavaGenerateEqualsAndHash_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenerateEqualsAndHash_p, fieldNumber: 110)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenerateEqualsAndHash_p, fieldNumber: 111)
       }
       if _storage._clearJavaGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenericServices_p, fieldNumber: 111)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaGenericServices_p, fieldNumber: 112)
       }
       if _storage._clearJavaMultipleFiles_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaMultipleFiles_p, fieldNumber: 112)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaMultipleFiles_p, fieldNumber: 113)
       }
       if _storage._clearJavaOuterClassname_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaOuterClassname_p, fieldNumber: 113)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaOuterClassname_p, fieldNumber: 114)
       }
       if _storage._clearJavaPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaPackage_p, fieldNumber: 114)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaPackage_p, fieldNumber: 115)
       }
       if _storage._clearJavaStringCheckUtf8_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJavaStringCheckUtf8_p, fieldNumber: 115)
+        try visitor.visitSingularInt32Field(value: _storage._clearJavaStringCheckUtf8_p, fieldNumber: 116)
       }
       if _storage._clearJsonFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJsonFormat_p, fieldNumber: 116)
+        try visitor.visitSingularInt32Field(value: _storage._clearJsonFormat_p, fieldNumber: 117)
       }
       if _storage._clearJsonName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJsonName_p, fieldNumber: 117)
+        try visitor.visitSingularInt32Field(value: _storage._clearJsonName_p, fieldNumber: 118)
       }
       if _storage._clearJstype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearJstype_p, fieldNumber: 118)
+        try visitor.visitSingularInt32Field(value: _storage._clearJstype_p, fieldNumber: 119)
       }
       if _storage._clearLabel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLabel_p, fieldNumber: 119)
+        try visitor.visitSingularInt32Field(value: _storage._clearLabel_p, fieldNumber: 120)
       }
       if _storage._clearLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLazy_p, fieldNumber: 120)
+        try visitor.visitSingularInt32Field(value: _storage._clearLazy_p, fieldNumber: 121)
       }
       if _storage._clearLeadingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearLeadingComments_p, fieldNumber: 121)
+        try visitor.visitSingularInt32Field(value: _storage._clearLeadingComments_p, fieldNumber: 122)
       }
       if _storage._clearMapEntry_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMapEntry_p, fieldNumber: 122)
+        try visitor.visitSingularInt32Field(value: _storage._clearMapEntry_p, fieldNumber: 123)
       }
       if _storage._clearMaximumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMaximumEdition_p, fieldNumber: 123)
+        try visitor.visitSingularInt32Field(value: _storage._clearMaximumEdition_p, fieldNumber: 124)
       }
       if _storage._clearMessageEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMessageEncoding_p, fieldNumber: 124)
+        try visitor.visitSingularInt32Field(value: _storage._clearMessageEncoding_p, fieldNumber: 125)
       }
       if _storage._clearMessageSetWireFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMessageSetWireFormat_p, fieldNumber: 125)
+        try visitor.visitSingularInt32Field(value: _storage._clearMessageSetWireFormat_p, fieldNumber: 126)
       }
       if _storage._clearMinimumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearMinimumEdition_p, fieldNumber: 126)
+        try visitor.visitSingularInt32Field(value: _storage._clearMinimumEdition_p, fieldNumber: 127)
       }
       if _storage._clearName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearName_p, fieldNumber: 127)
+        try visitor.visitSingularInt32Field(value: _storage._clearName_p, fieldNumber: 128)
       }
       if _storage._clearNamePart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNamePart_p, fieldNumber: 128)
+        try visitor.visitSingularInt32Field(value: _storage._clearNamePart_p, fieldNumber: 129)
       }
       if _storage._clearNegativeIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNegativeIntValue_p, fieldNumber: 129)
+        try visitor.visitSingularInt32Field(value: _storage._clearNegativeIntValue_p, fieldNumber: 130)
       }
       if _storage._clearNoStandardDescriptorAccessor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNoStandardDescriptorAccessor_p, fieldNumber: 130)
+        try visitor.visitSingularInt32Field(value: _storage._clearNoStandardDescriptorAccessor_p, fieldNumber: 131)
       }
       if _storage._clearNumber_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearNumber_p, fieldNumber: 131)
+        try visitor.visitSingularInt32Field(value: _storage._clearNumber_p, fieldNumber: 132)
       }
       if _storage._clearObjcClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearObjcClassPrefix_p, fieldNumber: 132)
+        try visitor.visitSingularInt32Field(value: _storage._clearObjcClassPrefix_p, fieldNumber: 133)
       }
       if _storage._clearOneofIndex_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOneofIndex_p, fieldNumber: 133)
+        try visitor.visitSingularInt32Field(value: _storage._clearOneofIndex_p, fieldNumber: 134)
       }
       if _storage._clearOptimizeFor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOptimizeFor_p, fieldNumber: 134)
+        try visitor.visitSingularInt32Field(value: _storage._clearOptimizeFor_p, fieldNumber: 135)
       }
       if _storage._clearOptions_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOptions_p, fieldNumber: 135)
+        try visitor.visitSingularInt32Field(value: _storage._clearOptions_p, fieldNumber: 136)
       }
       if _storage._clearOutputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOutputType_p, fieldNumber: 136)
+        try visitor.visitSingularInt32Field(value: _storage._clearOutputType_p, fieldNumber: 137)
       }
       if _storage._clearOverridableFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearOverridableFeatures_p, fieldNumber: 137)
+        try visitor.visitSingularInt32Field(value: _storage._clearOverridableFeatures_p, fieldNumber: 138)
       }
       if _storage._clearPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPackage_p, fieldNumber: 138)
+        try visitor.visitSingularInt32Field(value: _storage._clearPackage_p, fieldNumber: 139)
       }
       if _storage._clearPacked_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPacked_p, fieldNumber: 139)
+        try visitor.visitSingularInt32Field(value: _storage._clearPacked_p, fieldNumber: 140)
       }
       if _storage._clearPhpClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpClassPrefix_p, fieldNumber: 140)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpClassPrefix_p, fieldNumber: 141)
       }
       if _storage._clearPhpMetadataNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpMetadataNamespace_p, fieldNumber: 141)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpMetadataNamespace_p, fieldNumber: 142)
       }
       if _storage._clearPhpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPhpNamespace_p, fieldNumber: 142)
+        try visitor.visitSingularInt32Field(value: _storage._clearPhpNamespace_p, fieldNumber: 143)
       }
       if _storage._clearPositiveIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPositiveIntValue_p, fieldNumber: 143)
+        try visitor.visitSingularInt32Field(value: _storage._clearPositiveIntValue_p, fieldNumber: 144)
       }
       if _storage._clearProto3Optional_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearProto3Optional_p, fieldNumber: 144)
+        try visitor.visitSingularInt32Field(value: _storage._clearProto3Optional_p, fieldNumber: 145)
       }
       if _storage._clearPyGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearPyGenericServices_p, fieldNumber: 145)
+        try visitor.visitSingularInt32Field(value: _storage._clearPyGenericServices_p, fieldNumber: 146)
       }
       if _storage._clearRepeated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRepeated_p, fieldNumber: 146)
+        try visitor.visitSingularInt32Field(value: _storage._clearRepeated_p, fieldNumber: 147)
       }
       if _storage._clearRepeatedFieldEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRepeatedFieldEncoding_p, fieldNumber: 147)
+        try visitor.visitSingularInt32Field(value: _storage._clearRepeatedFieldEncoding_p, fieldNumber: 148)
       }
       if _storage._clearReserved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearReserved_p, fieldNumber: 148)
+        try visitor.visitSingularInt32Field(value: _storage._clearReserved_p, fieldNumber: 149)
       }
       if _storage._clearRetention_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRetention_p, fieldNumber: 149)
+        try visitor.visitSingularInt32Field(value: _storage._clearRetention_p, fieldNumber: 150)
       }
       if _storage._clearRubyPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearRubyPackage_p, fieldNumber: 150)
+        try visitor.visitSingularInt32Field(value: _storage._clearRubyPackage_p, fieldNumber: 151)
       }
       if _storage._clearSemantic_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSemantic_p, fieldNumber: 151)
+        try visitor.visitSingularInt32Field(value: _storage._clearSemantic_p, fieldNumber: 152)
       }
       if _storage._clearServerStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearServerStreaming_p, fieldNumber: 152)
+        try visitor.visitSingularInt32Field(value: _storage._clearServerStreaming_p, fieldNumber: 153)
       }
       if _storage._clearSourceCodeInfo_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceCodeInfo_p, fieldNumber: 153)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceCodeInfo_p, fieldNumber: 154)
       }
       if _storage._clearSourceContext_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceContext_p, fieldNumber: 154)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceContext_p, fieldNumber: 155)
       }
       if _storage._clearSourceFile_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSourceFile_p, fieldNumber: 155)
+        try visitor.visitSingularInt32Field(value: _storage._clearSourceFile_p, fieldNumber: 156)
       }
       if _storage._clearStart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearStart_p, fieldNumber: 156)
+        try visitor.visitSingularInt32Field(value: _storage._clearStart_p, fieldNumber: 157)
       }
       if _storage._clearStringValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearStringValue_p, fieldNumber: 157)
+        try visitor.visitSingularInt32Field(value: _storage._clearStringValue_p, fieldNumber: 158)
       }
       if _storage._clearSwiftPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSwiftPrefix_p, fieldNumber: 158)
+        try visitor.visitSingularInt32Field(value: _storage._clearSwiftPrefix_p, fieldNumber: 159)
       }
       if _storage._clearSyntax_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearSyntax_p, fieldNumber: 159)
+        try visitor.visitSingularInt32Field(value: _storage._clearSyntax_p, fieldNumber: 160)
       }
       if _storage._clearTrailingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearTrailingComments_p, fieldNumber: 160)
+        try visitor.visitSingularInt32Field(value: _storage._clearTrailingComments_p, fieldNumber: 161)
       }
       if _storage._clearType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearType_p, fieldNumber: 161)
+        try visitor.visitSingularInt32Field(value: _storage._clearType_p, fieldNumber: 162)
       }
       if _storage._clearTypeName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearTypeName_p, fieldNumber: 162)
+        try visitor.visitSingularInt32Field(value: _storage._clearTypeName_p, fieldNumber: 163)
       }
       if _storage._clearUnverifiedLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearUnverifiedLazy_p, fieldNumber: 163)
+        try visitor.visitSingularInt32Field(value: _storage._clearUnverifiedLazy_p, fieldNumber: 164)
       }
       if _storage._clearUtf8Validation_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearUtf8Validation_p, fieldNumber: 164)
+        try visitor.visitSingularInt32Field(value: _storage._clearUtf8Validation_p, fieldNumber: 165)
       }
       if _storage._clearValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearValue_p, fieldNumber: 165)
+        try visitor.visitSingularInt32Field(value: _storage._clearValue_p, fieldNumber: 166)
       }
       if _storage._clearVerification_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearVerification_p, fieldNumber: 166)
+        try visitor.visitSingularInt32Field(value: _storage._clearVerification_p, fieldNumber: 167)
       }
       if _storage._clearWeak_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clearWeak_p, fieldNumber: 167)
+        try visitor.visitSingularInt32Field(value: _storage._clearWeak_p, fieldNumber: 168)
       }
       if _storage._clientStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._clientStreaming, fieldNumber: 168)
+        try visitor.visitSingularInt32Field(value: _storage._clientStreaming, fieldNumber: 169)
       }
       if _storage._code != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._code, fieldNumber: 169)
+        try visitor.visitSingularInt32Field(value: _storage._code, fieldNumber: 170)
       }
       if _storage._codePoint != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._codePoint, fieldNumber: 170)
+        try visitor.visitSingularInt32Field(value: _storage._codePoint, fieldNumber: 171)
       }
       if _storage._codeUnits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._codeUnits, fieldNumber: 171)
+        try visitor.visitSingularInt32Field(value: _storage._codeUnits, fieldNumber: 172)
       }
       if _storage._collection != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._collection, fieldNumber: 172)
+        try visitor.visitSingularInt32Field(value: _storage._collection, fieldNumber: 173)
       }
       if _storage._com != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._com, fieldNumber: 173)
+        try visitor.visitSingularInt32Field(value: _storage._com, fieldNumber: 174)
       }
       if _storage._comma != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._comma, fieldNumber: 174)
+        try visitor.visitSingularInt32Field(value: _storage._comma, fieldNumber: 175)
       }
       if _storage._consumedBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._consumedBytes, fieldNumber: 175)
+        try visitor.visitSingularInt32Field(value: _storage._consumedBytes, fieldNumber: 176)
       }
       if _storage._contains != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contains, fieldNumber: 176)
+        try visitor.visitSingularInt32Field(value: _storage._contains, fieldNumber: 177)
       }
       if _storage._contentsOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contentsOf, fieldNumber: 177)
+        try visitor.visitSingularInt32Field(value: _storage._contentsOf, fieldNumber: 178)
       }
       if _storage._contiguousBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._contiguousBytes, fieldNumber: 178)
+        try visitor.visitSingularInt32Field(value: _storage._contiguousBytes, fieldNumber: 179)
       }
       if _storage._copy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._copy, fieldNumber: 179)
+        try visitor.visitSingularInt32Field(value: _storage._copy, fieldNumber: 180)
       }
       if _storage._count != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._count, fieldNumber: 180)
+        try visitor.visitSingularInt32Field(value: _storage._count, fieldNumber: 181)
       }
       if _storage._countVarintsInBuffer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._countVarintsInBuffer, fieldNumber: 181)
+        try visitor.visitSingularInt32Field(value: _storage._countVarintsInBuffer, fieldNumber: 182)
       }
       if _storage._csharpNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._csharpNamespace, fieldNumber: 182)
+        try visitor.visitSingularInt32Field(value: _storage._csharpNamespace, fieldNumber: 183)
       }
       if _storage._ctype != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ctype, fieldNumber: 183)
+        try visitor.visitSingularInt32Field(value: _storage._ctype, fieldNumber: 184)
       }
       if _storage._customCodable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customCodable, fieldNumber: 184)
+        try visitor.visitSingularInt32Field(value: _storage._customCodable, fieldNumber: 185)
       }
       if _storage._customDebugStringConvertible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customDebugStringConvertible, fieldNumber: 185)
+        try visitor.visitSingularInt32Field(value: _storage._customDebugStringConvertible, fieldNumber: 186)
       }
       if _storage._customStringConvertible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._customStringConvertible, fieldNumber: 186)
+        try visitor.visitSingularInt32Field(value: _storage._customStringConvertible, fieldNumber: 187)
       }
       if _storage._d != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._d, fieldNumber: 187)
+        try visitor.visitSingularInt32Field(value: _storage._d, fieldNumber: 188)
       }
       if _storage._data != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._data, fieldNumber: 188)
+        try visitor.visitSingularInt32Field(value: _storage._data, fieldNumber: 189)
       }
       if _storage._dataResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dataResult, fieldNumber: 189)
+        try visitor.visitSingularInt32Field(value: _storage._dataResult, fieldNumber: 190)
       }
       if _storage._date != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._date, fieldNumber: 190)
+        try visitor.visitSingularInt32Field(value: _storage._date, fieldNumber: 191)
       }
       if _storage._daySec != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._daySec, fieldNumber: 191)
+        try visitor.visitSingularInt32Field(value: _storage._daySec, fieldNumber: 192)
       }
       if _storage._daysSinceEpoch != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._daysSinceEpoch, fieldNumber: 192)
+        try visitor.visitSingularInt32Field(value: _storage._daysSinceEpoch, fieldNumber: 193)
       }
       if _storage._debugDescription_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._debugDescription_p, fieldNumber: 193)
+        try visitor.visitSingularInt32Field(value: _storage._debugDescription_p, fieldNumber: 194)
       }
       if _storage._debugRedact != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._debugRedact, fieldNumber: 194)
+        try visitor.visitSingularInt32Field(value: _storage._debugRedact, fieldNumber: 195)
       }
       if _storage._declaration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._declaration, fieldNumber: 195)
+        try visitor.visitSingularInt32Field(value: _storage._declaration, fieldNumber: 196)
       }
       if _storage._decoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decoded, fieldNumber: 196)
+        try visitor.visitSingularInt32Field(value: _storage._decoded, fieldNumber: 197)
       }
       if _storage._decodedFromJsonnull != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodedFromJsonnull, fieldNumber: 197)
+        try visitor.visitSingularInt32Field(value: _storage._decodedFromJsonnull, fieldNumber: 198)
       }
       if _storage._decodeExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionField, fieldNumber: 198)
+        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionField, fieldNumber: 199)
       }
       if _storage._decodeExtensionFieldsAsMessageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionFieldsAsMessageSet, fieldNumber: 199)
+        try visitor.visitSingularInt32Field(value: _storage._decodeExtensionFieldsAsMessageSet, fieldNumber: 200)
       }
       if _storage._decodeJson != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeJson, fieldNumber: 200)
+        try visitor.visitSingularInt32Field(value: _storage._decodeJson, fieldNumber: 201)
       }
       if _storage._decodeMapField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeMapField, fieldNumber: 201)
+        try visitor.visitSingularInt32Field(value: _storage._decodeMapField, fieldNumber: 202)
       }
       if _storage._decodeMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeMessage, fieldNumber: 202)
+        try visitor.visitSingularInt32Field(value: _storage._decodeMessage, fieldNumber: 203)
       }
       if _storage._decoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decoder, fieldNumber: 203)
+        try visitor.visitSingularInt32Field(value: _storage._decoder, fieldNumber: 204)
       }
       if _storage._decodeRepeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeated, fieldNumber: 204)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeated, fieldNumber: 205)
       }
       if _storage._decodeRepeatedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBoolField, fieldNumber: 205)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBoolField, fieldNumber: 206)
       }
       if _storage._decodeRepeatedBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBytesField, fieldNumber: 206)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedBytesField, fieldNumber: 207)
       }
       if _storage._decodeRepeatedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedDoubleField, fieldNumber: 207)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedDoubleField, fieldNumber: 208)
       }
       if _storage._decodeRepeatedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedEnumField, fieldNumber: 208)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedEnumField, fieldNumber: 209)
       }
       if _storage._decodeRepeatedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed32Field, fieldNumber: 209)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed32Field, fieldNumber: 210)
       }
       if _storage._decodeRepeatedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed64Field, fieldNumber: 210)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFixed64Field, fieldNumber: 211)
       }
       if _storage._decodeRepeatedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFloatField, fieldNumber: 211)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedFloatField, fieldNumber: 212)
       }
       if _storage._decodeRepeatedGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedGroupField, fieldNumber: 212)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedGroupField, fieldNumber: 213)
       }
       if _storage._decodeRepeatedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt32Field, fieldNumber: 213)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt32Field, fieldNumber: 214)
       }
       if _storage._decodeRepeatedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt64Field, fieldNumber: 214)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedInt64Field, fieldNumber: 215)
       }
       if _storage._decodeRepeatedMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedMessageField, fieldNumber: 215)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedMessageField, fieldNumber: 216)
       }
       if _storage._decodeRepeatedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed32Field, fieldNumber: 216)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed32Field, fieldNumber: 217)
       }
       if _storage._decodeRepeatedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed64Field, fieldNumber: 217)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSfixed64Field, fieldNumber: 218)
       }
       if _storage._decodeRepeatedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint32Field, fieldNumber: 218)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint32Field, fieldNumber: 219)
       }
       if _storage._decodeRepeatedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint64Field, fieldNumber: 219)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedSint64Field, fieldNumber: 220)
       }
       if _storage._decodeRepeatedStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedStringField, fieldNumber: 220)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedStringField, fieldNumber: 221)
       }
       if _storage._decodeRepeatedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint32Field, fieldNumber: 221)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint32Field, fieldNumber: 222)
       }
       if _storage._decodeRepeatedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint64Field, fieldNumber: 222)
+        try visitor.visitSingularInt32Field(value: _storage._decodeRepeatedUint64Field, fieldNumber: 223)
       }
       if _storage._decodeSingular != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingular, fieldNumber: 223)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingular, fieldNumber: 224)
       }
       if _storage._decodeSingularBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBoolField, fieldNumber: 224)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBoolField, fieldNumber: 225)
       }
       if _storage._decodeSingularBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBytesField, fieldNumber: 225)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularBytesField, fieldNumber: 226)
       }
       if _storage._decodeSingularDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularDoubleField, fieldNumber: 226)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularDoubleField, fieldNumber: 227)
       }
       if _storage._decodeSingularEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularEnumField, fieldNumber: 227)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularEnumField, fieldNumber: 228)
       }
       if _storage._decodeSingularFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed32Field, fieldNumber: 228)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed32Field, fieldNumber: 229)
       }
       if _storage._decodeSingularFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed64Field, fieldNumber: 229)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFixed64Field, fieldNumber: 230)
       }
       if _storage._decodeSingularFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFloatField, fieldNumber: 230)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularFloatField, fieldNumber: 231)
       }
       if _storage._decodeSingularGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularGroupField, fieldNumber: 231)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularGroupField, fieldNumber: 232)
       }
       if _storage._decodeSingularInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt32Field, fieldNumber: 232)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt32Field, fieldNumber: 233)
       }
       if _storage._decodeSingularInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt64Field, fieldNumber: 233)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularInt64Field, fieldNumber: 234)
       }
       if _storage._decodeSingularMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularMessageField, fieldNumber: 234)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularMessageField, fieldNumber: 235)
       }
       if _storage._decodeSingularSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed32Field, fieldNumber: 235)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed32Field, fieldNumber: 236)
       }
       if _storage._decodeSingularSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed64Field, fieldNumber: 236)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSfixed64Field, fieldNumber: 237)
       }
       if _storage._decodeSingularSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint32Field, fieldNumber: 237)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint32Field, fieldNumber: 238)
       }
       if _storage._decodeSingularSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint64Field, fieldNumber: 238)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularSint64Field, fieldNumber: 239)
       }
       if _storage._decodeSingularStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularStringField, fieldNumber: 239)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularStringField, fieldNumber: 240)
       }
       if _storage._decodeSingularUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint32Field, fieldNumber: 240)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint32Field, fieldNumber: 241)
       }
       if _storage._decodeSingularUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint64Field, fieldNumber: 241)
+        try visitor.visitSingularInt32Field(value: _storage._decodeSingularUint64Field, fieldNumber: 242)
       }
       if _storage._decodeTextFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._decodeTextFormat, fieldNumber: 242)
+        try visitor.visitSingularInt32Field(value: _storage._decodeTextFormat, fieldNumber: 243)
       }
       if _storage._defaultAnyTypeUrlprefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaultAnyTypeUrlprefix, fieldNumber: 243)
+        try visitor.visitSingularInt32Field(value: _storage._defaultAnyTypeUrlprefix, fieldNumber: 244)
       }
       if _storage._defaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaults, fieldNumber: 244)
+        try visitor.visitSingularInt32Field(value: _storage._defaults, fieldNumber: 245)
       }
       if _storage._defaultValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._defaultValue, fieldNumber: 245)
+        try visitor.visitSingularInt32Field(value: _storage._defaultValue, fieldNumber: 246)
       }
       if _storage._dependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dependency, fieldNumber: 246)
+        try visitor.visitSingularInt32Field(value: _storage._dependency, fieldNumber: 247)
       }
       if _storage._deprecated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecated, fieldNumber: 247)
+        try visitor.visitSingularInt32Field(value: _storage._deprecated, fieldNumber: 248)
       }
       if _storage._deprecatedLegacyJsonFieldConflicts != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecatedLegacyJsonFieldConflicts, fieldNumber: 248)
+        try visitor.visitSingularInt32Field(value: _storage._deprecatedLegacyJsonFieldConflicts, fieldNumber: 249)
       }
       if _storage._deprecationWarning != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._deprecationWarning, fieldNumber: 249)
+        try visitor.visitSingularInt32Field(value: _storage._deprecationWarning, fieldNumber: 250)
       }
       if _storage._description_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._description_p, fieldNumber: 250)
+        try visitor.visitSingularInt32Field(value: _storage._description_p, fieldNumber: 251)
       }
       if _storage._descriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._descriptorProto, fieldNumber: 251)
+        try visitor.visitSingularInt32Field(value: _storage._descriptorProto, fieldNumber: 252)
       }
       if _storage._dictionary != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dictionary, fieldNumber: 252)
+        try visitor.visitSingularInt32Field(value: _storage._dictionary, fieldNumber: 253)
       }
       if _storage._dictionaryLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._dictionaryLiteral, fieldNumber: 253)
+        try visitor.visitSingularInt32Field(value: _storage._dictionaryLiteral, fieldNumber: 254)
       }
       if _storage._digit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit, fieldNumber: 254)
+        try visitor.visitSingularInt32Field(value: _storage._digit, fieldNumber: 255)
       }
       if _storage._digit0 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit0, fieldNumber: 255)
+        try visitor.visitSingularInt32Field(value: _storage._digit0, fieldNumber: 256)
       }
       if _storage._digit1 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digit1, fieldNumber: 256)
+        try visitor.visitSingularInt32Field(value: _storage._digit1, fieldNumber: 257)
       }
       if _storage._digitCount != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digitCount, fieldNumber: 257)
+        try visitor.visitSingularInt32Field(value: _storage._digitCount, fieldNumber: 258)
       }
       if _storage._digits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digits, fieldNumber: 258)
+        try visitor.visitSingularInt32Field(value: _storage._digits, fieldNumber: 259)
       }
       if _storage._digitValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._digitValue, fieldNumber: 259)
+        try visitor.visitSingularInt32Field(value: _storage._digitValue, fieldNumber: 260)
       }
       if _storage._discardableResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._discardableResult, fieldNumber: 260)
+        try visitor.visitSingularInt32Field(value: _storage._discardableResult, fieldNumber: 261)
       }
       if _storage._discardUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._discardUnknownFields, fieldNumber: 261)
+        try visitor.visitSingularInt32Field(value: _storage._discardUnknownFields, fieldNumber: 262)
       }
       if _storage._double != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._double, fieldNumber: 262)
+        try visitor.visitSingularInt32Field(value: _storage._double, fieldNumber: 263)
       }
       if _storage._doubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._doubleValue, fieldNumber: 263)
+        try visitor.visitSingularInt32Field(value: _storage._doubleValue, fieldNumber: 264)
       }
       if _storage._duration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._duration, fieldNumber: 264)
+        try visitor.visitSingularInt32Field(value: _storage._duration, fieldNumber: 265)
       }
       if _storage._e != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._e, fieldNumber: 265)
+        try visitor.visitSingularInt32Field(value: _storage._e, fieldNumber: 266)
       }
       if _storage._edition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._edition, fieldNumber: 266)
+        try visitor.visitSingularInt32Field(value: _storage._edition, fieldNumber: 267)
       }
       if _storage._editionDefault != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDefault, fieldNumber: 267)
+        try visitor.visitSingularInt32Field(value: _storage._editionDefault, fieldNumber: 268)
       }
       if _storage._editionDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDefaults, fieldNumber: 268)
+        try visitor.visitSingularInt32Field(value: _storage._editionDefaults, fieldNumber: 269)
       }
       if _storage._editionDeprecated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionDeprecated, fieldNumber: 269)
+        try visitor.visitSingularInt32Field(value: _storage._editionDeprecated, fieldNumber: 270)
       }
       if _storage._editionIntroduced != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionIntroduced, fieldNumber: 270)
+        try visitor.visitSingularInt32Field(value: _storage._editionIntroduced, fieldNumber: 271)
       }
       if _storage._editionRemoved != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._editionRemoved, fieldNumber: 271)
+        try visitor.visitSingularInt32Field(value: _storage._editionRemoved, fieldNumber: 272)
       }
       if _storage._element != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._element, fieldNumber: 272)
+        try visitor.visitSingularInt32Field(value: _storage._element, fieldNumber: 273)
       }
       if _storage._elements != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._elements, fieldNumber: 273)
+        try visitor.visitSingularInt32Field(value: _storage._elements, fieldNumber: 274)
       }
       if _storage._else != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._else, fieldNumber: 274)
+        try visitor.visitSingularInt32Field(value: _storage._else, fieldNumber: 275)
       }
       if _storage._emitExtensionFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitExtensionFieldName, fieldNumber: 275)
+        try visitor.visitSingularInt32Field(value: _storage._emitExtensionFieldName, fieldNumber: 276)
       }
       if _storage._emitFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitFieldName, fieldNumber: 276)
+        try visitor.visitSingularInt32Field(value: _storage._emitFieldName, fieldNumber: 277)
       }
       if _storage._emitFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emitFieldNumber, fieldNumber: 277)
+        try visitor.visitSingularInt32Field(value: _storage._emitFieldNumber, fieldNumber: 278)
       }
       if _storage._empty != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._empty, fieldNumber: 278)
+        try visitor.visitSingularInt32Field(value: _storage._empty, fieldNumber: 279)
+      }
+      if _storage._emptyAnyTypeURL != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._emptyAnyTypeURL, fieldNumber: 280)
       }
       if _storage._emptyData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._emptyData, fieldNumber: 279)
+        try visitor.visitSingularInt32Field(value: _storage._emptyData, fieldNumber: 281)
       }
       if _storage._encodeAsBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodeAsBytes, fieldNumber: 280)
+        try visitor.visitSingularInt32Field(value: _storage._encodeAsBytes, fieldNumber: 282)
       }
       if _storage._encoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encoded, fieldNumber: 281)
+        try visitor.visitSingularInt32Field(value: _storage._encoded, fieldNumber: 283)
       }
       if _storage._encodedJsonstring != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodedJsonstring, fieldNumber: 282)
+        try visitor.visitSingularInt32Field(value: _storage._encodedJsonstring, fieldNumber: 284)
       }
       if _storage._encodedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodedSize, fieldNumber: 283)
+        try visitor.visitSingularInt32Field(value: _storage._encodedSize, fieldNumber: 285)
       }
       if _storage._encodeField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encodeField, fieldNumber: 284)
+        try visitor.visitSingularInt32Field(value: _storage._encodeField, fieldNumber: 286)
       }
       if _storage._encoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._encoder, fieldNumber: 285)
+        try visitor.visitSingularInt32Field(value: _storage._encoder, fieldNumber: 287)
       }
       if _storage._end != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._end, fieldNumber: 286)
+        try visitor.visitSingularInt32Field(value: _storage._end, fieldNumber: 288)
       }
       if _storage._endArray != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endArray, fieldNumber: 287)
+        try visitor.visitSingularInt32Field(value: _storage._endArray, fieldNumber: 289)
       }
       if _storage._endMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endMessageField, fieldNumber: 288)
+        try visitor.visitSingularInt32Field(value: _storage._endMessageField, fieldNumber: 290)
       }
       if _storage._endObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endObject, fieldNumber: 289)
+        try visitor.visitSingularInt32Field(value: _storage._endObject, fieldNumber: 291)
       }
       if _storage._endRegularField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._endRegularField, fieldNumber: 290)
+        try visitor.visitSingularInt32Field(value: _storage._endRegularField, fieldNumber: 292)
+      }
+      if _storage._enforceNamingStyle != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._enforceNamingStyle, fieldNumber: 293)
       }
       if _storage._enum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enum, fieldNumber: 291)
+        try visitor.visitSingularInt32Field(value: _storage._enum, fieldNumber: 294)
       }
       if _storage._enumDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumDescriptorProto, fieldNumber: 292)
+        try visitor.visitSingularInt32Field(value: _storage._enumDescriptorProto, fieldNumber: 295)
       }
       if _storage._enumOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumOptions, fieldNumber: 293)
+        try visitor.visitSingularInt32Field(value: _storage._enumOptions, fieldNumber: 296)
       }
       if _storage._enumReservedRange != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumReservedRange, fieldNumber: 294)
+        try visitor.visitSingularInt32Field(value: _storage._enumReservedRange, fieldNumber: 297)
       }
       if _storage._enumType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumType, fieldNumber: 295)
+        try visitor.visitSingularInt32Field(value: _storage._enumType, fieldNumber: 298)
       }
       if _storage._enumvalue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumvalue, fieldNumber: 296)
+        try visitor.visitSingularInt32Field(value: _storage._enumvalue, fieldNumber: 299)
       }
       if _storage._enumValueDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumValueDescriptorProto, fieldNumber: 297)
+        try visitor.visitSingularInt32Field(value: _storage._enumValueDescriptorProto, fieldNumber: 300)
       }
       if _storage._enumValueOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._enumValueOptions, fieldNumber: 298)
+        try visitor.visitSingularInt32Field(value: _storage._enumValueOptions, fieldNumber: 301)
       }
       if _storage._equatable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._equatable, fieldNumber: 299)
+        try visitor.visitSingularInt32Field(value: _storage._equatable, fieldNumber: 302)
       }
       if _storage._error != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._error, fieldNumber: 300)
+        try visitor.visitSingularInt32Field(value: _storage._error, fieldNumber: 303)
       }
       if _storage._expressibleByArrayLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._expressibleByArrayLiteral, fieldNumber: 301)
+        try visitor.visitSingularInt32Field(value: _storage._expressibleByArrayLiteral, fieldNumber: 304)
       }
       if _storage._expressibleByDictionaryLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._expressibleByDictionaryLiteral, fieldNumber: 302)
+        try visitor.visitSingularInt32Field(value: _storage._expressibleByDictionaryLiteral, fieldNumber: 305)
       }
       if _storage._ext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ext, fieldNumber: 303)
+        try visitor.visitSingularInt32Field(value: _storage._ext, fieldNumber: 306)
       }
       if _storage._extDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extDecoder, fieldNumber: 304)
+        try visitor.visitSingularInt32Field(value: _storage._extDecoder, fieldNumber: 307)
       }
       if _storage._extendedGraphemeClusterLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteral, fieldNumber: 305)
+        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteral, fieldNumber: 308)
       }
       if _storage._extendedGraphemeClusterLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteralType, fieldNumber: 306)
+        try visitor.visitSingularInt32Field(value: _storage._extendedGraphemeClusterLiteralType, fieldNumber: 309)
       }
       if _storage._extendee != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extendee, fieldNumber: 307)
+        try visitor.visitSingularInt32Field(value: _storage._extendee, fieldNumber: 310)
       }
       if _storage._extensibleMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensibleMessage, fieldNumber: 308)
+        try visitor.visitSingularInt32Field(value: _storage._extensibleMessage, fieldNumber: 311)
       }
       if _storage._extension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extension, fieldNumber: 309)
+        try visitor.visitSingularInt32Field(value: _storage._extension, fieldNumber: 312)
       }
       if _storage._extensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionField, fieldNumber: 310)
+        try visitor.visitSingularInt32Field(value: _storage._extensionField, fieldNumber: 313)
       }
       if _storage._extensionFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionFieldNumber, fieldNumber: 311)
+        try visitor.visitSingularInt32Field(value: _storage._extensionFieldNumber, fieldNumber: 314)
       }
       if _storage._extensionFieldValueSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionFieldValueSet, fieldNumber: 312)
+        try visitor.visitSingularInt32Field(value: _storage._extensionFieldValueSet, fieldNumber: 315)
       }
       if _storage._extensionMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionMap, fieldNumber: 313)
+        try visitor.visitSingularInt32Field(value: _storage._extensionMap, fieldNumber: 316)
       }
       if _storage._extensionRange != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionRange, fieldNumber: 314)
+        try visitor.visitSingularInt32Field(value: _storage._extensionRange, fieldNumber: 317)
       }
       if _storage._extensionRangeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensionRangeOptions, fieldNumber: 315)
+        try visitor.visitSingularInt32Field(value: _storage._extensionRangeOptions, fieldNumber: 318)
       }
       if _storage._extensions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extensions, fieldNumber: 316)
+        try visitor.visitSingularInt32Field(value: _storage._extensions, fieldNumber: 319)
       }
       if _storage._extras != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._extras, fieldNumber: 317)
+        try visitor.visitSingularInt32Field(value: _storage._extras, fieldNumber: 320)
       }
       if _storage._f != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._f, fieldNumber: 318)
+        try visitor.visitSingularInt32Field(value: _storage._f, fieldNumber: 321)
       }
       if _storage._false != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._false, fieldNumber: 319)
+        try visitor.visitSingularInt32Field(value: _storage._false, fieldNumber: 322)
       }
       if _storage._features != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._features, fieldNumber: 320)
+        try visitor.visitSingularInt32Field(value: _storage._features, fieldNumber: 323)
       }
       if _storage._featureSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSet, fieldNumber: 321)
+        try visitor.visitSingularInt32Field(value: _storage._featureSet, fieldNumber: 324)
       }
       if _storage._featureSetDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSetDefaults, fieldNumber: 322)
+        try visitor.visitSingularInt32Field(value: _storage._featureSetDefaults, fieldNumber: 325)
       }
       if _storage._featureSetEditionDefault != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSetEditionDefault, fieldNumber: 323)
+        try visitor.visitSingularInt32Field(value: _storage._featureSetEditionDefault, fieldNumber: 326)
       }
       if _storage._featureSupport != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._featureSupport, fieldNumber: 324)
+        try visitor.visitSingularInt32Field(value: _storage._featureSupport, fieldNumber: 327)
       }
       if _storage._field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._field, fieldNumber: 325)
+        try visitor.visitSingularInt32Field(value: _storage._field, fieldNumber: 328)
       }
       if _storage._fieldData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldData, fieldNumber: 326)
+        try visitor.visitSingularInt32Field(value: _storage._fieldData, fieldNumber: 329)
       }
       if _storage._fieldDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldDescriptorProto, fieldNumber: 327)
+        try visitor.visitSingularInt32Field(value: _storage._fieldDescriptorProto, fieldNumber: 330)
       }
       if _storage._fieldMask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldMask, fieldNumber: 328)
+        try visitor.visitSingularInt32Field(value: _storage._fieldMask, fieldNumber: 331)
       }
       if _storage._fieldMaskError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldMaskError, fieldNumber: 329)
+        try visitor.visitSingularInt32Field(value: _storage._fieldMaskError, fieldNumber: 332)
       }
       if _storage._fieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldName, fieldNumber: 330)
+        try visitor.visitSingularInt32Field(value: _storage._fieldName, fieldNumber: 333)
       }
       if _storage._fieldNameCount != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNameCount, fieldNumber: 331)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNameCount, fieldNumber: 334)
       }
       if _storage._fieldNum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNum, fieldNumber: 332)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNum, fieldNumber: 335)
       }
       if _storage._fieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNumber, fieldNumber: 333)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNumber, fieldNumber: 336)
       }
       if _storage._fieldNumberForProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldNumberForProto, fieldNumber: 334)
+        try visitor.visitSingularInt32Field(value: _storage._fieldNumberForProto, fieldNumber: 337)
       }
       if _storage._fieldOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldOptions, fieldNumber: 335)
+        try visitor.visitSingularInt32Field(value: _storage._fieldOptions, fieldNumber: 338)
       }
       if _storage._fieldPresence != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldPresence, fieldNumber: 336)
+        try visitor.visitSingularInt32Field(value: _storage._fieldPresence, fieldNumber: 339)
       }
       if _storage._fields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fields, fieldNumber: 337)
+        try visitor.visitSingularInt32Field(value: _storage._fields, fieldNumber: 340)
       }
       if _storage._fieldSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldSize, fieldNumber: 338)
+        try visitor.visitSingularInt32Field(value: _storage._fieldSize, fieldNumber: 341)
       }
       if _storage._fieldTag != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldTag, fieldNumber: 339)
+        try visitor.visitSingularInt32Field(value: _storage._fieldTag, fieldNumber: 342)
       }
       if _storage._fieldType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fieldType, fieldNumber: 340)
+        try visitor.visitSingularInt32Field(value: _storage._fieldType, fieldNumber: 343)
       }
       if _storage._file != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._file, fieldNumber: 341)
+        try visitor.visitSingularInt32Field(value: _storage._file, fieldNumber: 344)
       }
       if _storage._fileDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorProto, fieldNumber: 342)
+        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorProto, fieldNumber: 345)
       }
       if _storage._fileDescriptorSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorSet, fieldNumber: 343)
+        try visitor.visitSingularInt32Field(value: _storage._fileDescriptorSet, fieldNumber: 346)
       }
       if _storage._fileName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileName, fieldNumber: 344)
+        try visitor.visitSingularInt32Field(value: _storage._fileName, fieldNumber: 347)
       }
       if _storage._fileOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fileOptions, fieldNumber: 345)
+        try visitor.visitSingularInt32Field(value: _storage._fileOptions, fieldNumber: 348)
       }
       if _storage._filter != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._filter, fieldNumber: 346)
+        try visitor.visitSingularInt32Field(value: _storage._filter, fieldNumber: 349)
       }
       if _storage._final != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._final, fieldNumber: 347)
+        try visitor.visitSingularInt32Field(value: _storage._final, fieldNumber: 350)
       }
       if _storage._finiteOnly != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._finiteOnly, fieldNumber: 348)
+        try visitor.visitSingularInt32Field(value: _storage._finiteOnly, fieldNumber: 351)
       }
       if _storage._first != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._first, fieldNumber: 349)
+        try visitor.visitSingularInt32Field(value: _storage._first, fieldNumber: 352)
       }
       if _storage._firstItem != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._firstItem, fieldNumber: 350)
+        try visitor.visitSingularInt32Field(value: _storage._firstItem, fieldNumber: 353)
       }
       if _storage._fixedFeatures != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fixedFeatures, fieldNumber: 351)
+        try visitor.visitSingularInt32Field(value: _storage._fixedFeatures, fieldNumber: 354)
       }
       if _storage._float != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._float, fieldNumber: 352)
+        try visitor.visitSingularInt32Field(value: _storage._float, fieldNumber: 355)
       }
       if _storage._floatLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatLiteral, fieldNumber: 353)
+        try visitor.visitSingularInt32Field(value: _storage._floatLiteral, fieldNumber: 356)
       }
       if _storage._floatLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatLiteralType, fieldNumber: 354)
+        try visitor.visitSingularInt32Field(value: _storage._floatLiteralType, fieldNumber: 357)
       }
       if _storage._floatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._floatValue, fieldNumber: 355)
+        try visitor.visitSingularInt32Field(value: _storage._floatValue, fieldNumber: 358)
       }
       if _storage._for != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._for, fieldNumber: 356)
+        try visitor.visitSingularInt32Field(value: _storage._for, fieldNumber: 359)
       }
       if _storage._forMessageName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forMessageName, fieldNumber: 357)
+        try visitor.visitSingularInt32Field(value: _storage._forMessageName, fieldNumber: 360)
       }
       if _storage._formUnion != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._formUnion, fieldNumber: 358)
+        try visitor.visitSingularInt32Field(value: _storage._formUnion, fieldNumber: 361)
       }
       if _storage._forReadingFrom != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forReadingFrom, fieldNumber: 359)
+        try visitor.visitSingularInt32Field(value: _storage._forReadingFrom, fieldNumber: 362)
       }
       if _storage._forTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forTypeURL, fieldNumber: 360)
+        try visitor.visitSingularInt32Field(value: _storage._forTypeURL, fieldNumber: 363)
       }
       if _storage._forwardParser != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forwardParser, fieldNumber: 361)
+        try visitor.visitSingularInt32Field(value: _storage._forwardParser, fieldNumber: 364)
       }
       if _storage._forWritingInto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._forWritingInto, fieldNumber: 362)
+        try visitor.visitSingularInt32Field(value: _storage._forWritingInto, fieldNumber: 365)
       }
       if _storage._from != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._from, fieldNumber: 363)
+        try visitor.visitSingularInt32Field(value: _storage._from, fieldNumber: 366)
       }
       if _storage._fromAscii2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromAscii2, fieldNumber: 364)
+        try visitor.visitSingularInt32Field(value: _storage._fromAscii2, fieldNumber: 367)
       }
       if _storage._fromAscii4 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromAscii4, fieldNumber: 365)
+        try visitor.visitSingularInt32Field(value: _storage._fromAscii4, fieldNumber: 368)
       }
       if _storage._fromByteOffset != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromByteOffset, fieldNumber: 366)
+        try visitor.visitSingularInt32Field(value: _storage._fromByteOffset, fieldNumber: 369)
       }
       if _storage._fromHexDigit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fromHexDigit, fieldNumber: 367)
+        try visitor.visitSingularInt32Field(value: _storage._fromHexDigit, fieldNumber: 370)
       }
       if _storage._fullName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._fullName, fieldNumber: 368)
+        try visitor.visitSingularInt32Field(value: _storage._fullName, fieldNumber: 371)
       }
       if _storage._func != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._func, fieldNumber: 369)
+        try visitor.visitSingularInt32Field(value: _storage._func, fieldNumber: 372)
       }
       if _storage._function != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._function, fieldNumber: 370)
+        try visitor.visitSingularInt32Field(value: _storage._function, fieldNumber: 373)
       }
       if _storage._g != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._g, fieldNumber: 371)
+        try visitor.visitSingularInt32Field(value: _storage._g, fieldNumber: 374)
       }
       if _storage._generatedCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._generatedCodeInfo, fieldNumber: 372)
+        try visitor.visitSingularInt32Field(value: _storage._generatedCodeInfo, fieldNumber: 375)
       }
       if _storage._get != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._get, fieldNumber: 373)
+        try visitor.visitSingularInt32Field(value: _storage._get, fieldNumber: 376)
       }
       if _storage._getExtensionValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._getExtensionValue, fieldNumber: 374)
+        try visitor.visitSingularInt32Field(value: _storage._getExtensionValue, fieldNumber: 377)
       }
       if _storage._googleapis != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleapis, fieldNumber: 375)
+        try visitor.visitSingularInt32Field(value: _storage._googleapis, fieldNumber: 378)
       }
       if _storage._googleProtobufAny != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufAny, fieldNumber: 376)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufAny, fieldNumber: 379)
       }
       if _storage._googleProtobufApi != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufApi, fieldNumber: 377)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufApi, fieldNumber: 380)
       }
       if _storage._googleProtobufBoolValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBoolValue, fieldNumber: 378)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBoolValue, fieldNumber: 381)
       }
       if _storage._googleProtobufBytesValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBytesValue, fieldNumber: 379)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufBytesValue, fieldNumber: 382)
       }
       if _storage._googleProtobufDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDescriptorProto, fieldNumber: 380)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDescriptorProto, fieldNumber: 383)
       }
       if _storage._googleProtobufDoubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDoubleValue, fieldNumber: 381)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDoubleValue, fieldNumber: 384)
       }
       if _storage._googleProtobufDuration != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDuration, fieldNumber: 382)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufDuration, fieldNumber: 385)
       }
       if _storage._googleProtobufEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEdition, fieldNumber: 383)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEdition, fieldNumber: 386)
       }
       if _storage._googleProtobufEmpty != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEmpty, fieldNumber: 384)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEmpty, fieldNumber: 387)
       }
       if _storage._googleProtobufEnum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnum, fieldNumber: 385)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnum, fieldNumber: 388)
       }
       if _storage._googleProtobufEnumDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumDescriptorProto, fieldNumber: 386)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumDescriptorProto, fieldNumber: 389)
       }
       if _storage._googleProtobufEnumOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumOptions, fieldNumber: 387)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumOptions, fieldNumber: 390)
       }
       if _storage._googleProtobufEnumValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValue, fieldNumber: 388)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValue, fieldNumber: 391)
       }
       if _storage._googleProtobufEnumValueDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueDescriptorProto, fieldNumber: 389)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueDescriptorProto, fieldNumber: 392)
       }
       if _storage._googleProtobufEnumValueOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueOptions, fieldNumber: 390)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufEnumValueOptions, fieldNumber: 393)
       }
       if _storage._googleProtobufExtensionRangeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufExtensionRangeOptions, fieldNumber: 391)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufExtensionRangeOptions, fieldNumber: 394)
       }
       if _storage._googleProtobufFeatureSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSet, fieldNumber: 392)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSet, fieldNumber: 395)
       }
       if _storage._googleProtobufFeatureSetDefaults != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSetDefaults, fieldNumber: 393)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFeatureSetDefaults, fieldNumber: 396)
       }
       if _storage._googleProtobufField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufField, fieldNumber: 394)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufField, fieldNumber: 397)
       }
       if _storage._googleProtobufFieldDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldDescriptorProto, fieldNumber: 395)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldDescriptorProto, fieldNumber: 398)
       }
       if _storage._googleProtobufFieldMask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldMask, fieldNumber: 396)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldMask, fieldNumber: 399)
       }
       if _storage._googleProtobufFieldOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldOptions, fieldNumber: 397)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFieldOptions, fieldNumber: 400)
       }
       if _storage._googleProtobufFileDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorProto, fieldNumber: 398)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorProto, fieldNumber: 401)
       }
       if _storage._googleProtobufFileDescriptorSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorSet, fieldNumber: 399)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileDescriptorSet, fieldNumber: 402)
       }
       if _storage._googleProtobufFileOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileOptions, fieldNumber: 400)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFileOptions, fieldNumber: 403)
       }
       if _storage._googleProtobufFloatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFloatValue, fieldNumber: 401)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufFloatValue, fieldNumber: 404)
       }
       if _storage._googleProtobufGeneratedCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufGeneratedCodeInfo, fieldNumber: 402)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufGeneratedCodeInfo, fieldNumber: 405)
       }
       if _storage._googleProtobufInt32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt32Value, fieldNumber: 403)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt32Value, fieldNumber: 406)
       }
       if _storage._googleProtobufInt64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt64Value, fieldNumber: 404)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufInt64Value, fieldNumber: 407)
       }
       if _storage._googleProtobufListValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufListValue, fieldNumber: 405)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufListValue, fieldNumber: 408)
       }
       if _storage._googleProtobufMessageOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMessageOptions, fieldNumber: 406)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMessageOptions, fieldNumber: 409)
       }
       if _storage._googleProtobufMethod != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethod, fieldNumber: 407)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethod, fieldNumber: 410)
       }
       if _storage._googleProtobufMethodDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodDescriptorProto, fieldNumber: 408)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodDescriptorProto, fieldNumber: 411)
       }
       if _storage._googleProtobufMethodOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodOptions, fieldNumber: 409)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMethodOptions, fieldNumber: 412)
       }
       if _storage._googleProtobufMixin != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMixin, fieldNumber: 410)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufMixin, fieldNumber: 413)
       }
       if _storage._googleProtobufNullValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufNullValue, fieldNumber: 411)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufNullValue, fieldNumber: 414)
       }
       if _storage._googleProtobufOneofDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofDescriptorProto, fieldNumber: 412)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofDescriptorProto, fieldNumber: 415)
       }
       if _storage._googleProtobufOneofOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofOptions, fieldNumber: 413)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOneofOptions, fieldNumber: 416)
       }
       if _storage._googleProtobufOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOption, fieldNumber: 414)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufOption, fieldNumber: 417)
       }
       if _storage._googleProtobufServiceDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceDescriptorProto, fieldNumber: 415)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceDescriptorProto, fieldNumber: 418)
       }
       if _storage._googleProtobufServiceOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceOptions, fieldNumber: 416)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufServiceOptions, fieldNumber: 419)
       }
       if _storage._googleProtobufSourceCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceCodeInfo, fieldNumber: 417)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceCodeInfo, fieldNumber: 420)
       }
       if _storage._googleProtobufSourceContext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceContext, fieldNumber: 418)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSourceContext, fieldNumber: 421)
       }
       if _storage._googleProtobufStringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStringValue, fieldNumber: 419)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStringValue, fieldNumber: 422)
       }
       if _storage._googleProtobufStruct != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStruct, fieldNumber: 420)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufStruct, fieldNumber: 423)
       }
       if _storage._googleProtobufSyntax != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSyntax, fieldNumber: 421)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufSyntax, fieldNumber: 424)
       }
       if _storage._googleProtobufTimestamp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufTimestamp, fieldNumber: 422)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufTimestamp, fieldNumber: 425)
       }
       if _storage._googleProtobufType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufType, fieldNumber: 423)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufType, fieldNumber: 426)
       }
       if _storage._googleProtobufUint32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint32Value, fieldNumber: 424)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint32Value, fieldNumber: 427)
       }
       if _storage._googleProtobufUint64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint64Value, fieldNumber: 425)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUint64Value, fieldNumber: 428)
       }
       if _storage._googleProtobufUninterpretedOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUninterpretedOption, fieldNumber: 426)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufUninterpretedOption, fieldNumber: 429)
       }
       if _storage._googleProtobufValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._googleProtobufValue, fieldNumber: 427)
+        try visitor.visitSingularInt32Field(value: _storage._googleProtobufValue, fieldNumber: 430)
       }
       if _storage._goPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._goPackage, fieldNumber: 428)
+        try visitor.visitSingularInt32Field(value: _storage._goPackage, fieldNumber: 431)
       }
       if _storage._group != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._group, fieldNumber: 429)
+        try visitor.visitSingularInt32Field(value: _storage._group, fieldNumber: 432)
       }
       if _storage._groupFieldNumberStack != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._groupFieldNumberStack, fieldNumber: 430)
+        try visitor.visitSingularInt32Field(value: _storage._groupFieldNumberStack, fieldNumber: 433)
       }
       if _storage._groupSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._groupSize, fieldNumber: 431)
+        try visitor.visitSingularInt32Field(value: _storage._groupSize, fieldNumber: 434)
       }
       if _storage._guard != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._guard, fieldNumber: 432)
+        try visitor.visitSingularInt32Field(value: _storage._guard, fieldNumber: 435)
       }
       if _storage._hadOneofValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hadOneofValue, fieldNumber: 433)
+        try visitor.visitSingularInt32Field(value: _storage._hadOneofValue, fieldNumber: 436)
       }
       if _storage._handleConflictingOneOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._handleConflictingOneOf, fieldNumber: 434)
+        try visitor.visitSingularInt32Field(value: _storage._handleConflictingOneOf, fieldNumber: 437)
       }
       if _storage._hasAggregateValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasAggregateValue_p, fieldNumber: 435)
+        try visitor.visitSingularInt32Field(value: _storage._hasAggregateValue_p, fieldNumber: 438)
       }
       if _storage._hasAllowAlias_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasAllowAlias_p, fieldNumber: 436)
+        try visitor.visitSingularInt32Field(value: _storage._hasAllowAlias_p, fieldNumber: 439)
       }
       if _storage._hasBegin_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasBegin_p, fieldNumber: 437)
+        try visitor.visitSingularInt32Field(value: _storage._hasBegin_p, fieldNumber: 440)
       }
       if _storage._hasCcEnableArenas_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCcEnableArenas_p, fieldNumber: 438)
+        try visitor.visitSingularInt32Field(value: _storage._hasCcEnableArenas_p, fieldNumber: 441)
       }
       if _storage._hasCcGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCcGenericServices_p, fieldNumber: 439)
+        try visitor.visitSingularInt32Field(value: _storage._hasCcGenericServices_p, fieldNumber: 442)
       }
       if _storage._hasClientStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasClientStreaming_p, fieldNumber: 440)
+        try visitor.visitSingularInt32Field(value: _storage._hasClientStreaming_p, fieldNumber: 443)
       }
       if _storage._hasCsharpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCsharpNamespace_p, fieldNumber: 441)
+        try visitor.visitSingularInt32Field(value: _storage._hasCsharpNamespace_p, fieldNumber: 444)
       }
       if _storage._hasCtype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasCtype_p, fieldNumber: 442)
+        try visitor.visitSingularInt32Field(value: _storage._hasCtype_p, fieldNumber: 445)
       }
       if _storage._hasDebugRedact_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDebugRedact_p, fieldNumber: 443)
+        try visitor.visitSingularInt32Field(value: _storage._hasDebugRedact_p, fieldNumber: 446)
       }
       if _storage._hasDefaultValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDefaultValue_p, fieldNumber: 444)
+        try visitor.visitSingularInt32Field(value: _storage._hasDefaultValue_p, fieldNumber: 447)
       }
       if _storage._hasDeprecated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecated_p, fieldNumber: 445)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecated_p, fieldNumber: 448)
       }
       if _storage._hasDeprecatedLegacyJsonFieldConflicts_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecatedLegacyJsonFieldConflicts_p, fieldNumber: 446)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecatedLegacyJsonFieldConflicts_p, fieldNumber: 449)
       }
       if _storage._hasDeprecationWarning_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDeprecationWarning_p, fieldNumber: 447)
+        try visitor.visitSingularInt32Field(value: _storage._hasDeprecationWarning_p, fieldNumber: 450)
       }
       if _storage._hasDoubleValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasDoubleValue_p, fieldNumber: 448)
+        try visitor.visitSingularInt32Field(value: _storage._hasDoubleValue_p, fieldNumber: 451)
       }
       if _storage._hasEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEdition_p, fieldNumber: 449)
+        try visitor.visitSingularInt32Field(value: _storage._hasEdition_p, fieldNumber: 452)
       }
       if _storage._hasEditionDeprecated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionDeprecated_p, fieldNumber: 450)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionDeprecated_p, fieldNumber: 453)
       }
       if _storage._hasEditionIntroduced_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionIntroduced_p, fieldNumber: 451)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionIntroduced_p, fieldNumber: 454)
       }
       if _storage._hasEditionRemoved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEditionRemoved_p, fieldNumber: 452)
+        try visitor.visitSingularInt32Field(value: _storage._hasEditionRemoved_p, fieldNumber: 455)
       }
       if _storage._hasEnd_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEnd_p, fieldNumber: 453)
+        try visitor.visitSingularInt32Field(value: _storage._hasEnd_p, fieldNumber: 456)
+      }
+      if _storage._hasEnforceNamingStyle_p != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._hasEnforceNamingStyle_p, fieldNumber: 457)
       }
       if _storage._hasEnumType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasEnumType_p, fieldNumber: 454)
+        try visitor.visitSingularInt32Field(value: _storage._hasEnumType_p, fieldNumber: 458)
       }
       if _storage._hasExtendee_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasExtendee_p, fieldNumber: 455)
+        try visitor.visitSingularInt32Field(value: _storage._hasExtendee_p, fieldNumber: 459)
       }
       if _storage._hasExtensionValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasExtensionValue_p, fieldNumber: 456)
+        try visitor.visitSingularInt32Field(value: _storage._hasExtensionValue_p, fieldNumber: 460)
       }
       if _storage._hasFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFeatures_p, fieldNumber: 457)
+        try visitor.visitSingularInt32Field(value: _storage._hasFeatures_p, fieldNumber: 461)
       }
       if _storage._hasFeatureSupport_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFeatureSupport_p, fieldNumber: 458)
+        try visitor.visitSingularInt32Field(value: _storage._hasFeatureSupport_p, fieldNumber: 462)
       }
       if _storage._hasFieldPresence_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFieldPresence_p, fieldNumber: 459)
+        try visitor.visitSingularInt32Field(value: _storage._hasFieldPresence_p, fieldNumber: 463)
       }
       if _storage._hasFixedFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFixedFeatures_p, fieldNumber: 460)
+        try visitor.visitSingularInt32Field(value: _storage._hasFixedFeatures_p, fieldNumber: 464)
       }
       if _storage._hasFullName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasFullName_p, fieldNumber: 461)
+        try visitor.visitSingularInt32Field(value: _storage._hasFullName_p, fieldNumber: 465)
       }
       if _storage._hasGoPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasGoPackage_p, fieldNumber: 462)
+        try visitor.visitSingularInt32Field(value: _storage._hasGoPackage_p, fieldNumber: 466)
       }
       if _storage._hash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hash, fieldNumber: 463)
+        try visitor.visitSingularInt32Field(value: _storage._hash, fieldNumber: 467)
       }
       if _storage._hashable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hashable, fieldNumber: 464)
+        try visitor.visitSingularInt32Field(value: _storage._hashable, fieldNumber: 468)
       }
       if _storage._hasher != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasher, fieldNumber: 465)
+        try visitor.visitSingularInt32Field(value: _storage._hasher, fieldNumber: 469)
       }
       if _storage._hashVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hashVisitor, fieldNumber: 466)
+        try visitor.visitSingularInt32Field(value: _storage._hashVisitor, fieldNumber: 470)
       }
       if _storage._hasIdempotencyLevel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIdempotencyLevel_p, fieldNumber: 467)
+        try visitor.visitSingularInt32Field(value: _storage._hasIdempotencyLevel_p, fieldNumber: 471)
       }
       if _storage._hasIdentifierValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIdentifierValue_p, fieldNumber: 468)
+        try visitor.visitSingularInt32Field(value: _storage._hasIdentifierValue_p, fieldNumber: 472)
       }
       if _storage._hasInputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasInputType_p, fieldNumber: 469)
+        try visitor.visitSingularInt32Field(value: _storage._hasInputType_p, fieldNumber: 473)
       }
       if _storage._hasIsExtension_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasIsExtension_p, fieldNumber: 470)
+        try visitor.visitSingularInt32Field(value: _storage._hasIsExtension_p, fieldNumber: 474)
       }
       if _storage._hasJavaGenerateEqualsAndHash_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenerateEqualsAndHash_p, fieldNumber: 471)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenerateEqualsAndHash_p, fieldNumber: 475)
       }
       if _storage._hasJavaGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenericServices_p, fieldNumber: 472)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaGenericServices_p, fieldNumber: 476)
       }
       if _storage._hasJavaMultipleFiles_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaMultipleFiles_p, fieldNumber: 473)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaMultipleFiles_p, fieldNumber: 477)
       }
       if _storage._hasJavaOuterClassname_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaOuterClassname_p, fieldNumber: 474)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaOuterClassname_p, fieldNumber: 478)
       }
       if _storage._hasJavaPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaPackage_p, fieldNumber: 475)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaPackage_p, fieldNumber: 479)
       }
       if _storage._hasJavaStringCheckUtf8_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJavaStringCheckUtf8_p, fieldNumber: 476)
+        try visitor.visitSingularInt32Field(value: _storage._hasJavaStringCheckUtf8_p, fieldNumber: 480)
       }
       if _storage._hasJsonFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJsonFormat_p, fieldNumber: 477)
+        try visitor.visitSingularInt32Field(value: _storage._hasJsonFormat_p, fieldNumber: 481)
       }
       if _storage._hasJsonName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJsonName_p, fieldNumber: 478)
+        try visitor.visitSingularInt32Field(value: _storage._hasJsonName_p, fieldNumber: 482)
       }
       if _storage._hasJstype_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasJstype_p, fieldNumber: 479)
+        try visitor.visitSingularInt32Field(value: _storage._hasJstype_p, fieldNumber: 483)
       }
       if _storage._hasLabel_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLabel_p, fieldNumber: 480)
+        try visitor.visitSingularInt32Field(value: _storage._hasLabel_p, fieldNumber: 484)
       }
       if _storage._hasLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLazy_p, fieldNumber: 481)
+        try visitor.visitSingularInt32Field(value: _storage._hasLazy_p, fieldNumber: 485)
       }
       if _storage._hasLeadingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasLeadingComments_p, fieldNumber: 482)
+        try visitor.visitSingularInt32Field(value: _storage._hasLeadingComments_p, fieldNumber: 486)
       }
       if _storage._hasMapEntry_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMapEntry_p, fieldNumber: 483)
+        try visitor.visitSingularInt32Field(value: _storage._hasMapEntry_p, fieldNumber: 487)
       }
       if _storage._hasMaximumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMaximumEdition_p, fieldNumber: 484)
+        try visitor.visitSingularInt32Field(value: _storage._hasMaximumEdition_p, fieldNumber: 488)
       }
       if _storage._hasMessageEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMessageEncoding_p, fieldNumber: 485)
+        try visitor.visitSingularInt32Field(value: _storage._hasMessageEncoding_p, fieldNumber: 489)
       }
       if _storage._hasMessageSetWireFormat_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMessageSetWireFormat_p, fieldNumber: 486)
+        try visitor.visitSingularInt32Field(value: _storage._hasMessageSetWireFormat_p, fieldNumber: 490)
       }
       if _storage._hasMinimumEdition_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasMinimumEdition_p, fieldNumber: 487)
+        try visitor.visitSingularInt32Field(value: _storage._hasMinimumEdition_p, fieldNumber: 491)
       }
       if _storage._hasName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasName_p, fieldNumber: 488)
+        try visitor.visitSingularInt32Field(value: _storage._hasName_p, fieldNumber: 492)
       }
       if _storage._hasNamePart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNamePart_p, fieldNumber: 489)
+        try visitor.visitSingularInt32Field(value: _storage._hasNamePart_p, fieldNumber: 493)
       }
       if _storage._hasNegativeIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNegativeIntValue_p, fieldNumber: 490)
+        try visitor.visitSingularInt32Field(value: _storage._hasNegativeIntValue_p, fieldNumber: 494)
       }
       if _storage._hasNoStandardDescriptorAccessor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNoStandardDescriptorAccessor_p, fieldNumber: 491)
+        try visitor.visitSingularInt32Field(value: _storage._hasNoStandardDescriptorAccessor_p, fieldNumber: 495)
       }
       if _storage._hasNumber_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasNumber_p, fieldNumber: 492)
+        try visitor.visitSingularInt32Field(value: _storage._hasNumber_p, fieldNumber: 496)
       }
       if _storage._hasObjcClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasObjcClassPrefix_p, fieldNumber: 493)
+        try visitor.visitSingularInt32Field(value: _storage._hasObjcClassPrefix_p, fieldNumber: 497)
       }
       if _storage._hasOneofIndex_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOneofIndex_p, fieldNumber: 494)
+        try visitor.visitSingularInt32Field(value: _storage._hasOneofIndex_p, fieldNumber: 498)
       }
       if _storage._hasOptimizeFor_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOptimizeFor_p, fieldNumber: 495)
+        try visitor.visitSingularInt32Field(value: _storage._hasOptimizeFor_p, fieldNumber: 499)
       }
       if _storage._hasOptions_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOptions_p, fieldNumber: 496)
+        try visitor.visitSingularInt32Field(value: _storage._hasOptions_p, fieldNumber: 500)
       }
       if _storage._hasOutputType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOutputType_p, fieldNumber: 497)
+        try visitor.visitSingularInt32Field(value: _storage._hasOutputType_p, fieldNumber: 501)
       }
       if _storage._hasOverridableFeatures_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasOverridableFeatures_p, fieldNumber: 498)
+        try visitor.visitSingularInt32Field(value: _storage._hasOverridableFeatures_p, fieldNumber: 502)
       }
       if _storage._hasPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPackage_p, fieldNumber: 499)
+        try visitor.visitSingularInt32Field(value: _storage._hasPackage_p, fieldNumber: 503)
       }
       if _storage._hasPacked_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPacked_p, fieldNumber: 500)
+        try visitor.visitSingularInt32Field(value: _storage._hasPacked_p, fieldNumber: 504)
       }
       if _storage._hasPhpClassPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpClassPrefix_p, fieldNumber: 501)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpClassPrefix_p, fieldNumber: 505)
       }
       if _storage._hasPhpMetadataNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpMetadataNamespace_p, fieldNumber: 502)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpMetadataNamespace_p, fieldNumber: 506)
       }
       if _storage._hasPhpNamespace_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPhpNamespace_p, fieldNumber: 503)
+        try visitor.visitSingularInt32Field(value: _storage._hasPhpNamespace_p, fieldNumber: 507)
       }
       if _storage._hasPositiveIntValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPositiveIntValue_p, fieldNumber: 504)
+        try visitor.visitSingularInt32Field(value: _storage._hasPositiveIntValue_p, fieldNumber: 508)
       }
       if _storage._hasProto3Optional_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasProto3Optional_p, fieldNumber: 505)
+        try visitor.visitSingularInt32Field(value: _storage._hasProto3Optional_p, fieldNumber: 509)
       }
       if _storage._hasPyGenericServices_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasPyGenericServices_p, fieldNumber: 506)
+        try visitor.visitSingularInt32Field(value: _storage._hasPyGenericServices_p, fieldNumber: 510)
       }
       if _storage._hasRepeated_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRepeated_p, fieldNumber: 507)
+        try visitor.visitSingularInt32Field(value: _storage._hasRepeated_p, fieldNumber: 511)
       }
       if _storage._hasRepeatedFieldEncoding_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRepeatedFieldEncoding_p, fieldNumber: 508)
+        try visitor.visitSingularInt32Field(value: _storage._hasRepeatedFieldEncoding_p, fieldNumber: 512)
       }
       if _storage._hasReserved_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasReserved_p, fieldNumber: 509)
+        try visitor.visitSingularInt32Field(value: _storage._hasReserved_p, fieldNumber: 513)
       }
       if _storage._hasRetention_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRetention_p, fieldNumber: 510)
+        try visitor.visitSingularInt32Field(value: _storage._hasRetention_p, fieldNumber: 514)
       }
       if _storage._hasRubyPackage_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasRubyPackage_p, fieldNumber: 511)
+        try visitor.visitSingularInt32Field(value: _storage._hasRubyPackage_p, fieldNumber: 515)
       }
       if _storage._hasSemantic_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSemantic_p, fieldNumber: 512)
+        try visitor.visitSingularInt32Field(value: _storage._hasSemantic_p, fieldNumber: 516)
       }
       if _storage._hasServerStreaming_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasServerStreaming_p, fieldNumber: 513)
+        try visitor.visitSingularInt32Field(value: _storage._hasServerStreaming_p, fieldNumber: 517)
       }
       if _storage._hasSourceCodeInfo_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceCodeInfo_p, fieldNumber: 514)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceCodeInfo_p, fieldNumber: 518)
       }
       if _storage._hasSourceContext_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceContext_p, fieldNumber: 515)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceContext_p, fieldNumber: 519)
       }
       if _storage._hasSourceFile_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSourceFile_p, fieldNumber: 516)
+        try visitor.visitSingularInt32Field(value: _storage._hasSourceFile_p, fieldNumber: 520)
       }
       if _storage._hasStart_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasStart_p, fieldNumber: 517)
+        try visitor.visitSingularInt32Field(value: _storage._hasStart_p, fieldNumber: 521)
       }
       if _storage._hasStringValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasStringValue_p, fieldNumber: 518)
+        try visitor.visitSingularInt32Field(value: _storage._hasStringValue_p, fieldNumber: 522)
       }
       if _storage._hasSwiftPrefix_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSwiftPrefix_p, fieldNumber: 519)
+        try visitor.visitSingularInt32Field(value: _storage._hasSwiftPrefix_p, fieldNumber: 523)
       }
       if _storage._hasSyntax_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasSyntax_p, fieldNumber: 520)
+        try visitor.visitSingularInt32Field(value: _storage._hasSyntax_p, fieldNumber: 524)
       }
       if _storage._hasTrailingComments_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasTrailingComments_p, fieldNumber: 521)
+        try visitor.visitSingularInt32Field(value: _storage._hasTrailingComments_p, fieldNumber: 525)
       }
       if _storage._hasType_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasType_p, fieldNumber: 522)
+        try visitor.visitSingularInt32Field(value: _storage._hasType_p, fieldNumber: 526)
       }
       if _storage._hasTypeName_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasTypeName_p, fieldNumber: 523)
+        try visitor.visitSingularInt32Field(value: _storage._hasTypeName_p, fieldNumber: 527)
       }
       if _storage._hasUnverifiedLazy_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasUnverifiedLazy_p, fieldNumber: 524)
+        try visitor.visitSingularInt32Field(value: _storage._hasUnverifiedLazy_p, fieldNumber: 528)
       }
       if _storage._hasUtf8Validation_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasUtf8Validation_p, fieldNumber: 525)
+        try visitor.visitSingularInt32Field(value: _storage._hasUtf8Validation_p, fieldNumber: 529)
       }
       if _storage._hasValue_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasValue_p, fieldNumber: 526)
+        try visitor.visitSingularInt32Field(value: _storage._hasValue_p, fieldNumber: 530)
       }
       if _storage._hasVerification_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasVerification_p, fieldNumber: 527)
+        try visitor.visitSingularInt32Field(value: _storage._hasVerification_p, fieldNumber: 531)
       }
       if _storage._hasWeak_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hasWeak_p, fieldNumber: 528)
+        try visitor.visitSingularInt32Field(value: _storage._hasWeak_p, fieldNumber: 532)
       }
       if _storage._hour != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._hour, fieldNumber: 529)
+        try visitor.visitSingularInt32Field(value: _storage._hour, fieldNumber: 533)
       }
       if _storage._i != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._i, fieldNumber: 530)
+        try visitor.visitSingularInt32Field(value: _storage._i, fieldNumber: 534)
       }
       if _storage._idempotencyLevel != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._idempotencyLevel, fieldNumber: 531)
+        try visitor.visitSingularInt32Field(value: _storage._idempotencyLevel, fieldNumber: 535)
       }
       if _storage._identifierValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._identifierValue, fieldNumber: 532)
+        try visitor.visitSingularInt32Field(value: _storage._identifierValue, fieldNumber: 536)
       }
       if _storage._if != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._if, fieldNumber: 533)
+        try visitor.visitSingularInt32Field(value: _storage._if, fieldNumber: 537)
       }
       if _storage._ignoreUnknownExtensionFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownExtensionFields, fieldNumber: 534)
+        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownExtensionFields, fieldNumber: 538)
       }
       if _storage._ignoreUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownFields, fieldNumber: 535)
+        try visitor.visitSingularInt32Field(value: _storage._ignoreUnknownFields, fieldNumber: 539)
       }
       if _storage._index != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._index, fieldNumber: 536)
+        try visitor.visitSingularInt32Field(value: _storage._index, fieldNumber: 540)
       }
       if _storage._init_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._init_p, fieldNumber: 537)
+        try visitor.visitSingularInt32Field(value: _storage._init_p, fieldNumber: 541)
       }
       if _storage._inout != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._inout, fieldNumber: 538)
+        try visitor.visitSingularInt32Field(value: _storage._inout, fieldNumber: 542)
       }
       if _storage._inputType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._inputType, fieldNumber: 539)
+        try visitor.visitSingularInt32Field(value: _storage._inputType, fieldNumber: 543)
       }
       if _storage._insert != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._insert, fieldNumber: 540)
+        try visitor.visitSingularInt32Field(value: _storage._insert, fieldNumber: 544)
       }
       if _storage._int != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int, fieldNumber: 541)
+        try visitor.visitSingularInt32Field(value: _storage._int, fieldNumber: 545)
       }
       if _storage._int32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int32, fieldNumber: 542)
+        try visitor.visitSingularInt32Field(value: _storage._int32, fieldNumber: 546)
       }
       if _storage._int32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int32Value, fieldNumber: 543)
+        try visitor.visitSingularInt32Field(value: _storage._int32Value, fieldNumber: 547)
       }
       if _storage._int64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int64, fieldNumber: 544)
+        try visitor.visitSingularInt32Field(value: _storage._int64, fieldNumber: 548)
       }
       if _storage._int64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int64Value, fieldNumber: 545)
+        try visitor.visitSingularInt32Field(value: _storage._int64Value, fieldNumber: 549)
       }
       if _storage._int8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._int8, fieldNumber: 546)
+        try visitor.visitSingularInt32Field(value: _storage._int8, fieldNumber: 550)
       }
       if _storage._integerLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._integerLiteral, fieldNumber: 547)
+        try visitor.visitSingularInt32Field(value: _storage._integerLiteral, fieldNumber: 551)
       }
       if _storage._integerLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._integerLiteralType, fieldNumber: 548)
+        try visitor.visitSingularInt32Field(value: _storage._integerLiteralType, fieldNumber: 552)
       }
       if _storage._intern != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._intern, fieldNumber: 549)
+        try visitor.visitSingularInt32Field(value: _storage._intern, fieldNumber: 553)
       }
       if _storage._internal != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._internal, fieldNumber: 550)
+        try visitor.visitSingularInt32Field(value: _storage._internal, fieldNumber: 554)
       }
       if _storage._internalState != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._internalState, fieldNumber: 551)
+        try visitor.visitSingularInt32Field(value: _storage._internalState, fieldNumber: 555)
       }
       if _storage._intersect != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._intersect, fieldNumber: 552)
+        try visitor.visitSingularInt32Field(value: _storage._intersect, fieldNumber: 556)
       }
       if _storage._into != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._into, fieldNumber: 553)
+        try visitor.visitSingularInt32Field(value: _storage._into, fieldNumber: 557)
       }
       if _storage._ints != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._ints, fieldNumber: 554)
+        try visitor.visitSingularInt32Field(value: _storage._ints, fieldNumber: 558)
+      }
+      if _storage._invalidAnyTypeURL != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._invalidAnyTypeURL, fieldNumber: 559)
       }
       if _storage._isA != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isA, fieldNumber: 555)
+        try visitor.visitSingularInt32Field(value: _storage._isA, fieldNumber: 560)
       }
       if _storage._isEqual != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isEqual, fieldNumber: 556)
+        try visitor.visitSingularInt32Field(value: _storage._isEqual, fieldNumber: 561)
       }
       if _storage._isEqualTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isEqualTo, fieldNumber: 557)
+        try visitor.visitSingularInt32Field(value: _storage._isEqualTo, fieldNumber: 562)
       }
       if _storage._isExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isExtension, fieldNumber: 558)
+        try visitor.visitSingularInt32Field(value: _storage._isExtension, fieldNumber: 563)
       }
       if _storage._isInitialized_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isInitialized_p, fieldNumber: 559)
+        try visitor.visitSingularInt32Field(value: _storage._isInitialized_p, fieldNumber: 564)
       }
       if _storage._isNegative != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isNegative, fieldNumber: 560)
+        try visitor.visitSingularInt32Field(value: _storage._isNegative, fieldNumber: 565)
       }
       if _storage._isPathValid != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isPathValid, fieldNumber: 561)
+        try visitor.visitSingularInt32Field(value: _storage._isPathValid, fieldNumber: 566)
       }
       if _storage._isValid != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._isValid, fieldNumber: 562)
+        try visitor.visitSingularInt32Field(value: _storage._isValid, fieldNumber: 567)
       }
       if _storage._itemTagsEncodedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._itemTagsEncodedSize, fieldNumber: 563)
+        try visitor.visitSingularInt32Field(value: _storage._itemTagsEncodedSize, fieldNumber: 568)
       }
       if _storage._iterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._iterator, fieldNumber: 564)
+        try visitor.visitSingularInt32Field(value: _storage._iterator, fieldNumber: 569)
       }
       if _storage._javaGenerateEqualsAndHash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaGenerateEqualsAndHash, fieldNumber: 565)
+        try visitor.visitSingularInt32Field(value: _storage._javaGenerateEqualsAndHash, fieldNumber: 570)
       }
       if _storage._javaGenericServices != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaGenericServices, fieldNumber: 566)
+        try visitor.visitSingularInt32Field(value: _storage._javaGenericServices, fieldNumber: 571)
       }
       if _storage._javaMultipleFiles != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaMultipleFiles, fieldNumber: 567)
+        try visitor.visitSingularInt32Field(value: _storage._javaMultipleFiles, fieldNumber: 572)
       }
       if _storage._javaOuterClassname != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaOuterClassname, fieldNumber: 568)
+        try visitor.visitSingularInt32Field(value: _storage._javaOuterClassname, fieldNumber: 573)
       }
       if _storage._javaPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaPackage, fieldNumber: 569)
+        try visitor.visitSingularInt32Field(value: _storage._javaPackage, fieldNumber: 574)
       }
       if _storage._javaStringCheckUtf8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._javaStringCheckUtf8, fieldNumber: 570)
+        try visitor.visitSingularInt32Field(value: _storage._javaStringCheckUtf8, fieldNumber: 575)
       }
       if _storage._jsondecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecoder, fieldNumber: 571)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecoder, fieldNumber: 576)
+      }
+      if _storage._jsondecoding != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._jsondecoding, fieldNumber: 577)
       }
       if _storage._jsondecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecodingError, fieldNumber: 572)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecodingError, fieldNumber: 578)
       }
       if _storage._jsondecodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsondecodingOptions, fieldNumber: 573)
+        try visitor.visitSingularInt32Field(value: _storage._jsondecodingOptions, fieldNumber: 579)
       }
       if _storage._jsonEncoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonEncoder, fieldNumber: 574)
+        try visitor.visitSingularInt32Field(value: _storage._jsonEncoder, fieldNumber: 580)
+      }
+      if _storage._jsonencoding != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._jsonencoding, fieldNumber: 581)
       }
       if _storage._jsonencodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingError, fieldNumber: 575)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingError, fieldNumber: 582)
       }
       if _storage._jsonencodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingOptions, fieldNumber: 576)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingOptions, fieldNumber: 583)
       }
       if _storage._jsonencodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonencodingVisitor, fieldNumber: 577)
+        try visitor.visitSingularInt32Field(value: _storage._jsonencodingVisitor, fieldNumber: 584)
       }
       if _storage._jsonFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonFormat, fieldNumber: 578)
+        try visitor.visitSingularInt32Field(value: _storage._jsonFormat, fieldNumber: 585)
       }
       if _storage._jsonmapEncodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonmapEncodingVisitor, fieldNumber: 579)
+        try visitor.visitSingularInt32Field(value: _storage._jsonmapEncodingVisitor, fieldNumber: 586)
       }
       if _storage._jsonName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonName, fieldNumber: 580)
+        try visitor.visitSingularInt32Field(value: _storage._jsonName, fieldNumber: 587)
       }
       if _storage._jsonPath != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonPath, fieldNumber: 581)
+        try visitor.visitSingularInt32Field(value: _storage._jsonPath, fieldNumber: 588)
       }
       if _storage._jsonPaths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonPaths, fieldNumber: 582)
+        try visitor.visitSingularInt32Field(value: _storage._jsonPaths, fieldNumber: 589)
       }
       if _storage._jsonscanner != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonscanner, fieldNumber: 583)
+        try visitor.visitSingularInt32Field(value: _storage._jsonscanner, fieldNumber: 590)
       }
       if _storage._jsonString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonString, fieldNumber: 584)
+        try visitor.visitSingularInt32Field(value: _storage._jsonString, fieldNumber: 591)
       }
       if _storage._jsonText != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonText, fieldNumber: 585)
+        try visitor.visitSingularInt32Field(value: _storage._jsonText, fieldNumber: 592)
       }
       if _storage._jsonUtf8Bytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Bytes, fieldNumber: 586)
+        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Bytes, fieldNumber: 593)
       }
       if _storage._jsonUtf8Data != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Data, fieldNumber: 587)
+        try visitor.visitSingularInt32Field(value: _storage._jsonUtf8Data, fieldNumber: 594)
       }
       if _storage._jstype != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._jstype, fieldNumber: 588)
+        try visitor.visitSingularInt32Field(value: _storage._jstype, fieldNumber: 595)
       }
       if _storage._k != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._k, fieldNumber: 589)
+        try visitor.visitSingularInt32Field(value: _storage._k, fieldNumber: 596)
       }
       if _storage._kChunkSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._kChunkSize, fieldNumber: 590)
+        try visitor.visitSingularInt32Field(value: _storage._kChunkSize, fieldNumber: 597)
       }
       if _storage._key != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._key, fieldNumber: 591)
+        try visitor.visitSingularInt32Field(value: _storage._key, fieldNumber: 598)
       }
       if _storage._keyField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyField, fieldNumber: 592)
+        try visitor.visitSingularInt32Field(value: _storage._keyField, fieldNumber: 599)
       }
       if _storage._keyFieldOpt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyFieldOpt, fieldNumber: 593)
+        try visitor.visitSingularInt32Field(value: _storage._keyFieldOpt, fieldNumber: 600)
       }
       if _storage._keyType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._keyType, fieldNumber: 594)
+        try visitor.visitSingularInt32Field(value: _storage._keyType, fieldNumber: 601)
       }
       if _storage._kind != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._kind, fieldNumber: 595)
+        try visitor.visitSingularInt32Field(value: _storage._kind, fieldNumber: 602)
       }
       if _storage._l != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._l, fieldNumber: 596)
+        try visitor.visitSingularInt32Field(value: _storage._l, fieldNumber: 603)
       }
       if _storage._label != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._label, fieldNumber: 597)
+        try visitor.visitSingularInt32Field(value: _storage._label, fieldNumber: 604)
       }
       if _storage._lazy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lazy, fieldNumber: 598)
+        try visitor.visitSingularInt32Field(value: _storage._lazy, fieldNumber: 605)
       }
       if _storage._leadingComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._leadingComments, fieldNumber: 599)
+        try visitor.visitSingularInt32Field(value: _storage._leadingComments, fieldNumber: 606)
       }
       if _storage._leadingDetachedComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._leadingDetachedComments, fieldNumber: 600)
+        try visitor.visitSingularInt32Field(value: _storage._leadingDetachedComments, fieldNumber: 607)
       }
       if _storage._length != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._length, fieldNumber: 601)
+        try visitor.visitSingularInt32Field(value: _storage._length, fieldNumber: 608)
       }
       if _storage._lessThan != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lessThan, fieldNumber: 602)
+        try visitor.visitSingularInt32Field(value: _storage._lessThan, fieldNumber: 609)
       }
       if _storage._let != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._let, fieldNumber: 603)
+        try visitor.visitSingularInt32Field(value: _storage._let, fieldNumber: 610)
       }
       if _storage._lhs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._lhs, fieldNumber: 604)
+        try visitor.visitSingularInt32Field(value: _storage._lhs, fieldNumber: 611)
       }
       if _storage._line != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._line, fieldNumber: 605)
+        try visitor.visitSingularInt32Field(value: _storage._line, fieldNumber: 612)
       }
       if _storage._list != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._list, fieldNumber: 606)
+        try visitor.visitSingularInt32Field(value: _storage._list, fieldNumber: 613)
       }
       if _storage._listOfMessages != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._listOfMessages, fieldNumber: 607)
+        try visitor.visitSingularInt32Field(value: _storage._listOfMessages, fieldNumber: 614)
       }
       if _storage._listValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._listValue, fieldNumber: 608)
+        try visitor.visitSingularInt32Field(value: _storage._listValue, fieldNumber: 615)
       }
       if _storage._littleEndian != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._littleEndian, fieldNumber: 609)
+        try visitor.visitSingularInt32Field(value: _storage._littleEndian, fieldNumber: 616)
       }
       if _storage._load != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._load, fieldNumber: 610)
+        try visitor.visitSingularInt32Field(value: _storage._load, fieldNumber: 617)
       }
       if _storage._localHasher != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._localHasher, fieldNumber: 611)
+        try visitor.visitSingularInt32Field(value: _storage._localHasher, fieldNumber: 618)
       }
       if _storage._location != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._location, fieldNumber: 612)
+        try visitor.visitSingularInt32Field(value: _storage._location, fieldNumber: 619)
       }
       if _storage._m != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._m, fieldNumber: 613)
+        try visitor.visitSingularInt32Field(value: _storage._m, fieldNumber: 620)
       }
       if _storage._major != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._major, fieldNumber: 614)
+        try visitor.visitSingularInt32Field(value: _storage._major, fieldNumber: 621)
       }
       if _storage._makeAsyncIterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._makeAsyncIterator, fieldNumber: 615)
+        try visitor.visitSingularInt32Field(value: _storage._makeAsyncIterator, fieldNumber: 622)
       }
       if _storage._makeIterator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._makeIterator, fieldNumber: 616)
+        try visitor.visitSingularInt32Field(value: _storage._makeIterator, fieldNumber: 623)
       }
       if _storage._malformedLength != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._malformedLength, fieldNumber: 617)
+        try visitor.visitSingularInt32Field(value: _storage._malformedLength, fieldNumber: 624)
       }
       if _storage._mapEntry != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapEntry, fieldNumber: 618)
+        try visitor.visitSingularInt32Field(value: _storage._mapEntry, fieldNumber: 625)
       }
       if _storage._mapKeyType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapKeyType, fieldNumber: 619)
+        try visitor.visitSingularInt32Field(value: _storage._mapKeyType, fieldNumber: 626)
       }
       if _storage._mapToMessages != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapToMessages, fieldNumber: 620)
+        try visitor.visitSingularInt32Field(value: _storage._mapToMessages, fieldNumber: 627)
       }
       if _storage._mapValueType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapValueType, fieldNumber: 621)
+        try visitor.visitSingularInt32Field(value: _storage._mapValueType, fieldNumber: 628)
       }
       if _storage._mapVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mapVisitor, fieldNumber: 622)
+        try visitor.visitSingularInt32Field(value: _storage._mapVisitor, fieldNumber: 629)
       }
       if _storage._mask != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mask, fieldNumber: 623)
+        try visitor.visitSingularInt32Field(value: _storage._mask, fieldNumber: 630)
       }
       if _storage._maximumEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._maximumEdition, fieldNumber: 624)
+        try visitor.visitSingularInt32Field(value: _storage._maximumEdition, fieldNumber: 631)
       }
       if _storage._mdayStart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mdayStart, fieldNumber: 625)
+        try visitor.visitSingularInt32Field(value: _storage._mdayStart, fieldNumber: 632)
       }
       if _storage._merge != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._merge, fieldNumber: 626)
+        try visitor.visitSingularInt32Field(value: _storage._merge, fieldNumber: 633)
       }
       if _storage._mergeOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mergeOptions, fieldNumber: 627)
+        try visitor.visitSingularInt32Field(value: _storage._mergeOptions, fieldNumber: 634)
       }
       if _storage._message != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._message, fieldNumber: 628)
+        try visitor.visitSingularInt32Field(value: _storage._message, fieldNumber: 635)
       }
       if _storage._messageDepthLimit != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageDepthLimit, fieldNumber: 629)
+        try visitor.visitSingularInt32Field(value: _storage._messageDepthLimit, fieldNumber: 636)
       }
       if _storage._messageEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageEncoding, fieldNumber: 630)
+        try visitor.visitSingularInt32Field(value: _storage._messageEncoding, fieldNumber: 637)
       }
       if _storage._messageExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageExtension, fieldNumber: 631)
+        try visitor.visitSingularInt32Field(value: _storage._messageExtension, fieldNumber: 638)
       }
       if _storage._messageImplementationBase != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageImplementationBase, fieldNumber: 632)
+        try visitor.visitSingularInt32Field(value: _storage._messageImplementationBase, fieldNumber: 639)
       }
       if _storage._messageOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageOptions, fieldNumber: 633)
+        try visitor.visitSingularInt32Field(value: _storage._messageOptions, fieldNumber: 640)
       }
       if _storage._messageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSet, fieldNumber: 634)
+        try visitor.visitSingularInt32Field(value: _storage._messageSet, fieldNumber: 641)
       }
       if _storage._messageSetWireFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSetWireFormat, fieldNumber: 635)
+        try visitor.visitSingularInt32Field(value: _storage._messageSetWireFormat, fieldNumber: 642)
       }
       if _storage._messageSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageSize, fieldNumber: 636)
+        try visitor.visitSingularInt32Field(value: _storage._messageSize, fieldNumber: 643)
       }
       if _storage._messageType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._messageType, fieldNumber: 637)
+        try visitor.visitSingularInt32Field(value: _storage._messageType, fieldNumber: 644)
       }
       if _storage._method != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._method, fieldNumber: 638)
+        try visitor.visitSingularInt32Field(value: _storage._method, fieldNumber: 645)
       }
       if _storage._methodDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methodDescriptorProto, fieldNumber: 639)
+        try visitor.visitSingularInt32Field(value: _storage._methodDescriptorProto, fieldNumber: 646)
       }
       if _storage._methodOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methodOptions, fieldNumber: 640)
+        try visitor.visitSingularInt32Field(value: _storage._methodOptions, fieldNumber: 647)
       }
       if _storage._methods != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._methods, fieldNumber: 641)
+        try visitor.visitSingularInt32Field(value: _storage._methods, fieldNumber: 648)
       }
       if _storage._min != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._min, fieldNumber: 642)
+        try visitor.visitSingularInt32Field(value: _storage._min, fieldNumber: 649)
       }
       if _storage._minimumEdition != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._minimumEdition, fieldNumber: 643)
+        try visitor.visitSingularInt32Field(value: _storage._minimumEdition, fieldNumber: 650)
       }
       if _storage._minor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._minor, fieldNumber: 644)
+        try visitor.visitSingularInt32Field(value: _storage._minor, fieldNumber: 651)
       }
       if _storage._mixin != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mixin, fieldNumber: 645)
+        try visitor.visitSingularInt32Field(value: _storage._mixin, fieldNumber: 652)
       }
       if _storage._mixins != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mixins, fieldNumber: 646)
+        try visitor.visitSingularInt32Field(value: _storage._mixins, fieldNumber: 653)
       }
       if _storage._modify != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._modify, fieldNumber: 647)
+        try visitor.visitSingularInt32Field(value: _storage._modify, fieldNumber: 654)
       }
       if _storage._month != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._month, fieldNumber: 648)
+        try visitor.visitSingularInt32Field(value: _storage._month, fieldNumber: 655)
       }
       if _storage._msgExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._msgExtension, fieldNumber: 649)
+        try visitor.visitSingularInt32Field(value: _storage._msgExtension, fieldNumber: 656)
       }
       if _storage._mutating != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._mutating, fieldNumber: 650)
+        try visitor.visitSingularInt32Field(value: _storage._mutating, fieldNumber: 657)
       }
       if _storage._n != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._n, fieldNumber: 651)
+        try visitor.visitSingularInt32Field(value: _storage._n, fieldNumber: 658)
       }
       if _storage._name != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._name, fieldNumber: 652)
+        try visitor.visitSingularInt32Field(value: _storage._name, fieldNumber: 659)
       }
       if _storage._nameDescription != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nameDescription, fieldNumber: 653)
+        try visitor.visitSingularInt32Field(value: _storage._nameDescription, fieldNumber: 660)
       }
       if _storage._nameMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nameMap, fieldNumber: 654)
+        try visitor.visitSingularInt32Field(value: _storage._nameMap, fieldNumber: 661)
       }
       if _storage._namePart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._namePart, fieldNumber: 655)
+        try visitor.visitSingularInt32Field(value: _storage._namePart, fieldNumber: 662)
       }
       if _storage._names != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._names, fieldNumber: 656)
+        try visitor.visitSingularInt32Field(value: _storage._names, fieldNumber: 663)
       }
       if _storage._nanos != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nanos, fieldNumber: 657)
+        try visitor.visitSingularInt32Field(value: _storage._nanos, fieldNumber: 664)
       }
       if _storage._negativeIntValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._negativeIntValue, fieldNumber: 658)
+        try visitor.visitSingularInt32Field(value: _storage._negativeIntValue, fieldNumber: 665)
       }
       if _storage._nestedType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nestedType, fieldNumber: 659)
+        try visitor.visitSingularInt32Field(value: _storage._nestedType, fieldNumber: 666)
       }
       if _storage._newExtensible != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newExtensible, fieldNumber: 660)
+        try visitor.visitSingularInt32Field(value: _storage._newExtensible, fieldNumber: 667)
       }
       if _storage._newL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newL, fieldNumber: 661)
+        try visitor.visitSingularInt32Field(value: _storage._newL, fieldNumber: 668)
       }
       if _storage._newList != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newList, fieldNumber: 662)
+        try visitor.visitSingularInt32Field(value: _storage._newList, fieldNumber: 669)
       }
       if _storage._newMessage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newMessage, fieldNumber: 663)
+        try visitor.visitSingularInt32Field(value: _storage._newMessage, fieldNumber: 670)
       }
       if _storage._newValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._newValue, fieldNumber: 664)
+        try visitor.visitSingularInt32Field(value: _storage._newValue, fieldNumber: 671)
       }
       if _storage._next != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._next, fieldNumber: 665)
+        try visitor.visitSingularInt32Field(value: _storage._next, fieldNumber: 672)
       }
       if _storage._nextByte != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextByte, fieldNumber: 666)
+        try visitor.visitSingularInt32Field(value: _storage._nextByte, fieldNumber: 673)
       }
       if _storage._nextFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextFieldNumber, fieldNumber: 667)
+        try visitor.visitSingularInt32Field(value: _storage._nextFieldNumber, fieldNumber: 674)
       }
       if _storage._nextVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nextVarInt, fieldNumber: 668)
+        try visitor.visitSingularInt32Field(value: _storage._nextVarInt, fieldNumber: 675)
       }
       if _storage._nil != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nil, fieldNumber: 669)
+        try visitor.visitSingularInt32Field(value: _storage._nil, fieldNumber: 676)
       }
       if _storage._nilLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nilLiteral, fieldNumber: 670)
+        try visitor.visitSingularInt32Field(value: _storage._nilLiteral, fieldNumber: 677)
       }
       if _storage._noBytesAvailable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._noBytesAvailable, fieldNumber: 671)
+        try visitor.visitSingularInt32Field(value: _storage._noBytesAvailable, fieldNumber: 678)
       }
       if _storage._noStandardDescriptorAccessor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._noStandardDescriptorAccessor, fieldNumber: 672)
+        try visitor.visitSingularInt32Field(value: _storage._noStandardDescriptorAccessor, fieldNumber: 679)
       }
       if _storage._nullValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._nullValue, fieldNumber: 673)
+        try visitor.visitSingularInt32Field(value: _storage._nullValue, fieldNumber: 680)
       }
       if _storage._number != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._number, fieldNumber: 674)
+        try visitor.visitSingularInt32Field(value: _storage._number, fieldNumber: 681)
       }
       if _storage._numberValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._numberValue, fieldNumber: 675)
+        try visitor.visitSingularInt32Field(value: _storage._numberValue, fieldNumber: 682)
       }
       if _storage._objcClassPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._objcClassPrefix, fieldNumber: 676)
+        try visitor.visitSingularInt32Field(value: _storage._objcClassPrefix, fieldNumber: 683)
       }
       if _storage._of != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._of, fieldNumber: 677)
+        try visitor.visitSingularInt32Field(value: _storage._of, fieldNumber: 684)
       }
       if _storage._oneofDecl != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofDecl, fieldNumber: 678)
+        try visitor.visitSingularInt32Field(value: _storage._oneofDecl, fieldNumber: 685)
       }
       if _storage._oneofDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofDescriptorProto, fieldNumber: 679)
+        try visitor.visitSingularInt32Field(value: _storage._oneofDescriptorProto, fieldNumber: 686)
       }
       if _storage._oneofIndex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofIndex, fieldNumber: 680)
+        try visitor.visitSingularInt32Field(value: _storage._oneofIndex, fieldNumber: 687)
       }
       if _storage._oneofOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofOptions, fieldNumber: 681)
+        try visitor.visitSingularInt32Field(value: _storage._oneofOptions, fieldNumber: 688)
       }
       if _storage._oneofs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneofs, fieldNumber: 682)
+        try visitor.visitSingularInt32Field(value: _storage._oneofs, fieldNumber: 689)
       }
       if _storage._oneOfKind != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._oneOfKind, fieldNumber: 683)
+        try visitor.visitSingularInt32Field(value: _storage._oneOfKind, fieldNumber: 690)
       }
       if _storage._optimizeFor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optimizeFor, fieldNumber: 684)
+        try visitor.visitSingularInt32Field(value: _storage._optimizeFor, fieldNumber: 691)
       }
       if _storage._optimizeMode != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optimizeMode, fieldNumber: 685)
+        try visitor.visitSingularInt32Field(value: _storage._optimizeMode, fieldNumber: 692)
       }
       if _storage._option != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._option, fieldNumber: 686)
+        try visitor.visitSingularInt32Field(value: _storage._option, fieldNumber: 693)
       }
       if _storage._optionalEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalEnumExtensionField, fieldNumber: 687)
+        try visitor.visitSingularInt32Field(value: _storage._optionalEnumExtensionField, fieldNumber: 694)
       }
       if _storage._optionalExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalExtensionField, fieldNumber: 688)
+        try visitor.visitSingularInt32Field(value: _storage._optionalExtensionField, fieldNumber: 695)
       }
       if _storage._optionalGroupExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalGroupExtensionField, fieldNumber: 689)
+        try visitor.visitSingularInt32Field(value: _storage._optionalGroupExtensionField, fieldNumber: 696)
       }
       if _storage._optionalMessageExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionalMessageExtensionField, fieldNumber: 690)
+        try visitor.visitSingularInt32Field(value: _storage._optionalMessageExtensionField, fieldNumber: 697)
       }
       if _storage._optionRetention != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionRetention, fieldNumber: 691)
+        try visitor.visitSingularInt32Field(value: _storage._optionRetention, fieldNumber: 698)
       }
       if _storage._options != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._options, fieldNumber: 692)
+        try visitor.visitSingularInt32Field(value: _storage._options, fieldNumber: 699)
       }
       if _storage._optionTargetType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._optionTargetType, fieldNumber: 693)
+        try visitor.visitSingularInt32Field(value: _storage._optionTargetType, fieldNumber: 700)
       }
       if _storage._other != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._other, fieldNumber: 694)
+        try visitor.visitSingularInt32Field(value: _storage._other, fieldNumber: 701)
       }
       if _storage._others != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._others, fieldNumber: 695)
+        try visitor.visitSingularInt32Field(value: _storage._others, fieldNumber: 702)
       }
       if _storage._out != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._out, fieldNumber: 696)
+        try visitor.visitSingularInt32Field(value: _storage._out, fieldNumber: 703)
       }
       if _storage._outputType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._outputType, fieldNumber: 697)
+        try visitor.visitSingularInt32Field(value: _storage._outputType, fieldNumber: 704)
       }
       if _storage._overridableFeatures != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._overridableFeatures, fieldNumber: 698)
+        try visitor.visitSingularInt32Field(value: _storage._overridableFeatures, fieldNumber: 705)
       }
       if _storage._p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._p, fieldNumber: 699)
+        try visitor.visitSingularInt32Field(value: _storage._p, fieldNumber: 706)
       }
       if _storage._package != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._package, fieldNumber: 700)
+        try visitor.visitSingularInt32Field(value: _storage._package, fieldNumber: 707)
       }
       if _storage._packed != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packed, fieldNumber: 701)
+        try visitor.visitSingularInt32Field(value: _storage._packed, fieldNumber: 708)
       }
       if _storage._packedEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packedEnumExtensionField, fieldNumber: 702)
+        try visitor.visitSingularInt32Field(value: _storage._packedEnumExtensionField, fieldNumber: 709)
       }
       if _storage._packedExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._packedExtensionField, fieldNumber: 703)
+        try visitor.visitSingularInt32Field(value: _storage._packedExtensionField, fieldNumber: 710)
       }
       if _storage._padding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._padding, fieldNumber: 704)
+        try visitor.visitSingularInt32Field(value: _storage._padding, fieldNumber: 711)
       }
       if _storage._parent != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._parent, fieldNumber: 705)
+        try visitor.visitSingularInt32Field(value: _storage._parent, fieldNumber: 712)
       }
       if _storage._parse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._parse, fieldNumber: 706)
+        try visitor.visitSingularInt32Field(value: _storage._parse, fieldNumber: 713)
       }
       if _storage._partial != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._partial, fieldNumber: 707)
+        try visitor.visitSingularInt32Field(value: _storage._partial, fieldNumber: 714)
       }
       if _storage._path != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._path, fieldNumber: 708)
+        try visitor.visitSingularInt32Field(value: _storage._path, fieldNumber: 715)
       }
       if _storage._pathDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathDecoder, fieldNumber: 709)
+        try visitor.visitSingularInt32Field(value: _storage._pathDecoder, fieldNumber: 716)
       }
       if _storage._pathDecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathDecodingError, fieldNumber: 710)
+        try visitor.visitSingularInt32Field(value: _storage._pathDecodingError, fieldNumber: 717)
       }
       if _storage._paths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._paths, fieldNumber: 711)
+        try visitor.visitSingularInt32Field(value: _storage._paths, fieldNumber: 718)
       }
       if _storage._pathVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pathVisitor, fieldNumber: 712)
+        try visitor.visitSingularInt32Field(value: _storage._pathVisitor, fieldNumber: 719)
       }
       if _storage._payload != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._payload, fieldNumber: 713)
+        try visitor.visitSingularInt32Field(value: _storage._payload, fieldNumber: 720)
       }
       if _storage._payloadSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._payloadSize, fieldNumber: 714)
+        try visitor.visitSingularInt32Field(value: _storage._payloadSize, fieldNumber: 721)
       }
       if _storage._phpClassPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpClassPrefix, fieldNumber: 715)
+        try visitor.visitSingularInt32Field(value: _storage._phpClassPrefix, fieldNumber: 722)
       }
       if _storage._phpMetadataNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpMetadataNamespace, fieldNumber: 716)
+        try visitor.visitSingularInt32Field(value: _storage._phpMetadataNamespace, fieldNumber: 723)
       }
       if _storage._phpNamespace != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._phpNamespace, fieldNumber: 717)
+        try visitor.visitSingularInt32Field(value: _storage._phpNamespace, fieldNumber: 724)
       }
       if _storage._pos != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pos, fieldNumber: 718)
+        try visitor.visitSingularInt32Field(value: _storage._pos, fieldNumber: 725)
       }
       if _storage._positiveIntValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._positiveIntValue, fieldNumber: 719)
+        try visitor.visitSingularInt32Field(value: _storage._positiveIntValue, fieldNumber: 726)
       }
       if _storage._prefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._prefix, fieldNumber: 720)
+        try visitor.visitSingularInt32Field(value: _storage._prefix, fieldNumber: 727)
       }
       if _storage._preserveProtoFieldNames != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._preserveProtoFieldNames, fieldNumber: 721)
+        try visitor.visitSingularInt32Field(value: _storage._preserveProtoFieldNames, fieldNumber: 728)
       }
       if _storage._preTraverse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._preTraverse, fieldNumber: 722)
+        try visitor.visitSingularInt32Field(value: _storage._preTraverse, fieldNumber: 729)
       }
       if _storage._prevPath != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._prevPath, fieldNumber: 723)
+        try visitor.visitSingularInt32Field(value: _storage._prevPath, fieldNumber: 730)
       }
       if _storage._printUnknownFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._printUnknownFields, fieldNumber: 724)
+        try visitor.visitSingularInt32Field(value: _storage._printUnknownFields, fieldNumber: 731)
       }
       if _storage._proto2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto2, fieldNumber: 725)
+        try visitor.visitSingularInt32Field(value: _storage._proto2, fieldNumber: 732)
       }
       if _storage._proto3DefaultValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto3DefaultValue, fieldNumber: 726)
+        try visitor.visitSingularInt32Field(value: _storage._proto3DefaultValue, fieldNumber: 733)
       }
       if _storage._proto3Optional != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._proto3Optional, fieldNumber: 727)
+        try visitor.visitSingularInt32Field(value: _storage._proto3Optional, fieldNumber: 734)
       }
       if _storage._protobufApiversionCheck != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufApiversionCheck, fieldNumber: 728)
+        try visitor.visitSingularInt32Field(value: _storage._protobufApiversionCheck, fieldNumber: 735)
       }
       if _storage._protobufApiversion2 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufApiversion2, fieldNumber: 729)
+        try visitor.visitSingularInt32Field(value: _storage._protobufApiversion2, fieldNumber: 736)
       }
       if _storage._protobufBool != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufBool, fieldNumber: 730)
+        try visitor.visitSingularInt32Field(value: _storage._protobufBool, fieldNumber: 737)
       }
       if _storage._protobufBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufBytes, fieldNumber: 731)
+        try visitor.visitSingularInt32Field(value: _storage._protobufBytes, fieldNumber: 738)
       }
       if _storage._protobufDouble != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufDouble, fieldNumber: 732)
+        try visitor.visitSingularInt32Field(value: _storage._protobufDouble, fieldNumber: 739)
       }
       if _storage._protobufEnumMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufEnumMap, fieldNumber: 733)
+        try visitor.visitSingularInt32Field(value: _storage._protobufEnumMap, fieldNumber: 740)
       }
       if _storage._protobufExtension != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufExtension, fieldNumber: 734)
+        try visitor.visitSingularInt32Field(value: _storage._protobufExtension, fieldNumber: 741)
       }
       if _storage._protobufFixed32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFixed32, fieldNumber: 735)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFixed32, fieldNumber: 742)
       }
       if _storage._protobufFixed64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFixed64, fieldNumber: 736)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFixed64, fieldNumber: 743)
       }
       if _storage._protobufFloat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFloat, fieldNumber: 737)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFloat, fieldNumber: 744)
       }
       if _storage._protobufInt32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufInt32, fieldNumber: 738)
+        try visitor.visitSingularInt32Field(value: _storage._protobufInt32, fieldNumber: 745)
       }
       if _storage._protobufInt64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufInt64, fieldNumber: 739)
+        try visitor.visitSingularInt32Field(value: _storage._protobufInt64, fieldNumber: 746)
       }
       if _storage._protobufMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufMap, fieldNumber: 740)
+        try visitor.visitSingularInt32Field(value: _storage._protobufMap, fieldNumber: 747)
       }
       if _storage._protobufMessageMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufMessageMap, fieldNumber: 741)
+        try visitor.visitSingularInt32Field(value: _storage._protobufMessageMap, fieldNumber: 748)
       }
       if _storage._protobufSfixed32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed32, fieldNumber: 742)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed32, fieldNumber: 749)
       }
       if _storage._protobufSfixed64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed64, fieldNumber: 743)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSfixed64, fieldNumber: 750)
       }
       if _storage._protobufSint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSint32, fieldNumber: 744)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSint32, fieldNumber: 751)
       }
       if _storage._protobufSint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufSint64, fieldNumber: 745)
+        try visitor.visitSingularInt32Field(value: _storage._protobufSint64, fieldNumber: 752)
       }
       if _storage._protobufString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufString, fieldNumber: 746)
+        try visitor.visitSingularInt32Field(value: _storage._protobufString, fieldNumber: 753)
       }
       if _storage._protobufUint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufUint32, fieldNumber: 747)
+        try visitor.visitSingularInt32Field(value: _storage._protobufUint32, fieldNumber: 754)
       }
       if _storage._protobufUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufUint64, fieldNumber: 748)
+        try visitor.visitSingularInt32Field(value: _storage._protobufUint64, fieldNumber: 755)
       }
       if _storage._protobufExtensionFieldValues != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufExtensionFieldValues, fieldNumber: 749)
+        try visitor.visitSingularInt32Field(value: _storage._protobufExtensionFieldValues, fieldNumber: 756)
       }
       if _storage._protobufFieldNumber != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufFieldNumber, fieldNumber: 750)
+        try visitor.visitSingularInt32Field(value: _storage._protobufFieldNumber, fieldNumber: 757)
       }
       if _storage._protobufGeneratedIsEqualTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufGeneratedIsEqualTo, fieldNumber: 751)
+        try visitor.visitSingularInt32Field(value: _storage._protobufGeneratedIsEqualTo, fieldNumber: 758)
       }
       if _storage._protobufNameMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufNameMap, fieldNumber: 752)
+        try visitor.visitSingularInt32Field(value: _storage._protobufNameMap, fieldNumber: 759)
       }
       if _storage._protobufNewField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufNewField, fieldNumber: 753)
+        try visitor.visitSingularInt32Field(value: _storage._protobufNewField, fieldNumber: 760)
       }
       if _storage._protobufPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protobufPackage, fieldNumber: 754)
+        try visitor.visitSingularInt32Field(value: _storage._protobufPackage, fieldNumber: 761)
       }
       if _storage._protocol != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protocol, fieldNumber: 755)
+        try visitor.visitSingularInt32Field(value: _storage._protocol, fieldNumber: 762)
       }
       if _storage._protoFieldName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoFieldName, fieldNumber: 756)
+        try visitor.visitSingularInt32Field(value: _storage._protoFieldName, fieldNumber: 763)
       }
       if _storage._protoMessageName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoMessageName, fieldNumber: 757)
+        try visitor.visitSingularInt32Field(value: _storage._protoMessageName, fieldNumber: 764)
       }
       if _storage._protoNameProviding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoNameProviding, fieldNumber: 758)
+        try visitor.visitSingularInt32Field(value: _storage._protoNameProviding, fieldNumber: 765)
       }
       if _storage._protoPaths != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._protoPaths, fieldNumber: 759)
+        try visitor.visitSingularInt32Field(value: _storage._protoPaths, fieldNumber: 766)
       }
       if _storage._public != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._public, fieldNumber: 760)
+        try visitor.visitSingularInt32Field(value: _storage._public, fieldNumber: 767)
       }
       if _storage._publicDependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._publicDependency, fieldNumber: 761)
+        try visitor.visitSingularInt32Field(value: _storage._publicDependency, fieldNumber: 768)
       }
       if _storage._putBoolValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putBoolValue, fieldNumber: 762)
+        try visitor.visitSingularInt32Field(value: _storage._putBoolValue, fieldNumber: 769)
       }
       if _storage._putBytesValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putBytesValue, fieldNumber: 763)
+        try visitor.visitSingularInt32Field(value: _storage._putBytesValue, fieldNumber: 770)
       }
       if _storage._putDoubleValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putDoubleValue, fieldNumber: 764)
+        try visitor.visitSingularInt32Field(value: _storage._putDoubleValue, fieldNumber: 771)
       }
       if _storage._putEnumValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putEnumValue, fieldNumber: 765)
+        try visitor.visitSingularInt32Field(value: _storage._putEnumValue, fieldNumber: 772)
       }
       if _storage._putFixedUint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFixedUint32, fieldNumber: 766)
+        try visitor.visitSingularInt32Field(value: _storage._putFixedUint32, fieldNumber: 773)
       }
       if _storage._putFixedUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFixedUint64, fieldNumber: 767)
+        try visitor.visitSingularInt32Field(value: _storage._putFixedUint64, fieldNumber: 774)
       }
       if _storage._putFloatValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putFloatValue, fieldNumber: 768)
+        try visitor.visitSingularInt32Field(value: _storage._putFloatValue, fieldNumber: 775)
       }
       if _storage._putInt64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putInt64, fieldNumber: 769)
+        try visitor.visitSingularInt32Field(value: _storage._putInt64, fieldNumber: 776)
       }
       if _storage._putStringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putStringValue, fieldNumber: 770)
+        try visitor.visitSingularInt32Field(value: _storage._putStringValue, fieldNumber: 777)
       }
       if _storage._putUint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putUint64, fieldNumber: 771)
+        try visitor.visitSingularInt32Field(value: _storage._putUint64, fieldNumber: 778)
       }
       if _storage._putUint64Hex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putUint64Hex, fieldNumber: 772)
+        try visitor.visitSingularInt32Field(value: _storage._putUint64Hex, fieldNumber: 779)
       }
       if _storage._putVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putVarInt, fieldNumber: 773)
+        try visitor.visitSingularInt32Field(value: _storage._putVarInt, fieldNumber: 780)
       }
       if _storage._putZigZagVarInt != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._putZigZagVarInt, fieldNumber: 774)
+        try visitor.visitSingularInt32Field(value: _storage._putZigZagVarInt, fieldNumber: 781)
       }
       if _storage._pyGenericServices != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._pyGenericServices, fieldNumber: 775)
+        try visitor.visitSingularInt32Field(value: _storage._pyGenericServices, fieldNumber: 782)
       }
       if _storage._r != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._r, fieldNumber: 776)
+        try visitor.visitSingularInt32Field(value: _storage._r, fieldNumber: 783)
       }
       if _storage._rawChars != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawChars, fieldNumber: 777)
+        try visitor.visitSingularInt32Field(value: _storage._rawChars, fieldNumber: 784)
       }
       if _storage._rawRepresentable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawRepresentable, fieldNumber: 778)
+        try visitor.visitSingularInt32Field(value: _storage._rawRepresentable, fieldNumber: 785)
       }
       if _storage._rawValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rawValue, fieldNumber: 779)
+        try visitor.visitSingularInt32Field(value: _storage._rawValue, fieldNumber: 786)
       }
       if _storage._read4HexDigits != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._read4HexDigits, fieldNumber: 780)
+        try visitor.visitSingularInt32Field(value: _storage._read4HexDigits, fieldNumber: 787)
       }
       if _storage._readBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._readBytes, fieldNumber: 781)
+        try visitor.visitSingularInt32Field(value: _storage._readBytes, fieldNumber: 788)
       }
       if _storage._register != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._register, fieldNumber: 782)
+        try visitor.visitSingularInt32Field(value: _storage._register, fieldNumber: 789)
       }
       if _storage._removingAllFieldsOf != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._removingAllFieldsOf, fieldNumber: 783)
+        try visitor.visitSingularInt32Field(value: _storage._removingAllFieldsOf, fieldNumber: 790)
       }
       if _storage._repeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeated, fieldNumber: 784)
+        try visitor.visitSingularInt32Field(value: _storage._repeated, fieldNumber: 791)
       }
       if _storage._repeatedEnumExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedEnumExtensionField, fieldNumber: 785)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedEnumExtensionField, fieldNumber: 792)
       }
       if _storage._repeatedExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedExtensionField, fieldNumber: 786)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedExtensionField, fieldNumber: 793)
       }
       if _storage._repeatedFieldEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedFieldEncoding, fieldNumber: 787)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedFieldEncoding, fieldNumber: 794)
       }
       if _storage._repeatedGroupExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedGroupExtensionField, fieldNumber: 788)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedGroupExtensionField, fieldNumber: 795)
       }
       if _storage._repeatedMessageExtensionField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeatedMessageExtensionField, fieldNumber: 789)
+        try visitor.visitSingularInt32Field(value: _storage._repeatedMessageExtensionField, fieldNumber: 796)
       }
       if _storage._repeating != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._repeating, fieldNumber: 790)
+        try visitor.visitSingularInt32Field(value: _storage._repeating, fieldNumber: 797)
       }
       if _storage._replaceRepeatedFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._replaceRepeatedFields, fieldNumber: 791)
+        try visitor.visitSingularInt32Field(value: _storage._replaceRepeatedFields, fieldNumber: 798)
       }
       if _storage._requestStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requestStreaming, fieldNumber: 792)
+        try visitor.visitSingularInt32Field(value: _storage._requestStreaming, fieldNumber: 799)
       }
       if _storage._requestTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requestTypeURL, fieldNumber: 793)
+        try visitor.visitSingularInt32Field(value: _storage._requestTypeURL, fieldNumber: 800)
       }
       if _storage._requiredSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._requiredSize, fieldNumber: 794)
+        try visitor.visitSingularInt32Field(value: _storage._requiredSize, fieldNumber: 801)
       }
       if _storage._responseStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._responseStreaming, fieldNumber: 795)
+        try visitor.visitSingularInt32Field(value: _storage._responseStreaming, fieldNumber: 802)
       }
       if _storage._responseTypeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._responseTypeURL, fieldNumber: 796)
+        try visitor.visitSingularInt32Field(value: _storage._responseTypeURL, fieldNumber: 803)
       }
       if _storage._result != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._result, fieldNumber: 797)
+        try visitor.visitSingularInt32Field(value: _storage._result, fieldNumber: 804)
       }
       if _storage._retention != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._retention, fieldNumber: 798)
+        try visitor.visitSingularInt32Field(value: _storage._retention, fieldNumber: 805)
       }
       if _storage._rethrows != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rethrows, fieldNumber: 799)
+        try visitor.visitSingularInt32Field(value: _storage._rethrows, fieldNumber: 806)
       }
       if _storage._return != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._return, fieldNumber: 800)
+        try visitor.visitSingularInt32Field(value: _storage._return, fieldNumber: 807)
       }
       if _storage._returnType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._returnType, fieldNumber: 801)
+        try visitor.visitSingularInt32Field(value: _storage._returnType, fieldNumber: 808)
       }
       if _storage._revision != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._revision, fieldNumber: 802)
+        try visitor.visitSingularInt32Field(value: _storage._revision, fieldNumber: 809)
       }
       if _storage._rhs != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rhs, fieldNumber: 803)
+        try visitor.visitSingularInt32Field(value: _storage._rhs, fieldNumber: 810)
       }
       if _storage._root != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._root, fieldNumber: 804)
+        try visitor.visitSingularInt32Field(value: _storage._root, fieldNumber: 811)
       }
       if _storage._rubyPackage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._rubyPackage, fieldNumber: 805)
+        try visitor.visitSingularInt32Field(value: _storage._rubyPackage, fieldNumber: 812)
       }
       if _storage._s != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._s, fieldNumber: 806)
+        try visitor.visitSingularInt32Field(value: _storage._s, fieldNumber: 813)
       }
       if _storage._sawBackslash != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawBackslash, fieldNumber: 807)
+        try visitor.visitSingularInt32Field(value: _storage._sawBackslash, fieldNumber: 814)
       }
       if _storage._sawSection4Characters != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawSection4Characters, fieldNumber: 808)
+        try visitor.visitSingularInt32Field(value: _storage._sawSection4Characters, fieldNumber: 815)
       }
       if _storage._sawSection5Characters != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sawSection5Characters, fieldNumber: 809)
+        try visitor.visitSingularInt32Field(value: _storage._sawSection5Characters, fieldNumber: 816)
       }
       if _storage._scan != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._scan, fieldNumber: 810)
+        try visitor.visitSingularInt32Field(value: _storage._scan, fieldNumber: 817)
       }
       if _storage._scanner != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._scanner, fieldNumber: 811)
+        try visitor.visitSingularInt32Field(value: _storage._scanner, fieldNumber: 818)
       }
       if _storage._seconds != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._seconds, fieldNumber: 812)
+        try visitor.visitSingularInt32Field(value: _storage._seconds, fieldNumber: 819)
       }
       if _storage._self_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._self_p, fieldNumber: 813)
+        try visitor.visitSingularInt32Field(value: _storage._self_p, fieldNumber: 820)
       }
       if _storage._semantic != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._semantic, fieldNumber: 814)
+        try visitor.visitSingularInt32Field(value: _storage._semantic, fieldNumber: 821)
       }
       if _storage._sendable != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sendable, fieldNumber: 815)
+        try visitor.visitSingularInt32Field(value: _storage._sendable, fieldNumber: 822)
       }
       if _storage._separator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._separator, fieldNumber: 816)
+        try visitor.visitSingularInt32Field(value: _storage._separator, fieldNumber: 823)
       }
       if _storage._serialize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serialize, fieldNumber: 817)
+        try visitor.visitSingularInt32Field(value: _storage._serialize, fieldNumber: 824)
       }
       if _storage._serializedBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedBytes, fieldNumber: 818)
+        try visitor.visitSingularInt32Field(value: _storage._serializedBytes, fieldNumber: 825)
       }
       if _storage._serializedData != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedData, fieldNumber: 819)
+        try visitor.visitSingularInt32Field(value: _storage._serializedData, fieldNumber: 826)
       }
       if _storage._serializedSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serializedSize, fieldNumber: 820)
+        try visitor.visitSingularInt32Field(value: _storage._serializedSize, fieldNumber: 827)
       }
       if _storage._serverStreaming != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serverStreaming, fieldNumber: 821)
+        try visitor.visitSingularInt32Field(value: _storage._serverStreaming, fieldNumber: 828)
       }
       if _storage._service != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._service, fieldNumber: 822)
+        try visitor.visitSingularInt32Field(value: _storage._service, fieldNumber: 829)
       }
       if _storage._serviceDescriptorProto != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serviceDescriptorProto, fieldNumber: 823)
+        try visitor.visitSingularInt32Field(value: _storage._serviceDescriptorProto, fieldNumber: 830)
       }
       if _storage._serviceOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._serviceOptions, fieldNumber: 824)
+        try visitor.visitSingularInt32Field(value: _storage._serviceOptions, fieldNumber: 831)
       }
       if _storage._set != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._set, fieldNumber: 825)
+        try visitor.visitSingularInt32Field(value: _storage._set, fieldNumber: 832)
       }
       if _storage._setExtensionValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._setExtensionValue, fieldNumber: 826)
+        try visitor.visitSingularInt32Field(value: _storage._setExtensionValue, fieldNumber: 833)
       }
       if _storage._shift != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._shift, fieldNumber: 827)
+        try visitor.visitSingularInt32Field(value: _storage._shift, fieldNumber: 834)
       }
       if _storage._simpleExtensionMap != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._simpleExtensionMap, fieldNumber: 828)
+        try visitor.visitSingularInt32Field(value: _storage._simpleExtensionMap, fieldNumber: 835)
       }
       if _storage._size != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._size, fieldNumber: 829)
+        try visitor.visitSingularInt32Field(value: _storage._size, fieldNumber: 836)
       }
       if _storage._sizer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sizer, fieldNumber: 830)
+        try visitor.visitSingularInt32Field(value: _storage._sizer, fieldNumber: 837)
       }
       if _storage._source != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._source, fieldNumber: 831)
+        try visitor.visitSingularInt32Field(value: _storage._source, fieldNumber: 838)
       }
       if _storage._sourceCodeInfo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceCodeInfo, fieldNumber: 832)
+        try visitor.visitSingularInt32Field(value: _storage._sourceCodeInfo, fieldNumber: 839)
       }
       if _storage._sourceContext != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceContext, fieldNumber: 833)
+        try visitor.visitSingularInt32Field(value: _storage._sourceContext, fieldNumber: 840)
       }
       if _storage._sourceEncoding != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceEncoding, fieldNumber: 834)
+        try visitor.visitSingularInt32Field(value: _storage._sourceEncoding, fieldNumber: 841)
       }
       if _storage._sourceFile != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceFile, fieldNumber: 835)
+        try visitor.visitSingularInt32Field(value: _storage._sourceFile, fieldNumber: 842)
       }
       if _storage._sourceLocation != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._sourceLocation, fieldNumber: 836)
+        try visitor.visitSingularInt32Field(value: _storage._sourceLocation, fieldNumber: 843)
       }
       if _storage._span != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._span, fieldNumber: 837)
+        try visitor.visitSingularInt32Field(value: _storage._span, fieldNumber: 844)
       }
       if _storage._split != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._split, fieldNumber: 838)
+        try visitor.visitSingularInt32Field(value: _storage._split, fieldNumber: 845)
       }
       if _storage._start != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._start, fieldNumber: 839)
+        try visitor.visitSingularInt32Field(value: _storage._start, fieldNumber: 846)
       }
       if _storage._startArray != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startArray, fieldNumber: 840)
+        try visitor.visitSingularInt32Field(value: _storage._startArray, fieldNumber: 847)
       }
       if _storage._startArrayObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startArrayObject, fieldNumber: 841)
+        try visitor.visitSingularInt32Field(value: _storage._startArrayObject, fieldNumber: 848)
       }
       if _storage._startField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startField, fieldNumber: 842)
+        try visitor.visitSingularInt32Field(value: _storage._startField, fieldNumber: 849)
       }
       if _storage._startIndex != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startIndex, fieldNumber: 843)
+        try visitor.visitSingularInt32Field(value: _storage._startIndex, fieldNumber: 850)
       }
       if _storage._startMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startMessageField, fieldNumber: 844)
+        try visitor.visitSingularInt32Field(value: _storage._startMessageField, fieldNumber: 851)
       }
       if _storage._startObject != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startObject, fieldNumber: 845)
+        try visitor.visitSingularInt32Field(value: _storage._startObject, fieldNumber: 852)
       }
       if _storage._startRegularField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._startRegularField, fieldNumber: 846)
+        try visitor.visitSingularInt32Field(value: _storage._startRegularField, fieldNumber: 853)
       }
       if _storage._state != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._state, fieldNumber: 847)
+        try visitor.visitSingularInt32Field(value: _storage._state, fieldNumber: 854)
       }
       if _storage._static != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._static, fieldNumber: 848)
+        try visitor.visitSingularInt32Field(value: _storage._static, fieldNumber: 855)
       }
       if _storage._staticString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._staticString, fieldNumber: 849)
+        try visitor.visitSingularInt32Field(value: _storage._staticString, fieldNumber: 856)
       }
       if _storage._storage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._storage, fieldNumber: 850)
+        try visitor.visitSingularInt32Field(value: _storage._storage, fieldNumber: 857)
       }
       if _storage._string != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._string, fieldNumber: 851)
+        try visitor.visitSingularInt32Field(value: _storage._string, fieldNumber: 858)
       }
       if _storage._stringLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringLiteral, fieldNumber: 852)
+        try visitor.visitSingularInt32Field(value: _storage._stringLiteral, fieldNumber: 859)
       }
       if _storage._stringLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringLiteralType, fieldNumber: 853)
+        try visitor.visitSingularInt32Field(value: _storage._stringLiteralType, fieldNumber: 860)
       }
       if _storage._stringResult != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringResult, fieldNumber: 854)
+        try visitor.visitSingularInt32Field(value: _storage._stringResult, fieldNumber: 861)
       }
       if _storage._stringValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._stringValue, fieldNumber: 855)
+        try visitor.visitSingularInt32Field(value: _storage._stringValue, fieldNumber: 862)
       }
       if _storage._struct != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._struct, fieldNumber: 856)
+        try visitor.visitSingularInt32Field(value: _storage._struct, fieldNumber: 863)
       }
       if _storage._structValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._structValue, fieldNumber: 857)
+        try visitor.visitSingularInt32Field(value: _storage._structValue, fieldNumber: 864)
       }
       if _storage._subDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subDecoder, fieldNumber: 858)
+        try visitor.visitSingularInt32Field(value: _storage._subDecoder, fieldNumber: 865)
       }
       if _storage._subscript != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subscript, fieldNumber: 859)
+        try visitor.visitSingularInt32Field(value: _storage._subscript, fieldNumber: 866)
       }
       if _storage._subtract != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subtract, fieldNumber: 860)
+        try visitor.visitSingularInt32Field(value: _storage._subtract, fieldNumber: 867)
       }
       if _storage._subVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._subVisitor, fieldNumber: 861)
+        try visitor.visitSingularInt32Field(value: _storage._subVisitor, fieldNumber: 868)
       }
       if _storage._swift != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swift, fieldNumber: 862)
+        try visitor.visitSingularInt32Field(value: _storage._swift, fieldNumber: 869)
       }
       if _storage._swiftPrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftPrefix, fieldNumber: 863)
+        try visitor.visitSingularInt32Field(value: _storage._swiftPrefix, fieldNumber: 870)
       }
       if _storage._swiftProtobufContiguousBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufContiguousBytes, fieldNumber: 864)
+        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufContiguousBytes, fieldNumber: 871)
       }
       if _storage._swiftProtobufError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufError, fieldNumber: 865)
+        try visitor.visitSingularInt32Field(value: _storage._swiftProtobufError, fieldNumber: 872)
       }
       if _storage._syntax != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._syntax, fieldNumber: 866)
+        try visitor.visitSingularInt32Field(value: _storage._syntax, fieldNumber: 873)
       }
       if _storage._t != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._t, fieldNumber: 867)
+        try visitor.visitSingularInt32Field(value: _storage._t, fieldNumber: 874)
       }
       if _storage._tag != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tag, fieldNumber: 868)
+        try visitor.visitSingularInt32Field(value: _storage._tag, fieldNumber: 875)
       }
       if _storage._targets != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._targets, fieldNumber: 869)
+        try visitor.visitSingularInt32Field(value: _storage._targets, fieldNumber: 876)
       }
       if _storage._terminator != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._terminator, fieldNumber: 870)
+        try visitor.visitSingularInt32Field(value: _storage._terminator, fieldNumber: 877)
       }
       if _storage._testDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._testDecoder, fieldNumber: 871)
+        try visitor.visitSingularInt32Field(value: _storage._testDecoder, fieldNumber: 878)
       }
       if _storage._text != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._text, fieldNumber: 872)
+        try visitor.visitSingularInt32Field(value: _storage._text, fieldNumber: 879)
       }
       if _storage._textDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textDecoder, fieldNumber: 873)
+        try visitor.visitSingularInt32Field(value: _storage._textDecoder, fieldNumber: 880)
       }
       if _storage._textFormatDecoder != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecoder, fieldNumber: 874)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecoder, fieldNumber: 881)
       }
       if _storage._textFormatDecodingError != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingError, fieldNumber: 875)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingError, fieldNumber: 882)
       }
       if _storage._textFormatDecodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingOptions, fieldNumber: 876)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatDecodingOptions, fieldNumber: 883)
       }
       if _storage._textFormatEncodingOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingOptions, fieldNumber: 877)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingOptions, fieldNumber: 884)
       }
       if _storage._textFormatEncodingVisitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingVisitor, fieldNumber: 878)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatEncodingVisitor, fieldNumber: 885)
       }
       if _storage._textFormatString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._textFormatString, fieldNumber: 879)
+        try visitor.visitSingularInt32Field(value: _storage._textFormatString, fieldNumber: 886)
       }
       if _storage._throwOrIgnore != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._throwOrIgnore, fieldNumber: 880)
+        try visitor.visitSingularInt32Field(value: _storage._throwOrIgnore, fieldNumber: 887)
       }
       if _storage._throws != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._throws, fieldNumber: 881)
+        try visitor.visitSingularInt32Field(value: _storage._throws, fieldNumber: 888)
       }
       if _storage._timeInterval != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeInterval, fieldNumber: 882)
+        try visitor.visitSingularInt32Field(value: _storage._timeInterval, fieldNumber: 889)
       }
       if _storage._timeIntervalSince1970 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSince1970, fieldNumber: 883)
+        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSince1970, fieldNumber: 890)
       }
       if _storage._timeIntervalSinceReferenceDate != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSinceReferenceDate, fieldNumber: 884)
+        try visitor.visitSingularInt32Field(value: _storage._timeIntervalSinceReferenceDate, fieldNumber: 891)
       }
       if _storage._timestamp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._timestamp, fieldNumber: 885)
+        try visitor.visitSingularInt32Field(value: _storage._timestamp, fieldNumber: 892)
       }
       if _storage._tmp != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tmp, fieldNumber: 886)
+        try visitor.visitSingularInt32Field(value: _storage._tmp, fieldNumber: 893)
       }
       if _storage._tooLarge != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._tooLarge, fieldNumber: 887)
+        try visitor.visitSingularInt32Field(value: _storage._tooLarge, fieldNumber: 894)
       }
       if _storage._total != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._total, fieldNumber: 888)
+        try visitor.visitSingularInt32Field(value: _storage._total, fieldNumber: 895)
       }
       if _storage._totalArrayDepth != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._totalArrayDepth, fieldNumber: 889)
+        try visitor.visitSingularInt32Field(value: _storage._totalArrayDepth, fieldNumber: 896)
       }
       if _storage._totalSize != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._totalSize, fieldNumber: 890)
+        try visitor.visitSingularInt32Field(value: _storage._totalSize, fieldNumber: 897)
       }
       if _storage._trailingComments != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._trailingComments, fieldNumber: 891)
+        try visitor.visitSingularInt32Field(value: _storage._trailingComments, fieldNumber: 898)
       }
       if _storage._traverse != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._traverse, fieldNumber: 892)
+        try visitor.visitSingularInt32Field(value: _storage._traverse, fieldNumber: 899)
       }
       if _storage._trim != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._trim, fieldNumber: 893)
+        try visitor.visitSingularInt32Field(value: _storage._trim, fieldNumber: 900)
       }
       if _storage._true != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._true, fieldNumber: 894)
+        try visitor.visitSingularInt32Field(value: _storage._true, fieldNumber: 901)
       }
       if _storage._try != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._try, fieldNumber: 895)
+        try visitor.visitSingularInt32Field(value: _storage._try, fieldNumber: 902)
       }
       if _storage._type != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._type, fieldNumber: 896)
+        try visitor.visitSingularInt32Field(value: _storage._type, fieldNumber: 903)
       }
       if _storage._typealias != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typealias, fieldNumber: 897)
+        try visitor.visitSingularInt32Field(value: _storage._typealias, fieldNumber: 904)
       }
       if _storage._typeEnum != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeEnum, fieldNumber: 898)
+        try visitor.visitSingularInt32Field(value: _storage._typeEnum, fieldNumber: 905)
       }
       if _storage._typeName != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeName, fieldNumber: 899)
+        try visitor.visitSingularInt32Field(value: _storage._typeName, fieldNumber: 906)
       }
       if _storage._typePrefix != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typePrefix, fieldNumber: 900)
+        try visitor.visitSingularInt32Field(value: _storage._typePrefix, fieldNumber: 907)
       }
       if _storage._typeStart != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeStart, fieldNumber: 901)
+        try visitor.visitSingularInt32Field(value: _storage._typeStart, fieldNumber: 908)
       }
       if _storage._typeUnknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeUnknown, fieldNumber: 902)
+        try visitor.visitSingularInt32Field(value: _storage._typeUnknown, fieldNumber: 909)
       }
       if _storage._typeURL != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._typeURL, fieldNumber: 903)
+        try visitor.visitSingularInt32Field(value: _storage._typeURL, fieldNumber: 910)
       }
       if _storage._uint32 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint32, fieldNumber: 904)
+        try visitor.visitSingularInt32Field(value: _storage._uint32, fieldNumber: 911)
       }
       if _storage._uint32Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint32Value, fieldNumber: 905)
+        try visitor.visitSingularInt32Field(value: _storage._uint32Value, fieldNumber: 912)
       }
       if _storage._uint64 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint64, fieldNumber: 906)
+        try visitor.visitSingularInt32Field(value: _storage._uint64, fieldNumber: 913)
       }
       if _storage._uint64Value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint64Value, fieldNumber: 907)
+        try visitor.visitSingularInt32Field(value: _storage._uint64Value, fieldNumber: 914)
       }
       if _storage._uint8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uint8, fieldNumber: 908)
+        try visitor.visitSingularInt32Field(value: _storage._uint8, fieldNumber: 915)
       }
       if _storage._unchecked != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unchecked, fieldNumber: 909)
+        try visitor.visitSingularInt32Field(value: _storage._unchecked, fieldNumber: 916)
       }
       if _storage._unicodeScalarLiteral != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteral, fieldNumber: 910)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteral, fieldNumber: 917)
       }
       if _storage._unicodeScalarLiteralType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteralType, fieldNumber: 911)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarLiteralType, fieldNumber: 918)
       }
       if _storage._unicodeScalars != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalars, fieldNumber: 912)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalars, fieldNumber: 919)
       }
       if _storage._unicodeScalarView != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarView, fieldNumber: 913)
+        try visitor.visitSingularInt32Field(value: _storage._unicodeScalarView, fieldNumber: 920)
       }
       if _storage._uninterpretedOption != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uninterpretedOption, fieldNumber: 914)
+        try visitor.visitSingularInt32Field(value: _storage._uninterpretedOption, fieldNumber: 921)
       }
       if _storage._union != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._union, fieldNumber: 915)
+        try visitor.visitSingularInt32Field(value: _storage._union, fieldNumber: 922)
       }
       if _storage._uniqueStorage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._uniqueStorage, fieldNumber: 916)
+        try visitor.visitSingularInt32Field(value: _storage._uniqueStorage, fieldNumber: 923)
       }
       if _storage._unknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknown, fieldNumber: 917)
+        try visitor.visitSingularInt32Field(value: _storage._unknown, fieldNumber: 924)
       }
       if _storage._unknownFields_p != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknownFields_p, fieldNumber: 918)
+        try visitor.visitSingularInt32Field(value: _storage._unknownFields_p, fieldNumber: 925)
       }
       if _storage._unknownStorage != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unknownStorage, fieldNumber: 919)
+        try visitor.visitSingularInt32Field(value: _storage._unknownStorage, fieldNumber: 926)
       }
       if _storage._unpackTo != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unpackTo, fieldNumber: 920)
+        try visitor.visitSingularInt32Field(value: _storage._unpackTo, fieldNumber: 927)
       }
       if _storage._unsafeBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeBufferPointer, fieldNumber: 921)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeBufferPointer, fieldNumber: 928)
       }
       if _storage._unsafeMutablePointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeMutablePointer, fieldNumber: 922)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeMutablePointer, fieldNumber: 929)
       }
       if _storage._unsafeMutableRawBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeMutableRawBufferPointer, fieldNumber: 923)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeMutableRawBufferPointer, fieldNumber: 930)
       }
       if _storage._unsafeRawBufferPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeRawBufferPointer, fieldNumber: 924)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeRawBufferPointer, fieldNumber: 931)
       }
       if _storage._unsafeRawPointer != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unsafeRawPointer, fieldNumber: 925)
+        try visitor.visitSingularInt32Field(value: _storage._unsafeRawPointer, fieldNumber: 932)
       }
       if _storage._unverifiedLazy != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._unverifiedLazy, fieldNumber: 926)
+        try visitor.visitSingularInt32Field(value: _storage._unverifiedLazy, fieldNumber: 933)
       }
       if _storage._updatedOptions != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._updatedOptions, fieldNumber: 927)
+        try visitor.visitSingularInt32Field(value: _storage._updatedOptions, fieldNumber: 934)
       }
       if _storage._url != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._url, fieldNumber: 928)
+        try visitor.visitSingularInt32Field(value: _storage._url, fieldNumber: 935)
       }
       if _storage._useDeterministicOrdering != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._useDeterministicOrdering, fieldNumber: 929)
+        try visitor.visitSingularInt32Field(value: _storage._useDeterministicOrdering, fieldNumber: 936)
       }
       if _storage._utf8 != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8, fieldNumber: 930)
+        try visitor.visitSingularInt32Field(value: _storage._utf8, fieldNumber: 937)
       }
       if _storage._utf8Ptr != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8Ptr, fieldNumber: 931)
+        try visitor.visitSingularInt32Field(value: _storage._utf8Ptr, fieldNumber: 938)
       }
       if _storage._utf8ToDouble != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8ToDouble, fieldNumber: 932)
+        try visitor.visitSingularInt32Field(value: _storage._utf8ToDouble, fieldNumber: 939)
       }
       if _storage._utf8Validation != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8Validation, fieldNumber: 933)
+        try visitor.visitSingularInt32Field(value: _storage._utf8Validation, fieldNumber: 940)
       }
       if _storage._utf8View != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._utf8View, fieldNumber: 934)
+        try visitor.visitSingularInt32Field(value: _storage._utf8View, fieldNumber: 941)
       }
       if _storage._v != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._v, fieldNumber: 935)
+        try visitor.visitSingularInt32Field(value: _storage._v, fieldNumber: 942)
       }
       if _storage._value != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._value, fieldNumber: 936)
+        try visitor.visitSingularInt32Field(value: _storage._value, fieldNumber: 943)
       }
       if _storage._valueField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._valueField, fieldNumber: 937)
+        try visitor.visitSingularInt32Field(value: _storage._valueField, fieldNumber: 944)
       }
       if _storage._values != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._values, fieldNumber: 938)
+        try visitor.visitSingularInt32Field(value: _storage._values, fieldNumber: 945)
       }
       if _storage._valueType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._valueType, fieldNumber: 939)
+        try visitor.visitSingularInt32Field(value: _storage._valueType, fieldNumber: 946)
       }
       if _storage._var != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._var, fieldNumber: 940)
+        try visitor.visitSingularInt32Field(value: _storage._var, fieldNumber: 947)
       }
       if _storage._verification != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._verification, fieldNumber: 941)
+        try visitor.visitSingularInt32Field(value: _storage._verification, fieldNumber: 948)
       }
       if _storage._verificationState != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._verificationState, fieldNumber: 942)
+        try visitor.visitSingularInt32Field(value: _storage._verificationState, fieldNumber: 949)
       }
       if _storage._version != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._version, fieldNumber: 943)
+        try visitor.visitSingularInt32Field(value: _storage._version, fieldNumber: 950)
       }
       if _storage._versionString != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._versionString, fieldNumber: 944)
+        try visitor.visitSingularInt32Field(value: _storage._versionString, fieldNumber: 951)
       }
       if _storage._visitExtensionFields != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFields, fieldNumber: 945)
+        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFields, fieldNumber: 952)
       }
       if _storage._visitExtensionFieldsAsMessageSet != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFieldsAsMessageSet, fieldNumber: 946)
+        try visitor.visitSingularInt32Field(value: _storage._visitExtensionFieldsAsMessageSet, fieldNumber: 953)
       }
       if _storage._visitMapField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitMapField, fieldNumber: 947)
+        try visitor.visitSingularInt32Field(value: _storage._visitMapField, fieldNumber: 954)
       }
       if _storage._visitor != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitor, fieldNumber: 948)
+        try visitor.visitSingularInt32Field(value: _storage._visitor, fieldNumber: 955)
       }
       if _storage._visitPacked != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPacked, fieldNumber: 949)
+        try visitor.visitSingularInt32Field(value: _storage._visitPacked, fieldNumber: 956)
       }
       if _storage._visitPackedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedBoolField, fieldNumber: 950)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedBoolField, fieldNumber: 957)
       }
       if _storage._visitPackedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedDoubleField, fieldNumber: 951)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedDoubleField, fieldNumber: 958)
       }
       if _storage._visitPackedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedEnumField, fieldNumber: 952)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedEnumField, fieldNumber: 959)
       }
       if _storage._visitPackedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed32Field, fieldNumber: 953)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed32Field, fieldNumber: 960)
       }
       if _storage._visitPackedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed64Field, fieldNumber: 954)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFixed64Field, fieldNumber: 961)
       }
       if _storage._visitPackedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedFloatField, fieldNumber: 955)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedFloatField, fieldNumber: 962)
       }
       if _storage._visitPackedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt32Field, fieldNumber: 956)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt32Field, fieldNumber: 963)
       }
       if _storage._visitPackedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt64Field, fieldNumber: 957)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedInt64Field, fieldNumber: 964)
       }
       if _storage._visitPackedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed32Field, fieldNumber: 958)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed32Field, fieldNumber: 965)
       }
       if _storage._visitPackedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed64Field, fieldNumber: 959)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSfixed64Field, fieldNumber: 966)
       }
       if _storage._visitPackedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint32Field, fieldNumber: 960)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint32Field, fieldNumber: 967)
       }
       if _storage._visitPackedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint64Field, fieldNumber: 961)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedSint64Field, fieldNumber: 968)
       }
       if _storage._visitPackedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint32Field, fieldNumber: 962)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint32Field, fieldNumber: 969)
       }
       if _storage._visitPackedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint64Field, fieldNumber: 963)
+        try visitor.visitSingularInt32Field(value: _storage._visitPackedUint64Field, fieldNumber: 970)
       }
       if _storage._visitRepeated != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeated, fieldNumber: 964)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeated, fieldNumber: 971)
       }
       if _storage._visitRepeatedBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBoolField, fieldNumber: 965)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBoolField, fieldNumber: 972)
       }
       if _storage._visitRepeatedBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBytesField, fieldNumber: 966)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedBytesField, fieldNumber: 973)
       }
       if _storage._visitRepeatedDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedDoubleField, fieldNumber: 967)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedDoubleField, fieldNumber: 974)
       }
       if _storage._visitRepeatedEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedEnumField, fieldNumber: 968)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedEnumField, fieldNumber: 975)
       }
       if _storage._visitRepeatedFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed32Field, fieldNumber: 969)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed32Field, fieldNumber: 976)
       }
       if _storage._visitRepeatedFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed64Field, fieldNumber: 970)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFixed64Field, fieldNumber: 977)
       }
       if _storage._visitRepeatedFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFloatField, fieldNumber: 971)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedFloatField, fieldNumber: 978)
       }
       if _storage._visitRepeatedGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedGroupField, fieldNumber: 972)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedGroupField, fieldNumber: 979)
       }
       if _storage._visitRepeatedInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt32Field, fieldNumber: 973)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt32Field, fieldNumber: 980)
       }
       if _storage._visitRepeatedInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt64Field, fieldNumber: 974)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedInt64Field, fieldNumber: 981)
       }
       if _storage._visitRepeatedMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedMessageField, fieldNumber: 975)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedMessageField, fieldNumber: 982)
       }
       if _storage._visitRepeatedSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed32Field, fieldNumber: 976)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed32Field, fieldNumber: 983)
       }
       if _storage._visitRepeatedSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed64Field, fieldNumber: 977)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSfixed64Field, fieldNumber: 984)
       }
       if _storage._visitRepeatedSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint32Field, fieldNumber: 978)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint32Field, fieldNumber: 985)
       }
       if _storage._visitRepeatedSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint64Field, fieldNumber: 979)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedSint64Field, fieldNumber: 986)
       }
       if _storage._visitRepeatedStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedStringField, fieldNumber: 980)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedStringField, fieldNumber: 987)
       }
       if _storage._visitRepeatedUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint32Field, fieldNumber: 981)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint32Field, fieldNumber: 988)
       }
       if _storage._visitRepeatedUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint64Field, fieldNumber: 982)
+        try visitor.visitSingularInt32Field(value: _storage._visitRepeatedUint64Field, fieldNumber: 989)
       }
       if _storage._visitSingular != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingular, fieldNumber: 983)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingular, fieldNumber: 990)
       }
       if _storage._visitSingularBoolField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularBoolField, fieldNumber: 984)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularBoolField, fieldNumber: 991)
       }
       if _storage._visitSingularBytesField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularBytesField, fieldNumber: 985)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularBytesField, fieldNumber: 992)
       }
       if _storage._visitSingularDoubleField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularDoubleField, fieldNumber: 986)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularDoubleField, fieldNumber: 993)
       }
       if _storage._visitSingularEnumField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularEnumField, fieldNumber: 987)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularEnumField, fieldNumber: 994)
       }
       if _storage._visitSingularFixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed32Field, fieldNumber: 988)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed32Field, fieldNumber: 995)
       }
       if _storage._visitSingularFixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed64Field, fieldNumber: 989)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFixed64Field, fieldNumber: 996)
       }
       if _storage._visitSingularFloatField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularFloatField, fieldNumber: 990)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularFloatField, fieldNumber: 997)
       }
       if _storage._visitSingularGroupField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularGroupField, fieldNumber: 991)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularGroupField, fieldNumber: 998)
       }
       if _storage._visitSingularInt32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt32Field, fieldNumber: 992)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt32Field, fieldNumber: 999)
       }
       if _storage._visitSingularInt64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt64Field, fieldNumber: 993)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularInt64Field, fieldNumber: 1000)
       }
       if _storage._visitSingularMessageField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularMessageField, fieldNumber: 994)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularMessageField, fieldNumber: 1001)
       }
       if _storage._visitSingularSfixed32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed32Field, fieldNumber: 995)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed32Field, fieldNumber: 1002)
       }
       if _storage._visitSingularSfixed64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed64Field, fieldNumber: 996)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSfixed64Field, fieldNumber: 1003)
       }
       if _storage._visitSingularSint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint32Field, fieldNumber: 997)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint32Field, fieldNumber: 1004)
       }
       if _storage._visitSingularSint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint64Field, fieldNumber: 998)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularSint64Field, fieldNumber: 1005)
       }
       if _storage._visitSingularStringField != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularStringField, fieldNumber: 999)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularStringField, fieldNumber: 1006)
       }
       if _storage._visitSingularUint32Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint32Field, fieldNumber: 1000)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint32Field, fieldNumber: 1007)
       }
       if _storage._visitSingularUint64Field != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint64Field, fieldNumber: 1001)
+        try visitor.visitSingularInt32Field(value: _storage._visitSingularUint64Field, fieldNumber: 1008)
       }
       if _storage._visitUnknown != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._visitUnknown, fieldNumber: 1002)
+        try visitor.visitSingularInt32Field(value: _storage._visitUnknown, fieldNumber: 1009)
       }
       if _storage._wasDecoded != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wasDecoded, fieldNumber: 1003)
+        try visitor.visitSingularInt32Field(value: _storage._wasDecoded, fieldNumber: 1010)
       }
       if _storage._weak != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._weak, fieldNumber: 1004)
+        try visitor.visitSingularInt32Field(value: _storage._weak, fieldNumber: 1011)
       }
       if _storage._weakDependency != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._weakDependency, fieldNumber: 1005)
+        try visitor.visitSingularInt32Field(value: _storage._weakDependency, fieldNumber: 1012)
       }
       if _storage._where != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._where, fieldNumber: 1006)
+        try visitor.visitSingularInt32Field(value: _storage._where, fieldNumber: 1013)
       }
       if _storage._wireFormat != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wireFormat, fieldNumber: 1007)
+        try visitor.visitSingularInt32Field(value: _storage._wireFormat, fieldNumber: 1014)
       }
       if _storage._with != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._with, fieldNumber: 1008)
+        try visitor.visitSingularInt32Field(value: _storage._with, fieldNumber: 1015)
       }
       if _storage._withUnsafeBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._withUnsafeBytes, fieldNumber: 1009)
+        try visitor.visitSingularInt32Field(value: _storage._withUnsafeBytes, fieldNumber: 1016)
       }
       if _storage._withUnsafeMutableBytes != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._withUnsafeMutableBytes, fieldNumber: 1010)
+        try visitor.visitSingularInt32Field(value: _storage._withUnsafeMutableBytes, fieldNumber: 1017)
       }
       if _storage._work != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._work, fieldNumber: 1011)
+        try visitor.visitSingularInt32Field(value: _storage._work, fieldNumber: 1018)
       }
       if _storage._wrapped != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrapped, fieldNumber: 1012)
+        try visitor.visitSingularInt32Field(value: _storage._wrapped, fieldNumber: 1019)
       }
       if _storage._wrappedType != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrappedType, fieldNumber: 1013)
+        try visitor.visitSingularInt32Field(value: _storage._wrappedType, fieldNumber: 1020)
       }
       if _storage._wrappedValue != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._wrappedValue, fieldNumber: 1014)
+        try visitor.visitSingularInt32Field(value: _storage._wrappedValue, fieldNumber: 1021)
       }
       if _storage._written != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._written, fieldNumber: 1015)
+        try visitor.visitSingularInt32Field(value: _storage._written, fieldNumber: 1022)
       }
       if _storage._yday != 0 {
-        try visitor.visitSingularInt32Field(value: _storage._yday, fieldNumber: 1016)
+        try visitor.visitSingularInt32Field(value: _storage._yday, fieldNumber: 1023)
       }
     }
     try unknownFields.traverse(visitor: &visitor)
@@ -12383,6 +12467,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._clearEditionIntroduced_p != rhs_storage._clearEditionIntroduced_p {return false}
         if _storage._clearEditionRemoved_p != rhs_storage._clearEditionRemoved_p {return false}
         if _storage._clearEnd_p != rhs_storage._clearEnd_p {return false}
+        if _storage._clearEnforceNamingStyle_p != rhs_storage._clearEnforceNamingStyle_p {return false}
         if _storage._clearEnumType_p != rhs_storage._clearEnumType_p {return false}
         if _storage._clearExtendee_p != rhs_storage._clearExtendee_p {return false}
         if _storage._clearExtensionValue_p != rhs_storage._clearExtensionValue_p {return false}
@@ -12565,6 +12650,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._emitFieldName != rhs_storage._emitFieldName {return false}
         if _storage._emitFieldNumber != rhs_storage._emitFieldNumber {return false}
         if _storage._empty != rhs_storage._empty {return false}
+        if _storage._emptyAnyTypeURL != rhs_storage._emptyAnyTypeURL {return false}
         if _storage._emptyData != rhs_storage._emptyData {return false}
         if _storage._encodeAsBytes != rhs_storage._encodeAsBytes {return false}
         if _storage._encoded != rhs_storage._encoded {return false}
@@ -12577,6 +12663,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._endMessageField != rhs_storage._endMessageField {return false}
         if _storage._endObject != rhs_storage._endObject {return false}
         if _storage._endRegularField != rhs_storage._endRegularField {return false}
+        if _storage._enforceNamingStyle != rhs_storage._enforceNamingStyle {return false}
         if _storage._enum != rhs_storage._enum {return false}
         if _storage._enumDescriptorProto != rhs_storage._enumDescriptorProto {return false}
         if _storage._enumOptions != rhs_storage._enumOptions {return false}
@@ -12740,6 +12827,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._hasEditionIntroduced_p != rhs_storage._hasEditionIntroduced_p {return false}
         if _storage._hasEditionRemoved_p != rhs_storage._hasEditionRemoved_p {return false}
         if _storage._hasEnd_p != rhs_storage._hasEnd_p {return false}
+        if _storage._hasEnforceNamingStyle_p != rhs_storage._hasEnforceNamingStyle_p {return false}
         if _storage._hasEnumType_p != rhs_storage._hasEnumType_p {return false}
         if _storage._hasExtendee_p != rhs_storage._hasExtendee_p {return false}
         if _storage._hasExtensionValue_p != rhs_storage._hasExtensionValue_p {return false}
@@ -12841,6 +12929,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._intersect != rhs_storage._intersect {return false}
         if _storage._into != rhs_storage._into {return false}
         if _storage._ints != rhs_storage._ints {return false}
+        if _storage._invalidAnyTypeURL != rhs_storage._invalidAnyTypeURL {return false}
         if _storage._isA != rhs_storage._isA {return false}
         if _storage._isEqual != rhs_storage._isEqual {return false}
         if _storage._isEqualTo != rhs_storage._isEqualTo {return false}
@@ -12858,9 +12947,11 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedFields: SwiftProtobu
         if _storage._javaPackage != rhs_storage._javaPackage {return false}
         if _storage._javaStringCheckUtf8 != rhs_storage._javaStringCheckUtf8 {return false}
         if _storage._jsondecoder != rhs_storage._jsondecoder {return false}
+        if _storage._jsondecoding != rhs_storage._jsondecoding {return false}
         if _storage._jsondecodingError != rhs_storage._jsondecodingError {return false}
         if _storage._jsondecodingOptions != rhs_storage._jsondecodingOptions {return false}
         if _storage._jsonEncoder != rhs_storage._jsonEncoder {return false}
+        if _storage._jsonencoding != rhs_storage._jsonencoding {return false}
         if _storage._jsonencodingError != rhs_storage._jsonencodingError {return false}
         if _storage._jsonencodingOptions != rhs_storage._jsonencodingOptions {return false}
         if _storage._jsonencodingVisitor != rhs_storage._jsonencodingVisitor {return false}
diff --git a/Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift b/Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift
index 32db4ebda..a57f8d8d0 100644
--- a/Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift
+++ b/Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift
@@ -1183,6 +1183,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct clearEnforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var clearEnforceNamingStyle_p: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct clearEnumType: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -3187,7 +3199,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
-  struct Duration: Sendable {
+  struct duration: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
@@ -3367,6 +3379,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct emptyAnyTypeURL: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var emptyAnyTypeURL: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct emptyData: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -3511,6 +3535,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct enforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var enforceNamingStyle: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct enumMessage: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -5467,6 +5503,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct hasEnforceNamingStyle: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var hasEnforceNamingStyle_p: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct hasEnumType: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6679,6 +6727,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct invalidAnyTypeURL: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var invalidAnyTypeURL: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct isA: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6883,6 +6943,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct JSONDecoding: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var jsondecoding: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct JSONDecodingError: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -6919,6 +6991,18 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages: Sendable {
     init() {}
   }
 
+  struct JSONEncoding: Sendable {
+    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+    // methods supported on all messages.
+
+    var jsonencoding: Int32 = 0
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+  }
+
   struct JSONEncodingError: Sendable {
     // SwiftProtobuf.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
@@ -15321,6 +15405,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnd: S
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".clearEnforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "clearEnforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.clearEnforceNamingStyle_p) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.clearEnforceNamingStyle_p != 0 {
+      try visitor.visitSingularInt32Field(value: self.clearEnforceNamingStyle_p, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnforceNamingStyle) -> Bool {
+    if lhs.clearEnforceNamingStyle_p != rhs.clearEnforceNamingStyle_p {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.clearEnumType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".clearEnumType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -20665,10 +20781,10 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.doubleValue
   }
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
-  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".Duration"
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".duration"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    1: .same(proto: "Duration"),
+    1: .same(proto: "duration"),
   ]
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@@ -20690,7 +20806,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration: S
     try unknownFields.traverse(visitor: &visitor)
   }
 
-  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Duration) -> Bool {
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.duration) -> Bool {
     if lhs.duration != rhs.duration {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true
@@ -21145,6 +21261,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.Empty: Swif
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".emptyAnyTypeURL"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "emptyAnyTypeURL"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.emptyAnyTypeURL) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.emptyAnyTypeURL != 0 {
+      try visitor.visitSingularInt32Field(value: self.emptyAnyTypeURL, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyAnyTypeURL) -> Bool {
+    if lhs.emptyAnyTypeURL != rhs.emptyAnyTypeURL {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.emptyData: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".emptyData"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -21529,6 +21677,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.endRegularF
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".enforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "enforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.enforceNamingStyle) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.enforceNamingStyle != 0 {
+      try visitor.visitSingularInt32Field(value: self.enforceNamingStyle, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enforceNamingStyle) -> Bool {
+    if lhs.enforceNamingStyle != rhs.enforceNamingStyle {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.enumMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".enum"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -26745,6 +26925,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnd: Swi
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".hasEnforceNamingStyle"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "hasEnforceNamingStyle"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.hasEnforceNamingStyle_p) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.hasEnforceNamingStyle_p != 0 {
+      try visitor.visitSingularInt32Field(value: self.hasEnforceNamingStyle_p, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnforceNamingStyle) -> Bool {
+    if lhs.hasEnforceNamingStyle_p != rhs.hasEnforceNamingStyle_p {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.hasEnumType: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".hasEnumType"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -29977,6 +30189,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.ints: Swift
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".invalidAnyTypeURL"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "invalidAnyTypeURL"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.invalidAnyTypeURL) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.invalidAnyTypeURL != 0 {
+      try visitor.visitSingularInt32Field(value: self.invalidAnyTypeURL, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.invalidAnyTypeURL) -> Bool {
+    if lhs.invalidAnyTypeURL != rhs.invalidAnyTypeURL {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.isA: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".isA"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -30521,6 +30765,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoder
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONDecoding"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "JSONDecoding"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.jsondecoding) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.jsondecoding != 0 {
+      try visitor.visitSingularInt32Field(value: self.jsondecoding, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecoding) -> Bool {
+    if lhs.jsondecoding != rhs.jsondecoding {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONDecodingError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONDecodingError"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -30617,6 +30893,38 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.jsonEncoder
   }
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONEncoding"
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "JSONEncoding"),
+  ]
+
+  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+    while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
+      switch fieldNumber {
+      case 1: try { try decoder.decodeSingularInt32Field(value: &self.jsonencoding) }()
+      default: break
+      }
+    }
+  }
+
+  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    if self.jsonencoding != 0 {
+      try visitor.visitSingularInt32Field(value: self.jsonencoding, fieldNumber: 1)
+    }
+    try unknownFields.traverse(visitor: &visitor)
+  }
+
+  static func ==(lhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding, rhs: SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncoding) -> Bool {
+    if lhs.jsonencoding != rhs.jsonencoding {return false}
+    if lhs.unknownFields != rhs.unknownFields {return false}
+    return true
+  }
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.JSONEncodingError: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = SwiftProtoTesting_Generated_GeneratedSwiftReservedMessages.protoMessageName + ".JSONEncodingError"
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [