[deps] Upgrade protobuf version to v25.0 (#34513)

This commit upgrades gRPC to protobuf v25.0 and makes some fixes to account for upb changes. One major change is that upb has been merged into the protobuf repo, so we can now drop the separate `@upb` dependency. Another is that `.upb.c` files no longer exist and there are new `.upb_minitable.h` and `.upb_minitable.c` files. The longer filenames exceeded a Windows restriction, so to work around that I renamed the `upb-generated` directory to just `upb-gen`, and likewise for `upbdefs-generated`.
2 years ago · 016ed921ce
parent 32dd034675
commit 016ed921ce
1332 changed files with 41377 additions and 65792 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +1,5 @@
-src/core/ext/upb-generated/** linguist-generated=true
-src/core/ext/upbdefs-generated/** linguist-generated=true
+src/core/ext/upb-gen/** linguist-generated=true
+src/core/ext/upbdefs-gen/** linguist-generated=true
 Makefile linguist-generated=true
 BUILD.gn linguist-generated=true
 CMakeLists.txt linguist-generated=true
@ -36,4 +36,4 @@ src/core/lib/debug/stats_data.cc linguist-generated=true
 src/core/lib/experiments/experiments.h linguist-generated=true
 src/core/lib/experiments/experiments.cc linguist-generated=true
 bazel/experiments.bzl linguist-generated=true
-test/cpp/microbenchmarks/huffman_geometries/** linguist-generated=true
+test/cpp/microbenchmarks/huffman_geometries/** linguist-generated=true
--- a/8
+++ b/8
@ -1009,6 +1009,7 @@ grpc_cc_library(
        "absl/strings",
        "absl/types:optional",
        "absl/types:span",
+        "upb_base_lib",
        "upb_collections_lib",
        "upb_lib",
    ],
@ -1213,6 +1214,7 @@ grpc_cc_library(
        "include/grpcpp/security/alts_util.h",
    ],
    external_deps = [
+        "upb_base_lib",
        "upb_collections_lib",
        "upb_lib",
    ],
@ -1930,6 +1932,7 @@ grpc_cc_library(
        "absl/synchronization",
        "absl/memory",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
        "protobuf_headers",
        "absl/container:inlined_vector",
@ -2004,6 +2007,7 @@ grpc_cc_library(
        "absl/synchronization",
        "absl/types:optional",
        "absl/memory",
+        "upb_base_lib",
        "upb_lib",
        "absl/strings:str_format",
        "protobuf_headers",
@ -2173,6 +2177,7 @@ grpc_cc_library(
        "absl/strings",
        "absl/time",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
    ],
    language = "c++",
@ -3063,6 +3068,7 @@ grpc_cc_library(
        "absl/strings:cord",
        "absl/types:optional",
        "absl/types:variant",
+        "upb_base_lib",
        "upb_collections_lib",
        "upb_lib",
    ],
@ -3673,7 +3679,9 @@ grpc_cc_library(
        "absl/strings",
        "absl/strings:str_format",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
+        "upb_mem_lib",
        "upb_textformat_lib",
        "upb_json_lib",
        "upb_reflection",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/1423
+++ b/1423
--- a/Package.swift
+++ b/Package.swift
--- a/6
+++ b/6
@ -66,7 +66,7 @@ pip_install(
    requirements = "@com_github_grpc_grpc//:requirements.bazel.txt",
 )

-load("@upb//bazel:system_python.bzl", "system_python")
+load("@com_google_protobuf//bazel:system_python.bzl", "system_python")

 system_python(
    name = "system_python",
@ -77,9 +77,9 @@ load("@system_python//:pip.bzl", "pip_parse")

 pip_parse(
    name = "pip_deps",
-    requirements = "@upb//python:requirements.txt",
+    requirements = "@com_google_protobuf//python:requirements.txt",
    requirements_overrides = {
-        "3.11": "@upb//python:requirements_311.txt",
+        "3.11": "@com_google_protobuf//python:requirements_311.txt",
    },
 )

--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@ -31,9 +31,9 @@ load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
 load("//bazel:experiments.bzl", "EXPERIMENTS")
 load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS")
-load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
+load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")

 # The set of pollers to test against if a test exercises polling
 POLLERS = ["epoll1", "poll"]
@ -204,8 +204,8 @@ def grpc_cc_library(
        includes = [
            "api/include",
            "include",
-            "src/core/ext/upb-generated",  # Once upb code-gen issue is resolved, remove this.
-            "src/core/ext/upbdefs-generated",  # Once upb code-gen issue is resolved, remove this.
+            "src/core/ext/upb-gen",  # Once upb code-gen issue is resolved, remove this.
+            "src/core/ext/upbdefs-gen",  # Once upb code-gen issue is resolved, remove this.
        ],
        alwayslink = alwayslink,
        data = data,
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -22,42 +22,57 @@ def grpc_deps():

    native.bind(
        name = "upb_lib",
-        actual = "@upb//:upb",
+        actual = "@com_google_protobuf//upb",
+    )
+
+    native.bind(
+        name = "upb_amalgamation_lib",
+        actual = "@com_google_protobuf//upb:amalgamation",
+    )
+
+    native.bind(
+        name = "upb_base_lib",
+        actual = "@com_google_protobuf//upb/base",
    )

    native.bind(
        name = "upb_collections_lib",
-        actual = "@upb//:collections",
+        actual = "@com_google_protobuf//upb/collections",
+    )
+
+    native.bind(
+        name = "upb_mem_lib",
+        actual = "@com_google_protobuf//upb/mem",
    )

    native.bind(
        name = "upb_reflection",
-        actual = "@upb//:reflection",
+        actual = "@com_google_protobuf//upb:reflection",
    )

    native.bind(
        name = "upb_lib_descriptor",
-        actual = "@upb//:descriptor_upb_proto",
+        actual = "@com_google_protobuf//upb:descriptor_upb_proto",
    )

    native.bind(
        name = "upb_lib_descriptor_reflection",
-        actual = "@upb//:descriptor_upb_proto_reflection",
+        actual = "@com_google_protobuf//upb:descriptor_upb_proto_reflection",
    )

    native.bind(
        name = "upb_textformat_lib",
-        actual = "@upb//:textformat",
+        actual = "@com_google_protobuf//upb/text",
    )

    native.bind(
        name = "upb_json_lib",
-        actual = "@upb//:json",
+        actual = "@com_google_protobuf//upb/json",
    )

    native.bind(
        name = "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-        actual = "@upb//:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+        actual = "@com_google_protobuf//upb:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
    )

    native.bind(
@ -243,12 +258,12 @@ def grpc_deps():
    if "com_google_protobuf" not in native.existing_rules():
        http_archive(
            name = "com_google_protobuf",
-            sha256 = "660ce016f987550bc1ccec4a6ee4199afb871799b696227098e3641476a7d566",
-            strip_prefix = "protobuf-b2b7a51158418f41cff0520894836c15b1738721",
+            sha256 = "7ed5fc41fe1614e551025f8e14b79b026a015b3ed337d38920c586f3ea35d818",
+            strip_prefix = "protobuf-6b5d8db01fe47478e8d400f550e797e6230d464e",
            urls = [
-                # https://github.com/protocolbuffers/protobuf/commits/v24.3
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/b2b7a51158418f41cff0520894836c15b1738721.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/b2b7a51158418f41cff0520894836c15b1738721.tar.gz",
+                # https://github.com/protocolbuffers/protobuf/commits/v25.0
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
            ],
            patches = [
                "@com_github_grpc_grpc//third_party:protobuf.patch",
@ -380,18 +395,6 @@ def grpc_deps():
            ],
        )

-    if "upb" not in native.existing_rules():
-        http_archive(
-            name = "upb",
-            sha256 = "5147e0ab6a28421d1e49004f4a205d84f06b924585e15eaa884cfe13289165b7",
-            strip_prefix = "upb-42cd08932e364a4cde35033b73f15c30250d7c2e",
-            urls = [
-                # https://github.com/protocolbuffers/upb/commits/24.x
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz",
-                "https://github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz",
-            ],
-        )
-
    if "envoy_api" not in native.existing_rules():
        http_archive(
            name = "envoy_api",
--- a/bazel/grpc_extra_deps.bzl
+++ b/bazel/grpc_extra_deps.bzl
@ -22,7 +22,6 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
 load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-load("@upb//bazel:workspace_deps.bzl", "upb_deps")

 def grpc_extra_deps(ignore_version_differences = False):
    """Loads the extra dependencies.
@ -49,8 +48,6 @@ def grpc_extra_deps(ignore_version_differences = False):
    """
    protobuf_deps()

-    upb_deps()
-
    api_dependencies()

    go_rules_dependencies()
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -15,7 +15,7 @@ settings:
  core_version: 36.0.0
  csharp_major_version: 2
  g_stands_for: gjallarhorn
-  protobuf_version: 3.24.3
+  protobuf_version: 3.25.0
  version: 1.60.0-dev
 configs:
  asan:
@ -149,8 +149,8 @@ defaults:
    CFLAGS: -g
    COREFLAGS: -fno-exceptions
    CPPFLAGS: -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2
-      -Ithird_party/upb -Isrc/core/ext/upb-generated -Isrc/core/ext/upbdefs-generated
-      -Ithird_party/utf8_range -Ithird_party/xxhash
+      -Ithird_party/upb -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range
+      -Ithird_party/xxhash
    LDFLAGS: -g
  zlib:
    CFLAGS: -fvisibility=hidden
--- a/cmake/upb.cmake
+++ b/cmake/upb.cmake
@ -15,6 +15,6 @@
 set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)

 set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range")
-set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-gen" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-gen")

 set(_gRPC_UPB_LIBRARIES upb)
--- a/config.m4
+++ b/config.m4
@ -6,8 +6,8 @@ if test "$PHP_GRPC" != "no"; then

  dnl # --with-grpc -> add include path
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/include)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-generated)
-  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-generated)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upb-gen)
+  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/core/ext/upbdefs-gen)
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/src/php/ext/grpc)
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/abseil-cpp)
  PHP_ADD_INCLUDE(PHP_EXT_SRCDIR()/third_party/address_sorting/include)
@ -156,319 +156,319 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/inproc/inproc_plugin.cc \
    src/core/ext/transport/inproc/inproc_transport.cc \
    src/core/ext/transport/inproc/legacy_inproc_transport.cc \
-    src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c \
-    src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
-    src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
-    src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
-    src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
-    src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c \
-    src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c \
-    src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c \
-    src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c \
-    src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
-    src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
-    src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c \
-    src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c \
-    src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
-    src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
-    src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
-    src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
-    src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c \
-    src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c \
-    src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
-    src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
-    src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
-    src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c \
-    src/core/ext/upb-generated/google/api/annotations.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c \
-    src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
-    src/core/ext/upb-generated/google/api/http.upb.c \
-    src/core/ext/upb-generated/google/api/httpbody.upb.c \
-    src/core/ext/upb-generated/google/protobuf/any.upb.c \
-    src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
-    src/core/ext/upb-generated/google/protobuf/duration.upb.c \
-    src/core/ext/upb-generated/google/protobuf/empty.upb.c \
-    src/core/ext/upb-generated/google/protobuf/struct.upb.c \
-    src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
-    src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
-    src/core/ext/upb-generated/google/rpc/status.upb.c \
-    src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c \
-    src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/security.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/status.upb.c \
-    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
-    src/core/ext/upb-generated/validate/validate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/security.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/status.upb.c \
-    src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/authority.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/cidr.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/context_params.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/extension.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c \
-    src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c \
-    src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c \
-    src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c \
-    src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/cel.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/range.upb.c \
-    src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c \
-    src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/http.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c \
-    src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/validate/validate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c \
-    src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/annotations.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/http.upb_minitable.c \
+    src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c \
+    src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c \
+    src/core/ext/upb-gen/google/rpc/status.upb_minitable.c \
+    src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c \
+    src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c \
+    src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/validate/validate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c \
+    src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c \
+    src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c \
+    src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c \
+    src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c \
+    src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/http.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c \
+    src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/validate/validate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
+    src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
    src/core/ext/xds/certificate_provider_store.cc \
    src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
    src/core/ext/xds/xds_api.cc \
@ -1295,9 +1295,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/re2/util/rune.cc \
    third_party/re2/util/strutil.cc \
    third_party/upb/upb/base/status.c \
-    third_party/upb/upb/collections/array.c \
-    third_party/upb/upb/collections/map.c \
-    third_party/upb/upb/collections/map_sorter.c \
    third_party/upb/upb/hash/common.c \
    third_party/upb/upb/json/decode.c \
    third_party/upb/upb/json/encode.c \
@ -1308,6 +1305,9 @@ if test "$PHP_GRPC" != "no"; then
    third_party/upb/upb/mem/alloc.c \
    third_party/upb/upb/mem/arena.c \
    third_party/upb/upb/message/accessors.c \
+    third_party/upb/upb/message/array.c \
+    third_party/upb/upb/message/map.c \
+    third_party/upb/upb/message/map_sorter.c \
    third_party/upb/upb/message/message.c \
    third_party/upb/upb/mini_descriptor/build_enum.c \
    third_party/upb/upb/mini_descriptor/decode.c \
@ -1317,7 +1317,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/upb/upb/mini_table/extension_registry.c \
    third_party/upb/upb/mini_table/internal/message.c \
    third_party/upb/upb/mini_table/message.c \
-    third_party/upb/upb/reflection/def_builder.c \
    third_party/upb/upb/reflection/def_pool.c \
    third_party/upb/upb/reflection/def_type.c \
    third_party/upb/upb/reflection/desc_state.c \
@ -1327,6 +1326,8 @@ if test "$PHP_GRPC" != "no"; then
    third_party/upb/upb/reflection/extension_range.c \
    third_party/upb/upb/reflection/field_def.c \
    third_party/upb/upb/reflection/file_def.c \
+    third_party/upb/upb/reflection/internal/def_builder.c \
+    third_party/upb/upb/reflection/internal/strdup2.c \
    third_party/upb/upb/reflection/message.c \
    third_party/upb/upb/reflection/message_def.c \
    third_party/upb/upb/reflection/message_reserved_range.c \
@ -1390,106 +1391,106 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/inproc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/admin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/bootstrap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/cluster/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/common/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/endpoint/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/listener/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/metrics/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/overload/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/route/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/tap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/config/trace/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/data/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/discovery/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/load_stats/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/service/status/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/http/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/metadata/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/tracing/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/envoy/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/api)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/api/expr/v1alpha1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/protobuf)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/google/rpc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/opencensus/proto/trace/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/gcp)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/health/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lb/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/src/proto/grpc/lookup/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/annotations/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/data/orca/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/service/orca/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/xds/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/admin/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/cluster/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/listener/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/metrics/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/overload/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/route/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/tap/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/config/trace/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/data/accesslog/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/discovery/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/service/status/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/http/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/metadata/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/tracing/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/envoy/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/protobuf)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/google/rpc)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/opencensus/proto/trace/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/udpa/annotations)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/validate)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/annotations/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/core/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/type/matcher/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-generated/xds/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/admin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/bootstrap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/cluster/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/common/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/endpoint/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/listener/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/metrics/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/overload/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/route/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/tap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/config/trace/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/data/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/discovery/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/load_stats/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/status/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/http/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/metadata/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/tracing/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/api)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/api/expr/v1alpha1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/protobuf)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/google/rpc)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/opencensus/proto/trace/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/gcp)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/health/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/lb/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/src/proto/grpc/lookup/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/udpa/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/annotations/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/data/orca/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/service/orca/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/xds/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/admin/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/cluster/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/listener/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/metrics/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/overload/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/route/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/tap/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/config/trace/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/discovery/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/status/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/http/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/metadata/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/tracing/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/api)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/protobuf)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/google/rpc)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/udpa/annotations)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/annotations/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
@ -1637,7 +1638,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/base)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/collections)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/hash)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/json)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/lex)
@ -1648,6 +1648,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_table)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_table/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection)
+  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/text)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/utf8_range)
--- a/config.w32
+++ b/config.w32
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
--- a/grpc.gemspec
+++ b/grpc.gemspec
--- a/grpc.gyp
+++ b/grpc.gyp
@ -58,8 +58,8 @@
      '-Ithird_party/abseil-cpp',
      '-Ithird_party/re2',
      '-Ithird_party/upb',
-      '-Isrc/core/ext/upb-generated',
-      '-Isrc/core/ext/upbdefs-generated',
+      '-Isrc/core/ext/upb-gen',
+      '-Isrc/core/ext/upbdefs-gen',
      '-Ithird_party/utf8_range',
      '-Ithird_party/xxhash',
    ],
@ -139,8 +139,8 @@
            '-Ithird_party/abseil-cpp',
            '-Ithird_party/re2',
            '-Ithird_party/upb',
-            '-Isrc/core/ext/upb-generated',
-            '-Isrc/core/ext/upbdefs-generated',
+            '-Isrc/core/ext/upb-gen',
+            '-Isrc/core/ext/upbdefs-gen',
            '-Ithird_party/utf8_range',
            '-Ithird_party/xxhash',
          ],
@ -152,8 +152,8 @@
            '-Ithird_party/abseil-cpp',
            '-Ithird_party/re2',
            '-Ithird_party/upb',
-            '-Isrc/core/ext/upb-generated',
-            '-Isrc/core/ext/upbdefs-generated',
+            '-Isrc/core/ext/upb-gen',
+            '-Isrc/core/ext/upbdefs-gen',
            '-Ithird_party/utf8_range',
            '-Ithird_party/xxhash',
            '-stdlib=libc++',
@ -249,9 +249,11 @@
      'target_name': 'grpc',
      'type': 'static_library',
      'dependencies': [
-        're2',
+        'upb_collections_lib',
        'upb_json_lib',
        'upb_textformat_lib',
+        'upb',
+        're2',
        'z',
        'absl/algorithm:container',
        'absl/cleanup:cleanup',
@ -387,319 +389,319 @@
        'src/core/ext/transport/inproc/inproc_plugin.cc',
        'src/core/ext/transport/inproc/inproc_transport.cc',
        'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
-        'src/core/ext/upb-generated/envoy/admin/v3/certs.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/memory.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.c',
-        'src/core/ext/upb-generated/envoy/admin/v3/tap.upb.c',
-        'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
-        'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
-        'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
-        'src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
-        'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c',
-        'src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/resolver.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c',
-        'src/core/ext/upb-generated/envoy/config/core/v3/udp_socket_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/quic_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
-        'src/core/ext/upb-generated/envoy/config/metrics/v3/metrics_service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c',
-        'src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c',
-        'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
-        'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
-        'src/core/ext/upb-generated/envoy/config/tap/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/datadog.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/dynamic_ot.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/lightstep.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/opencensus.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/opentelemetry.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/service.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/skywalking.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/trace.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/xray.upb.c',
-        'src/core/ext/upb-generated/envoy/config/trace/v3/zipkin.upb.c',
-        'src/core/ext/upb-generated/envoy/data/accesslog/v3/accesslog.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/rbac/v3/rbac.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/common/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c',
-        'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.c',
-        'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c',
-        'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c',
-        'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
-        'src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c',
-        'src/core/ext/upb-generated/envoy/type/http/v3/cookie.upb.c',
-        'src/core/ext/upb-generated/envoy/type/http/v3/path_transformation.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/filter_state.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/http_inputs.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/status_code_input.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c',
-        'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
-        'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
-        'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/hash_policy.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/http.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/http_status.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/ratelimit_strategy.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/ratelimit_unit.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
-        'src/core/ext/upb-generated/envoy/type/v3/token_bucket.upb.c',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c',
-        'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/api/httpbody.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/opencensus/proto/trace/v1/trace_config.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls_config.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/migrate.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/security.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
-        'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/migrate.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/security.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/sensitive.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/status.upb.c',
-        'src/core/ext/upb-generated/xds/annotations/v3/versioning.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/authority.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/cidr.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/context_params.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/extension.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c',
-        'src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c',
-        'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/cel.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/domain.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/http_inputs.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/ip.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/matcher.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/range.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/regex.upb.c',
-        'src/core/ext/upb-generated/xds/type/matcher/v3/string.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/cel.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/range.upb.c',
-        'src/core/ext/upb-generated/xds/type/v3/typed_struct.upb.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/certs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/clusters.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump_shared.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/init_dump.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/listeners.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/memory.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/metrics.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/mutex_stats.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/server_info.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/admin/v3/tap.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/annotations/deprecation.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/annotations/resource.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/filter.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/common/matcher/v3/matcher.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/address.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/backoff.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/event_service_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/extension.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_method_list.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/grpc_service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/http_uri.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/resolver.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/socket_option.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/core/v3/udp_socket_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/load_report.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/api_listener.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/quic_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/metrics_service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/rbac/v3/rbac.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/route/v3/scoped_route.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/tap/v3/common.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/datadog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/lightstep.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opencensus.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/opentelemetry.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/service.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/skywalking.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/trace.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/xray.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/config/trace/v3/zipkin.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/data/accesslog/v3/accesslog.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/ads.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/http/v3/cookie.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/http/v3/path_transformation.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/filter_state.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/http_inputs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/metadata.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/number.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/path.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/regex.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/status_code_input.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/matcher/v3/value.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/metadata/v3/metadata.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/tracing/v3/custom_tag.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/hash_policy.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/http.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/http_status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/percent.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_strategy.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/ratelimit_unit.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/semantic_version.upbdefs.c',
-        'src/core/ext/upbdefs-generated/envoy/type/v3/token_bucket.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/annotations.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/checked.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/http.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/api/httpbody.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c',
-        'src/core/ext/upbdefs-generated/google/rpc/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/opencensus/proto/trace/v1/trace_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/migrate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/security.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/sensitive.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/udpa/annotations/versioning.upbdefs.c',
-        'src/core/ext/upbdefs-generated/validate/validate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/migrate.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/security.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/sensitive.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/status.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/annotations/v3/versioning.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/cidr.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/extension.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/cel.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/domain.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/http_inputs.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/ip.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/cel.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c',
-        'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c',
+        'src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        'src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c',
+        'src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c',
+        'src/core/ext/upb-gen/validate/validate.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.c',
+        'src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/http.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.c',
+        'src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.c',
+        'src/core/ext/upbdefs-gen/validate/validate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c',
+        'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
        'src/core/ext/xds/certificate_provider_store.cc',
        'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
        'src/core/ext/xds/xds_api.cc',
@ -1107,6 +1109,7 @@
      'dependencies': [
        'upb_collections_lib',
        'upb',
+        'utf8_range_lib',
        'z',
        'absl/algorithm:container',
        'absl/cleanup:cleanup',
@ -1226,25 +1229,25 @@
        'src/core/ext/transport/inproc/inproc_plugin.cc',
        'src/core/ext/transport/inproc/inproc_transport.cc',
        'src/core/ext/transport/inproc/legacy_inproc_transport.cc',
-        'src/core/ext/upb-generated/google/api/annotations.upb.c',
-        'src/core/ext/upb-generated/google/api/http.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/duration.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/empty.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/struct.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/timestamp.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/wrappers.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/lookup/v1/rls.upb.c',
-        'src/core/ext/upb-generated/validate/validate.upb.c',
-        'src/core/ext/upb-generated/xds/data/orca/v3/orca_load_report.upb.c',
-        'src/core/ext/upb-generated/xds/service/orca/v3/orca.upb.c',
+        'src/core/ext/upb-gen/google/api/annotations.upb_minitable.c',
+        'src/core/ext/upb-gen/google/api/http.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c',
+        'src/core/ext/upb-gen/validate/validate.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c',
+        'src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c',
        'src/core/lib/address_utils/parse_address.cc',
        'src/core/lib/address_utils/sockaddr_utils.cc',
        'src/core/lib/backoff/backoff.cc',
@ -1516,7 +1519,13 @@
        'third_party/upb/upb/mini_descriptor/build_enum.c',
        'third_party/upb/upb/mini_descriptor/decode.c',
        'third_party/upb/upb/mini_descriptor/internal/base92.c',
+        'third_party/upb/upb/mini_descriptor/internal/encode.c',
        'third_party/upb/upb/mini_descriptor/link.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
      ],
    },
    {
@ -1588,29 +1597,11 @@
      'target_name': 'upb',
      'type': 'static_library',
      'dependencies': [
-        'utf8_range_lib',
      ],
      'sources': [
        'third_party/upb/upb/base/status.c',
-        'third_party/upb/upb/collections/array.c',
-        'third_party/upb/upb/collections/map.c',
-        'third_party/upb/upb/collections/map_sorter.c',
-        'third_party/upb/upb/hash/common.c',
-        'third_party/upb/upb/lex/atoi.c',
-        'third_party/upb/upb/lex/round_trip.c',
-        'third_party/upb/upb/lex/strtod.c',
-        'third_party/upb/upb/lex/unicode.c',
        'third_party/upb/upb/mem/alloc.c',
        'third_party/upb/upb/mem/arena.c',
-        'third_party/upb/upb/message/message.c',
-        'third_party/upb/upb/mini_table/extension_registry.c',
-        'third_party/upb/upb/mini_table/internal/message.c',
-        'third_party/upb/upb/mini_table/message.c',
-        'third_party/upb/upb/wire/decode.c',
-        'third_party/upb/upb/wire/decode_fast.c',
-        'third_party/upb/upb/wire/encode.c',
-        'third_party/upb/upb/wire/eps_copy_input_stream.c',
-        'third_party/upb/upb/wire/reader.c',
      ],
    },
    {
@ -1620,12 +1611,12 @@
      ],
      'sources': [
        'third_party/upb/upb/base/status.c',
-        'third_party/upb/upb/collections/array.c',
-        'third_party/upb/upb/collections/map.c',
-        'third_party/upb/upb/collections/map_sorter.c',
        'third_party/upb/upb/hash/common.c',
        'third_party/upb/upb/mem/alloc.c',
        'third_party/upb/upb/mem/arena.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
        'third_party/upb/upb/message/message.c',
        'third_party/upb/upb/mini_table/extension_registry.c',
        'third_party/upb/upb/mini_table/internal/message.c',
@ -1636,20 +1627,33 @@
      'target_name': 'upb_json_lib',
      'type': 'static_library',
      'dependencies': [
-        'upb_collections_lib',
-        'upb',
+        'utf8_range_lib',
      ],
      'sources': [
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'third_party/upb/upb/base/status.c',
+        'third_party/upb/upb/hash/common.c',
        'third_party/upb/upb/json/decode.c',
        'third_party/upb/upb/json/encode.c',
+        'third_party/upb/upb/lex/atoi.c',
+        'third_party/upb/upb/lex/round_trip.c',
+        'third_party/upb/upb/lex/strtod.c',
+        'third_party/upb/upb/lex/unicode.c',
+        'third_party/upb/upb/mem/alloc.c',
+        'third_party/upb/upb/mem/arena.c',
        'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
        'third_party/upb/upb/mini_descriptor/build_enum.c',
        'third_party/upb/upb/mini_descriptor/decode.c',
        'third_party/upb/upb/mini_descriptor/internal/base92.c',
        'third_party/upb/upb/mini_descriptor/internal/encode.c',
        'third_party/upb/upb/mini_descriptor/link.c',
-        'third_party/upb/upb/reflection/def_builder.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
        'third_party/upb/upb/reflection/def_pool.c',
        'third_party/upb/upb/reflection/def_type.c',
        'third_party/upb/upb/reflection/desc_state.c',
@ -1659,30 +1663,50 @@
        'third_party/upb/upb/reflection/extension_range.c',
        'third_party/upb/upb/reflection/field_def.c',
        'third_party/upb/upb/reflection/file_def.c',
+        'third_party/upb/upb/reflection/internal/def_builder.c',
+        'third_party/upb/upb/reflection/internal/strdup2.c',
        'third_party/upb/upb/reflection/message.c',
        'third_party/upb/upb/reflection/message_def.c',
        'third_party/upb/upb/reflection/message_reserved_range.c',
        'third_party/upb/upb/reflection/method_def.c',
        'third_party/upb/upb/reflection/oneof_def.c',
        'third_party/upb/upb/reflection/service_def.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
      ],
    },
    {
      'target_name': 'upb_textformat_lib',
      'type': 'static_library',
      'dependencies': [
-        'upb_collections_lib',
-        'upb',
+        'utf8_range_lib',
      ],
      'sources': [
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'third_party/upb/upb/base/status.c',
+        'third_party/upb/upb/hash/common.c',
+        'third_party/upb/upb/lex/atoi.c',
+        'third_party/upb/upb/lex/round_trip.c',
+        'third_party/upb/upb/lex/strtod.c',
+        'third_party/upb/upb/lex/unicode.c',
+        'third_party/upb/upb/mem/alloc.c',
+        'third_party/upb/upb/mem/arena.c',
        'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
        'third_party/upb/upb/mini_descriptor/build_enum.c',
        'third_party/upb/upb/mini_descriptor/decode.c',
        'third_party/upb/upb/mini_descriptor/internal/base92.c',
        'third_party/upb/upb/mini_descriptor/internal/encode.c',
        'third_party/upb/upb/mini_descriptor/link.c',
-        'third_party/upb/upb/reflection/def_builder.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
        'third_party/upb/upb/reflection/def_pool.c',
        'third_party/upb/upb/reflection/def_type.c',
        'third_party/upb/upb/reflection/desc_state.c',
@ -1692,6 +1716,8 @@
        'third_party/upb/upb/reflection/extension_range.c',
        'third_party/upb/upb/reflection/field_def.c',
        'third_party/upb/upb/reflection/file_def.c',
+        'third_party/upb/upb/reflection/internal/def_builder.c',
+        'third_party/upb/upb/reflection/internal/strdup2.c',
        'third_party/upb/upb/reflection/message.c',
        'third_party/upb/upb/reflection/message_def.c',
        'third_party/upb/upb/reflection/message_reserved_range.c',
@ -1699,6 +1725,11 @@
        'third_party/upb/upb/reflection/oneof_def.c',
        'third_party/upb/upb/reflection/service_def.c',
        'third_party/upb/upb/text/encode.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
      ],
    },
    {
@ -1970,8 +2001,9 @@
      'target_name': 'grpc_authorization_provider',
      'type': 'static_library',
      'dependencies': [
-        're2',
        'upb',
+        're2',
+        'utf8_range_lib',
        'z',
        'absl/cleanup:cleanup',
        'absl/container:flat_hash_map',
@ -1989,12 +2021,12 @@
        'gpr',
      ],
      'sources': [
-        'src/core/ext/upb-generated/google/protobuf/any.upb.c',
-        'src/core/ext/upb-generated/google/protobuf/descriptor.upb.c',
-        'src/core/ext/upb-generated/google/rpc/status.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c',
-        'src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c',
+        'src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c',
+        'src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c',
+        'src/core/ext/upb-gen/google/rpc/status.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c',
+        'src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c',
        'src/core/lib/address_utils/parse_address.cc',
        'src/core/lib/address_utils/sockaddr_utils.cc',
        'src/core/lib/backoff/backoff.cc',
@ -2251,11 +2283,25 @@
        'src/core/tsi/alts/handshaker/transport_security_common_api.cc',
        'src/core/tsi/transport_security.cc',
        'src/core/tsi/transport_security_grpc.cc',
+        'third_party/upb/upb/hash/common.c',
        'third_party/upb/upb/message/accessors.c',
+        'third_party/upb/upb/message/array.c',
+        'third_party/upb/upb/message/map.c',
+        'third_party/upb/upb/message/map_sorter.c',
+        'third_party/upb/upb/message/message.c',
        'third_party/upb/upb/mini_descriptor/build_enum.c',
        'third_party/upb/upb/mini_descriptor/decode.c',
        'third_party/upb/upb/mini_descriptor/internal/base92.c',
+        'third_party/upb/upb/mini_descriptor/internal/encode.c',
        'third_party/upb/upb/mini_descriptor/link.c',
+        'third_party/upb/upb/mini_table/extension_registry.c',
+        'third_party/upb/upb/mini_table/internal/message.c',
+        'third_party/upb/upb/mini_table/message.c',
+        'third_party/upb/upb/wire/decode.c',
+        'third_party/upb/upb/wire/decode_fast.c',
+        'third_party/upb/upb/wire/encode.c',
+        'third_party/upb/upb/wire/eps_copy_input_stream.c',
+        'third_party/upb/upb/wire/reader.c',
      ],
    },
    {
--- a/package.xml
+++ b/package.xml
--- a/setup.py
+++ b/setup.py
@ -72,11 +72,9 @@ SSL_INCLUDE = (
    os.path.join("third_party", "boringssl-with-bazel", "src", "include"),
 )
 UPB_INCLUDE = (os.path.join("third_party", "upb"),)
-UPB_GRPC_GENERATED_INCLUDE = (
-    os.path.join("src", "core", "ext", "upb-generated"),
-)
+UPB_GRPC_GENERATED_INCLUDE = (os.path.join("src", "core", "ext", "upb-gen"),)
 UPBDEFS_GRPC_GENERATED_INCLUDE = (
-    os.path.join("src", "core", "ext", "upbdefs-generated"),
+    os.path.join("src", "core", "ext", "upbdefs-gen"),
 )
 UTF8_RANGE_INCLUDE = (os.path.join("third_party", "utf8_range"),)
 XXHASH_INCLUDE = (os.path.join("third_party", "xxhash"),)
--- a/src/core/BUILD
+++ b/src/core/BUILD
@ -291,7 +291,9 @@ grpc_cc_library(
        "absl/strings:cord",
        "absl/time",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
+        "upb_mem_lib",
    ],
    language = "c++",
    deps = [
@ -4103,7 +4105,9 @@ grpc_cc_library(
        "absl/strings:str_format",
        "absl/types:optional",
        "absl/types:variant",
+        "upb_base_lib",
        "upb_lib",
+        "upb_mem_lib",
    ],
    language = "c++",
    deps = [
@ -4208,6 +4212,7 @@ grpc_cc_library(
        "absl/strings",
        "absl/strings:str_format",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
    ],
    language = "c++",
@ -4259,7 +4264,7 @@ grpc_cc_library(
    ],
    external_deps = [
        "absl/strings",
-        "upb_lib",
+        "upb_base_lib",
    ],
    language = "c++",
    deps = ["//:gpr_platform"],
@ -4334,7 +4339,9 @@ grpc_cc_library(
        "absl/types:optional",
        "absl/types:span",
        "absl/types:variant",
+        "upb_base_lib",
        "upb_lib",
+        "upb_mem_lib",
        "upb_textformat_lib",
        "upb_json_lib",
        "re2",
@ -4818,6 +4825,7 @@ grpc_cc_library(
        "absl/status:statusor",
        "absl/strings",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
    ],
    language = "c++",
@ -5377,6 +5385,7 @@ grpc_cc_library(
        "absl/status:statusor",
        "absl/strings",
        "absl/types:optional",
+        "upb_base_lib",
        "upb_lib",
    ],
    language = "c++",
--- a/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/certs.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/certs.proto
 *
@ -10,7 +9,14 @@
 #define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/certs.upb_minitable.h"
+
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -22,25 +28,19 @@ typedef struct envoy_admin_v3_Certificate envoy_admin_v3_Certificate;
 typedef struct envoy_admin_v3_CertificateDetails envoy_admin_v3_CertificateDetails;
 typedef struct envoy_admin_v3_CertificateDetails_OcspDetails envoy_admin_v3_CertificateDetails_OcspDetails;
 typedef struct envoy_admin_v3_SubjectAlternateName envoy_admin_v3_SubjectAlternateName;
-extern const upb_MiniTable envoy_admin_v3_Certificates_msg_init;
-extern const upb_MiniTable envoy_admin_v3_Certificate_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CertificateDetails_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CertificateDetails_OcspDetails_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SubjectAlternateName_msg_init;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;



 /* envoy.admin.v3.Certificates */

 UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Certificates*)_upb_Message_New(&envoy_admin_v3_Certificates_msg_init, arena);
+  return (envoy_admin_v3_Certificates*)_upb_Message_New(&envoy__admin__v3__Certificates_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_Certificates* ret = envoy_admin_v3_Certificates_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificates_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificates_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -50,7 +50,7 @@ UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse_ex(con
                           int options, upb_Arena* arena) {
  envoy_admin_v3_Certificates* ret = envoy_admin_v3_Certificates_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificates_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificates_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -58,13 +58,13 @@ UPB_INLINE envoy_admin_v3_Certificates* envoy_admin_v3_Certificates_parse_ex(con
 }
 UPB_INLINE char* envoy_admin_v3_Certificates_serialize(const envoy_admin_v3_Certificates* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificates_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificates_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Certificates_serialize_ex(const envoy_admin_v3_Certificates* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificates_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificates_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Certificates_clear_certificates(envoy_admin_v3_Certificates* msg) {
@ -126,7 +126,7 @@ UPB_INLINE struct envoy_admin_v3_Certificate* envoy_admin_v3_Certificates_add_ce
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_Certificate* sub = (struct envoy_admin_v3_Certificate*)_upb_Message_New(&envoy_admin_v3_Certificate_msg_init, arena);
+  struct envoy_admin_v3_Certificate* sub = (struct envoy_admin_v3_Certificate*)_upb_Message_New(&envoy__admin__v3__Certificate_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -135,12 +135,12 @@ UPB_INLINE struct envoy_admin_v3_Certificate* envoy_admin_v3_Certificates_add_ce
 /* envoy.admin.v3.Certificate */

 UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Certificate*)_upb_Message_New(&envoy_admin_v3_Certificate_msg_init, arena);
+  return (envoy_admin_v3_Certificate*)_upb_Message_New(&envoy__admin__v3__Certificate_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_Certificate* ret = envoy_admin_v3_Certificate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -150,7 +150,7 @@ UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse_ex(const
                           int options, upb_Arena* arena) {
  envoy_admin_v3_Certificate* ret = envoy_admin_v3_Certificate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Certificate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Certificate_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -158,13 +158,13 @@ UPB_INLINE envoy_admin_v3_Certificate* envoy_admin_v3_Certificate_parse_ex(const
 }
 UPB_INLINE char* envoy_admin_v3_Certificate_serialize(const envoy_admin_v3_Certificate* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificate_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Certificate_serialize_ex(const envoy_admin_v3_Certificate* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Certificate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Certificate_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Certificate_clear_ca_cert(envoy_admin_v3_Certificate* msg) {
@ -263,7 +263,7 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -289,7 +289,7 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  struct envoy_admin_v3_CertificateDetails* sub = (struct envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -298,12 +298,12 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails* envoy_admin_v3_Certificate_
 /* envoy.admin.v3.CertificateDetails */

 UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_msg_init, arena);
+  return (envoy_admin_v3_CertificateDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_CertificateDetails* ret = envoy_admin_v3_CertificateDetails_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -313,7 +313,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_
                           int options, upb_Arena* arena) {
  envoy_admin_v3_CertificateDetails* ret = envoy_admin_v3_CertificateDetails_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -321,13 +321,13 @@ UPB_INLINE envoy_admin_v3_CertificateDetails* envoy_admin_v3_CertificateDetails_
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_serialize(const envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_serialize_ex(const envoy_admin_v3_CertificateDetails* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CertificateDetails_clear_path(envoy_admin_v3_CertificateDetails* msg) {
@ -475,7 +475,7 @@ UPB_INLINE struct envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_Certificat
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_SubjectAlternateName* sub = (struct envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy_admin_v3_SubjectAlternateName_msg_init, arena);
+  struct envoy_admin_v3_SubjectAlternateName* sub = (struct envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy__admin__v3__SubjectAlternateName_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -491,7 +491,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_valid_from(envoy_admin_v3_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_valid_from(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_CertificateDetails_set_valid_from(msg, sub);
  }
  return sub;
@ -503,7 +503,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_expiration_time(envoy_admi
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_expiration_time(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_expiration_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_CertificateDetails_set_expiration_time(msg, sub);
  }
  return sub;
@ -515,7 +515,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_set_ocsp_details(envoy_admin_v
 UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_mutable_ocsp_details(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) {
  struct envoy_admin_v3_CertificateDetails_OcspDetails* sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)envoy_admin_v3_CertificateDetails_ocsp_details(msg);
  if (sub == NULL) {
-    sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, arena);
+    sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, arena);
    if (sub) envoy_admin_v3_CertificateDetails_set_ocsp_details(msg, sub);
  }
  return sub;
@ -524,12 +524,12 @@ UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_
 /* envoy.admin.v3.CertificateDetails.OcspDetails */

 UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_OcspDetails_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, arena);
+  return (envoy_admin_v3_CertificateDetails_OcspDetails*)_upb_Message_New(&envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_OcspDetails_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_CertificateDetails_OcspDetails* ret = envoy_admin_v3_CertificateDetails_OcspDetails_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -539,7 +539,7 @@ UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_Certifi
                           int options, upb_Arena* arena) {
  envoy_admin_v3_CertificateDetails_OcspDetails* ret = envoy_admin_v3_CertificateDetails_OcspDetails_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -547,13 +547,13 @@ UPB_INLINE envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_Certifi
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_OcspDetails_serialize(const envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CertificateDetails_OcspDetails_serialize_ex(const envoy_admin_v3_CertificateDetails_OcspDetails* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_clear_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg) {
@ -594,7 +594,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(env
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_valid_from(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(msg, sub);
  }
  return sub;
@ -606,7 +606,7 @@ UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(env
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_expiration(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_expiration(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(msg, sub);
  }
  return sub;
@ -615,12 +615,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_O
 /* envoy.admin.v3.SubjectAlternateName */

 UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateName_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy_admin_v3_SubjectAlternateName_msg_init, arena);
+  return (envoy_admin_v3_SubjectAlternateName*)_upb_Message_New(&envoy__admin__v3__SubjectAlternateName_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateName_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_SubjectAlternateName* ret = envoy_admin_v3_SubjectAlternateName_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SubjectAlternateName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SubjectAlternateName_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -630,7 +630,7 @@ UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateN
                           int options, upb_Arena* arena) {
  envoy_admin_v3_SubjectAlternateName* ret = envoy_admin_v3_SubjectAlternateName_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SubjectAlternateName_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SubjectAlternateName_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -638,13 +638,13 @@ UPB_INLINE envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_SubjectAlternateN
 }
 UPB_INLINE char* envoy_admin_v3_SubjectAlternateName_serialize(const envoy_admin_v3_SubjectAlternateName* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SubjectAlternateName_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SubjectAlternateName_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SubjectAlternateName_serialize_ex(const envoy_admin_v3_SubjectAlternateName* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SubjectAlternateName_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SubjectAlternateName_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -716,8 +716,6 @@ UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/certs.proto
 *
@ -8,23 +7,23 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/certs.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/certs.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_Certificates_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_Certificate_msg_init},
+  {.submsg = &envoy__admin__v3__Certificate_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_Certificates_msg_init = {
+const upb_MiniTable envoy__admin__v3__Certificates_msg_init = {
  &envoy_admin_v3_Certificates_submsgs[0],
  &envoy_admin_v3_Certificates__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -35,8 +34,8 @@ const upb_MiniTable envoy_admin_v3_Certificates_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_Certificate_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_CertificateDetails_msg_init},
-  {.submsg = &envoy_admin_v3_CertificateDetails_msg_init},
+  {.submsg = &envoy__admin__v3__CertificateDetails_msg_init},
+  {.submsg = &envoy__admin__v3__CertificateDetails_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
@ -44,7 +43,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = {
  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_Certificate_msg_init = {
+const upb_MiniTable envoy__admin__v3__Certificate_msg_init = {
  &envoy_admin_v3_Certificate_submsgs[0],
  &envoy_admin_v3_Certificate__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -57,10 +56,10 @@ const upb_MiniTable envoy_admin_v3_Certificate_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_submsgs[4] = {
-  {.submsg = &envoy_admin_v3_SubjectAlternateName_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init},
+  {.submsg = &envoy__admin__v3__SubjectAlternateName_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
@ -73,7 +72,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = {
  {7, UPB_SIZE(16, 72), 3, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_CertificateDetails_msg_init = {
+const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = {
  &envoy_admin_v3_CertificateDetails_submsgs[0],
  &envoy_admin_v3_CertificateDetails__fields[0],
  UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
@ -90,8 +89,8 @@ const upb_MiniTable envoy_admin_v3_CertificateDetails_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__fields[2] = {
@ -99,7 +98,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__f
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_CertificateDetails_OcspDetails_msg_init = {
+const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = {
  &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0],
  &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -117,7 +116,7 @@ static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] =
  {3, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_SubjectAlternateName_msg_init = {
+const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init = {
  NULL,
  &envoy_admin_v3_SubjectAlternateName__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -130,11 +129,11 @@ const upb_MiniTable envoy_admin_v3_SubjectAlternateName_msg_init = {
 };

 static const upb_MiniTable *messages_layout[5] = {
-  &envoy_admin_v3_Certificates_msg_init,
-  &envoy_admin_v3_Certificate_msg_init,
-  &envoy_admin_v3_CertificateDetails_msg_init,
-  &envoy_admin_v3_CertificateDetails_OcspDetails_msg_init,
-  &envoy_admin_v3_SubjectAlternateName_msg_init,
+  &envoy__admin__v3__Certificates_msg_init,
+  &envoy__admin__v3__Certificate_msg_init,
+  &envoy__admin__v3__CertificateDetails_msg_init,
+  &envoy__admin__v3__CertificateDetails__OcspDetails_msg_init,
+  &envoy__admin__v3__SubjectAlternateName_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h
@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/certs.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__Certificates_msg_init;
+extern const upb_MiniTable envoy__admin__v3__Certificate_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/clusters.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/clusters.proto
 *
@ -10,7 +9,19 @@
 #define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/clusters.upb_minitable.h"
+
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -21,32 +32,23 @@ typedef struct envoy_admin_v3_Clusters envoy_admin_v3_Clusters;
 typedef struct envoy_admin_v3_ClusterStatus envoy_admin_v3_ClusterStatus;
 typedef struct envoy_admin_v3_HostStatus envoy_admin_v3_HostStatus;
 typedef struct envoy_admin_v3_HostHealthStatus envoy_admin_v3_HostHealthStatus;
-extern const upb_MiniTable envoy_admin_v3_Clusters_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ClusterStatus_msg_init;
-extern const upb_MiniTable envoy_admin_v3_HostStatus_msg_init;
-extern const upb_MiniTable envoy_admin_v3_HostHealthStatus_msg_init;
 struct envoy_admin_v3_SimpleMetric;
 struct envoy_config_cluster_v3_CircuitBreakers;
 struct envoy_config_core_v3_Address;
 struct envoy_config_core_v3_Locality;
 struct envoy_type_v3_Percent;
-extern const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Locality_msg_init;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;



 /* envoy.admin.v3.Clusters */

 UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Clusters*)_upb_Message_New(&envoy_admin_v3_Clusters_msg_init, arena);
+  return (envoy_admin_v3_Clusters*)_upb_Message_New(&envoy__admin__v3__Clusters_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_Clusters* ret = envoy_admin_v3_Clusters_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Clusters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Clusters_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -56,7 +58,7 @@ UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse_ex(const char*
                           int options, upb_Arena* arena) {
  envoy_admin_v3_Clusters* ret = envoy_admin_v3_Clusters_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Clusters_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Clusters_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -64,13 +66,13 @@ UPB_INLINE envoy_admin_v3_Clusters* envoy_admin_v3_Clusters_parse_ex(const char*
 }
 UPB_INLINE char* envoy_admin_v3_Clusters_serialize(const envoy_admin_v3_Clusters* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Clusters_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Clusters_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Clusters_serialize_ex(const envoy_admin_v3_Clusters* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Clusters_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Clusters_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Clusters_clear_cluster_statuses(envoy_admin_v3_Clusters* msg) {
@ -132,7 +134,7 @@ UPB_INLINE struct envoy_admin_v3_ClusterStatus* envoy_admin_v3_Clusters_add_clus
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_ClusterStatus* sub = (struct envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy_admin_v3_ClusterStatus_msg_init, arena);
+  struct envoy_admin_v3_ClusterStatus* sub = (struct envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy__admin__v3__ClusterStatus_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -141,12 +143,12 @@ UPB_INLINE struct envoy_admin_v3_ClusterStatus* envoy_admin_v3_Clusters_add_clus
 /* envoy.admin.v3.ClusterStatus */

 UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy_admin_v3_ClusterStatus_msg_init, arena);
+  return (envoy_admin_v3_ClusterStatus*)_upb_Message_New(&envoy__admin__v3__ClusterStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_ClusterStatus* ret = envoy_admin_v3_ClusterStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClusterStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClusterStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -156,7 +158,7 @@ UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse_ex(c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_ClusterStatus* ret = envoy_admin_v3_ClusterStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ClusterStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ClusterStatus_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -164,13 +166,13 @@ UPB_INLINE envoy_admin_v3_ClusterStatus* envoy_admin_v3_ClusterStatus_parse_ex(c
 }
 UPB_INLINE char* envoy_admin_v3_ClusterStatus_serialize(const envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClusterStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClusterStatus_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ClusterStatus_serialize_ex(const envoy_admin_v3_ClusterStatus* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ClusterStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ClusterStatus_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ClusterStatus_clear_name(envoy_admin_v3_ClusterStatus* msg) {
@ -315,7 +317,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_success_rate_ejection_threshold(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
    if (sub) envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold(msg, sub);
  }
  return sub;
@ -341,7 +343,7 @@ UPB_INLINE struct envoy_admin_v3_HostStatus* envoy_admin_v3_ClusterStatus_add_ho
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_HostStatus* sub = (struct envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy_admin_v3_HostStatus_msg_init, arena);
+  struct envoy_admin_v3_HostStatus* sub = (struct envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy__admin__v3__HostStatus_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -353,7 +355,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_eject
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_local_origin_success_rate_ejection_threshold(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
    if (sub) envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_ejection_threshold(msg, sub);
  }
  return sub;
@ -365,7 +367,7 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_circuit_breakers(envoy_admin_v3
 UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_ClusterStatus_mutable_circuit_breakers(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) {
  struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_admin_v3_ClusterStatus_circuit_breakers(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_msg_init, arena);
+    sub = (struct envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers_msg_init, arena);
    if (sub) envoy_admin_v3_ClusterStatus_set_circuit_breakers(msg, sub);
  }
  return sub;
@ -382,12 +384,12 @@ UPB_INLINE void envoy_admin_v3_ClusterStatus_set_eds_service_name(envoy_admin_v3
 /* envoy.admin.v3.HostStatus */

 UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy_admin_v3_HostStatus_msg_init, arena);
+  return (envoy_admin_v3_HostStatus*)_upb_Message_New(&envoy__admin__v3__HostStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_HostStatus* ret = envoy_admin_v3_HostStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -397,7 +399,7 @@ UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_HostStatus* ret = envoy_admin_v3_HostStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostStatus_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -405,13 +407,13 @@ UPB_INLINE envoy_admin_v3_HostStatus* envoy_admin_v3_HostStatus_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_HostStatus_serialize(const envoy_admin_v3_HostStatus* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostStatus_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_HostStatus_serialize_ex(const envoy_admin_v3_HostStatus* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostStatus_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_HostStatus_clear_address(envoy_admin_v3_HostStatus* msg) {
@ -567,7 +569,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_address(envoy_admin_v3_HostStatus
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_mutable_address(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_HostStatus_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
    if (sub) envoy_admin_v3_HostStatus_set_address(msg, sub);
  }
  return sub;
@ -593,7 +595,7 @@ UPB_INLINE struct envoy_admin_v3_SimpleMetric* envoy_admin_v3_HostStatus_add_sta
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_SimpleMetric* sub = (struct envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy_admin_v3_SimpleMetric_msg_init, arena);
+  struct envoy_admin_v3_SimpleMetric* sub = (struct envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy__admin__v3__SimpleMetric_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -605,7 +607,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_health_status(envoy_admin_v3_HostS
 UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mutable_health_status(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
  struct envoy_admin_v3_HostHealthStatus* sub = (struct envoy_admin_v3_HostHealthStatus*)envoy_admin_v3_HostStatus_health_status(msg);
  if (sub == NULL) {
-    sub = (struct envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy_admin_v3_HostHealthStatus_msg_init, arena);
+    sub = (struct envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy__admin__v3__HostHealthStatus_msg_init, arena);
    if (sub) envoy_admin_v3_HostStatus_set_health_status(msg, sub);
  }
  return sub;
@ -617,7 +619,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_success_rate(envoy_admin_v3_HostSt
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_success_rate(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
    if (sub) envoy_admin_v3_HostStatus_set_success_rate(msg, sub);
  }
  return sub;
@ -641,7 +643,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_local_origin_success_rate(envoy_ad
 UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local_origin_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_local_origin_success_rate(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
    if (sub) envoy_admin_v3_HostStatus_set_local_origin_success_rate(msg, sub);
  }
  return sub;
@ -653,7 +655,7 @@ UPB_INLINE void envoy_admin_v3_HostStatus_set_locality(envoy_admin_v3_HostStatus
 UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutable_locality(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_admin_v3_HostStatus_locality(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy_config_core_v3_Locality_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Locality*)_upb_Message_New(&envoy__config__core__v3__Locality_msg_init, arena);
    if (sub) envoy_admin_v3_HostStatus_set_locality(msg, sub);
  }
  return sub;
@ -662,12 +664,12 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutab
 /* envoy.admin.v3.HostHealthStatus */

 UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy_admin_v3_HostHealthStatus_msg_init, arena);
+  return (envoy_admin_v3_HostHealthStatus*)_upb_Message_New(&envoy__admin__v3__HostHealthStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_HostHealthStatus* ret = envoy_admin_v3_HostHealthStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostHealthStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostHealthStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -677,7 +679,7 @@ UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_pars
                           int options, upb_Arena* arena) {
  envoy_admin_v3_HostHealthStatus* ret = envoy_admin_v3_HostHealthStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_HostHealthStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__HostHealthStatus_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -685,13 +687,13 @@ UPB_INLINE envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostHealthStatus_pars
 }
 UPB_INLINE char* envoy_admin_v3_HostHealthStatus_serialize(const envoy_admin_v3_HostHealthStatus* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostHealthStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostHealthStatus_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_HostHealthStatus_serialize_ex(const envoy_admin_v3_HostHealthStatus* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_HostHealthStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__HostHealthStatus_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_HostHealthStatus_clear_failed_active_health_check(envoy_admin_v3_HostHealthStatus* msg) {
@ -816,8 +818,6 @@ UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admi
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/clusters.proto
 *
@ -8,28 +7,28 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/clusters.upb.h"
-#include "envoy/admin/v3/metrics.upb.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/clusters.upb_minitable.h"
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_Clusters_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_ClusterStatus_msg_init},
+  {.submsg = &envoy__admin__v3__ClusterStatus_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_Clusters_msg_init = {
+const upb_MiniTable envoy__admin__v3__Clusters_msg_init = {
  &envoy_admin_v3_Clusters_submsgs[0],
  &envoy_admin_v3_Clusters__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -40,10 +39,10 @@ const upb_MiniTable envoy_admin_v3_Clusters_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ClusterStatus_submsgs[4] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_admin_v3_HostStatus_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__admin__v3__HostStatus_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
@ -57,7 +56,7 @@ static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = {
  {8, UPB_SIZE(36, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ClusterStatus_msg_init = {
+const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = {
  &envoy_admin_v3_ClusterStatus_submsgs[0],
  &envoy_admin_v3_ClusterStatus__fields[0],
  UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -82,12 +81,12 @@ const upb_MiniTable envoy_admin_v3_ClusterStatus_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_HostStatus_submsgs[6] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_admin_v3_SimpleMetric_msg_init},
-  {.submsg = &envoy_admin_v3_HostHealthStatus_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__admin__v3__SimpleMetric_msg_init},
+  {.submsg = &envoy__admin__v3__HostHealthStatus_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
@ -102,7 +101,7 @@ static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = {
  {9, UPB_SIZE(32, 72), 5, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_HostStatus_msg_init = {
+const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = {
  &envoy_admin_v3_HostStatus_submsgs[0],
  &envoy_admin_v3_HostStatus__fields[0],
  UPB_SIZE(48, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
@ -137,7 +136,7 @@ static const upb_MiniTableField envoy_admin_v3_HostHealthStatus__fields[8] = {
  {8, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_HostHealthStatus_msg_init = {
+const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init = {
  NULL,
  &envoy_admin_v3_HostHealthStatus__fields[0],
  16, 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -162,10 +161,10 @@ const upb_MiniTable envoy_admin_v3_HostHealthStatus_msg_init = {
 };

 static const upb_MiniTable *messages_layout[4] = {
-  &envoy_admin_v3_Clusters_msg_init,
-  &envoy_admin_v3_ClusterStatus_msg_init,
-  &envoy_admin_v3_HostStatus_msg_init,
-  &envoy_admin_v3_HostHealthStatus_msg_init,
+  &envoy__admin__v3__Clusters_msg_init,
+  &envoy__admin__v3__ClusterStatus_msg_init,
+  &envoy__admin__v3__HostStatus_msg_init,
+  &envoy__admin__v3__HostHealthStatus_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h
@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/clusters.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__Clusters_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init;
+extern const upb_MiniTable envoy__admin__v3__HostStatus_msg_init;
+extern const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/config_dump.proto
 *
@ -10,7 +9,17 @@
 #define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/config_dump.upb_minitable.h"
+
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -22,31 +31,22 @@ typedef struct envoy_admin_v3_BootstrapConfigDump envoy_admin_v3_BootstrapConfig
 typedef struct envoy_admin_v3_SecretsConfigDump envoy_admin_v3_SecretsConfigDump;
 typedef struct envoy_admin_v3_SecretsConfigDump_DynamicSecret envoy_admin_v3_SecretsConfigDump_DynamicSecret;
 typedef struct envoy_admin_v3_SecretsConfigDump_StaticSecret envoy_admin_v3_SecretsConfigDump_StaticSecret;
-extern const upb_MiniTable envoy_admin_v3_ConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_BootstrapConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init;
-extern const upb_MiniTable envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init;
 struct envoy_admin_v3_UpdateFailureState;
 struct envoy_config_bootstrap_v3_Bootstrap;
 struct google_protobuf_Any;
 struct google_protobuf_Timestamp;
-extern const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init;
-extern const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_Timestamp_msg_init;



 /* envoy.admin.v3.ConfigDump */

 UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ConfigDump*)_upb_Message_New(&envoy_admin_v3_ConfigDump_msg_init, arena);
+  return (envoy_admin_v3_ConfigDump*)_upb_Message_New(&envoy__admin__v3__ConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_ConfigDump* ret = envoy_admin_v3_ConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -56,7 +56,7 @@ UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_ConfigDump* ret = envoy_admin_v3_ConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ConfigDump_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -64,13 +64,13 @@ UPB_INLINE envoy_admin_v3_ConfigDump* envoy_admin_v3_ConfigDump_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_ConfigDump_serialize(const envoy_admin_v3_ConfigDump* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ConfigDump_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ConfigDump_serialize_ex(const envoy_admin_v3_ConfigDump* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ConfigDump_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ConfigDump_clear_configs(envoy_admin_v3_ConfigDump* msg) {
@ -132,7 +132,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(env
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -141,12 +141,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(env
 /* envoy.admin.v3.BootstrapConfigDump */

 UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_BootstrapConfigDump*)_upb_Message_New(&envoy_admin_v3_BootstrapConfigDump_msg_init, arena);
+  return (envoy_admin_v3_BootstrapConfigDump*)_upb_Message_New(&envoy__admin__v3__BootstrapConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_BootstrapConfigDump* ret = envoy_admin_v3_BootstrapConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__BootstrapConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -156,7 +156,7 @@ UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDum
                           int options, upb_Arena* arena) {
  envoy_admin_v3_BootstrapConfigDump* ret = envoy_admin_v3_BootstrapConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__BootstrapConfigDump_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -164,13 +164,13 @@ UPB_INLINE envoy_admin_v3_BootstrapConfigDump* envoy_admin_v3_BootstrapConfigDum
 }
 UPB_INLINE char* envoy_admin_v3_BootstrapConfigDump_serialize(const envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_BootstrapConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__BootstrapConfigDump_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_BootstrapConfigDump_serialize_ex(const envoy_admin_v3_BootstrapConfigDump* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_BootstrapConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__BootstrapConfigDump_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_clear_bootstrap(envoy_admin_v3_BootstrapConfigDump* msg) {
@ -211,7 +211,7 @@ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_bootstrap(envoy_admin_v3_
 UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapConfigDump_mutable_bootstrap(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) {
  struct envoy_config_bootstrap_v3_Bootstrap* sub = (struct envoy_config_bootstrap_v3_Bootstrap*)envoy_admin_v3_BootstrapConfigDump_bootstrap(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy_config_bootstrap_v3_Bootstrap_msg_init, arena);
+    sub = (struct envoy_config_bootstrap_v3_Bootstrap*)_upb_Message_New(&envoy__config__bootstrap__v3__Bootstrap_msg_init, arena);
    if (sub) envoy_admin_v3_BootstrapConfigDump_set_bootstrap(msg, sub);
  }
  return sub;
@ -223,7 +223,7 @@ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_last_updated(envoy_admin_
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_mutable_last_updated(envoy_admin_v3_BootstrapConfigDump* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_BootstrapConfigDump_last_updated(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_BootstrapConfigDump_set_last_updated(msg, sub);
  }
  return sub;
@ -232,12 +232,12 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_
 /* envoy.admin.v3.SecretsConfigDump */

 UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump* ret = envoy_admin_v3_SecretsConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -247,7 +247,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_pa
                           int options, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump* ret = envoy_admin_v3_SecretsConfigDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -255,13 +255,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump* envoy_admin_v3_SecretsConfigDump_pa
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_serialize(const envoy_admin_v3_SecretsConfigDump* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_serialize_ex(const envoy_admin_v3_SecretsConfigDump* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_clear_static_secrets(envoy_admin_v3_SecretsConfigDump* msg) {
@ -397,7 +397,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_SecretsConfigDump_StaticSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_StaticSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -423,7 +423,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -449,7 +449,7 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -458,12 +458,12 @@ UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3
 /* envoy.admin.v3.SecretsConfigDump.DynamicSecret */

 UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump_DynamicSecret* ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -473,7 +473,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_Secret
                           int options, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump_DynamicSecret* ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -481,13 +481,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_Secret
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize(const envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize_ex(const envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_clear_name(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg) {
@ -584,7 +584,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_last_updated(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(msg, sub);
  }
  return sub;
@ -596,7 +596,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(envoy_
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_secret(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(msg, sub);
  }
  return sub;
@ -608,7 +608,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(e
 UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret* msg, upb_Arena* arena) {
  struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_error_state(msg);
  if (sub == NULL) {
-    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy_admin_v3_UpdateFailureState_msg_init, arena);
+    sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_Message_New(&envoy__admin__v3__UpdateFailureState_msg_init, arena);
    if (sub) envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(msg, sub);
  }
  return sub;
@ -621,12 +621,12 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_client_status
 /* envoy.admin.v3.SecretsConfigDump.StaticSecret */

 UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_StaticSecret_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, arena);
+  return (envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_Message_New(&envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_StaticSecret_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump_StaticSecret* ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -636,7 +636,7 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_Secrets
                           int options, upb_Arena* arena) {
  envoy_admin_v3_SecretsConfigDump_StaticSecret* ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -644,13 +644,13 @@ UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_Secrets
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize(const envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize_ex(const envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_clear_name(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg) {
@ -706,7 +706,7 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(e
 UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) {
  struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_StaticSecret_last_updated(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google_protobuf_Timestamp_msg_init, arena);
+    sub = (struct google_protobuf_Timestamp*)_upb_Message_New(&google__protobuf__Timestamp_msg_init, arena);
    if (sub) envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(msg, sub);
  }
  return sub;
@ -718,14 +718,12 @@ UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(envoy_a
 UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_StaticSecret_secret(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/config_dump.proto
 *
@ -8,26 +7,26 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/config_dump.upb.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/config_dump.upb_minitable.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_ConfigDump_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = {
  &envoy_admin_v3_ConfigDump_submsgs[0],
  &envoy_admin_v3_ConfigDump__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -38,8 +37,8 @@ const upb_MiniTable envoy_admin_v3_ConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_BootstrapConfigDump_submsgs[2] = {
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] = {
@ -47,7 +46,7 @@ static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] =
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_BootstrapConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = {
  &envoy_admin_v3_BootstrapConfigDump_submsgs[0],
  &envoy_admin_v3_BootstrapConfigDump__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -60,9 +59,9 @@ const upb_MiniTable envoy_admin_v3_BootstrapConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = {
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init},
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init},
-  {.submsg = &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init},
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init},
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init},
+  {.submsg = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
@ -71,7 +70,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = {
  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = {
  &envoy_admin_v3_SecretsConfigDump_submsgs[0],
  &envoy_admin_v3_SecretsConfigDump__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -84,9 +83,9 @@ const upb_MiniTable envoy_admin_v3_SecretsConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = {
@ -98,7 +97,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__
  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init = {
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init = {
  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0],
  &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0],
  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -115,8 +114,8 @@ const upb_MiniTable envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = {
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = {
@ -125,7 +124,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__f
  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init = {
+const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = {
  &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0],
  &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -138,11 +137,11 @@ const upb_MiniTable envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init = {
 };

 static const upb_MiniTable *messages_layout[5] = {
-  &envoy_admin_v3_ConfigDump_msg_init,
-  &envoy_admin_v3_BootstrapConfigDump_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msg_init,
-  &envoy_admin_v3_SecretsConfigDump_StaticSecret_msg_init,
+  &envoy__admin__v3__ConfigDump_msg_init,
+  &envoy__admin__v3__BootstrapConfigDump_msg_init,
+  &envoy__admin__v3__SecretsConfigDump_msg_init,
+  &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init,
+  &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h
@ -0,0 +1,34 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init;
+extern const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/config_dump_shared.upb.h
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/config_dump_shared.proto
 *
@ -8,18 +7,18 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/config_dump_shared.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/timestamp.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/config_dump_shared.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/timestamp.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_UpdateFailureState_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
@ -29,7 +28,7 @@ static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = {
  {4, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init = {
+const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = {
  &envoy_admin_v3_UpdateFailureState_submsgs[0],
  &envoy_admin_v3_UpdateFailureState__fields[0],
  UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -46,8 +45,8 @@ const upb_MiniTable envoy_admin_v3_UpdateFailureState_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] = {
@ -56,7 +55,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] =
  {3, UPB_SIZE(4, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = {
  &envoy_admin_v3_ListenersConfigDump_submsgs[0],
  &envoy_admin_v3_ListenersConfigDump__fields[0],
  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -69,8 +68,8 @@ const upb_MiniTable envoy_admin_v3_ListenersConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = {
@ -78,7 +77,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListene
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init = {
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init = {
  &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0],
  &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -91,8 +90,8 @@ const upb_MiniTable envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init =
 };

 static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = {
@ -101,7 +100,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init = {
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init = {
  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0],
  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -114,10 +113,10 @@ const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_
 };

 static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = {
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = {
@ -129,7 +128,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen
  {6, UPB_SIZE(20, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init = {
+const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init = {
  &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0],
  &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0],
  UPB_SIZE(32, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -146,9 +145,9 @@ const upb_MiniTable envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init
 };

 static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_submsgs[3] = {
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init},
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init},
-  {.submsg = &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init},
+  {.submsg = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
@ -158,7 +157,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = {
  {4, UPB_SIZE(8, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = {
  &envoy_admin_v3_ClustersConfigDump_submsgs[0],
  &envoy_admin_v3_ClustersConfigDump__fields[0],
  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -175,8 +174,8 @@ const upb_MiniTable envoy_admin_v3_ClustersConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = {
@ -184,7 +183,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster_
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init = {
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init = {
  &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0],
  &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -197,9 +196,9 @@ const upb_MiniTable envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = {
@ -210,7 +209,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster
  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init = {
+const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init = {
  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0],
  &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0],
  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -227,8 +226,8 @@ const upb_MiniTable envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init =
 };

 static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init},
-  {.submsg = &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init},
+  {.submsg = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init},
+  {.submsg = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
@ -236,7 +235,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = {
  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = {
  &envoy_admin_v3_RoutesConfigDump_submsgs[0],
  &envoy_admin_v3_RoutesConfigDump__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
@ -249,8 +248,8 @@ const upb_MiniTable envoy_admin_v3_RoutesConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = {
@ -258,7 +257,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfi
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init = {
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init = {
  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0],
  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -271,9 +270,9 @@ const upb_MiniTable envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init =
 };

 static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = {
@ -284,7 +283,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConf
  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init = {
+const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init = {
  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0],
  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0],
  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -301,8 +300,8 @@ const upb_MiniTable envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init
 };

 static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init},
-  {.submsg = &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init},
+  {.submsg = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init},
+  {.submsg = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = {
@ -310,7 +309,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2]
  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = {
  &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0],
  &envoy_admin_v3_ScopedRoutesConfigDump__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -323,8 +322,8 @@ const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = {
@ -333,7 +332,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScop
  {3, UPB_SIZE(8, 32), 1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init = {
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init = {
  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0],
  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -346,9 +345,9 @@ const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfi
 };

 static const upb_MiniTableSub envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = {
@ -360,7 +359,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicSco
  {6, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init = {
+const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init = {
  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0],
  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0],
  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -377,8 +376,8 @@ const upb_MiniTable envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConf
 };

 static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_submsgs[2] = {
-  {.submsg = &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init},
-  {.submsg = &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init},
+  {.submsg = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init},
+  {.submsg = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] = {
@ -386,7 +385,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] =
  {3, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = {
  &envoy_admin_v3_EndpointsConfigDump_submsgs[0],
  &envoy_admin_v3_EndpointsConfigDump__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
@ -399,8 +398,8 @@ const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = {
@ -408,7 +407,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpoin
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init = {
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init = {
  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0],
  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -421,9 +420,9 @@ const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_
 };

 static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = {
@ -434,7 +433,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpoi
  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init = {
+const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init = {
  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0],
  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0],
  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -451,14 +450,14 @@ const upb_MiniTable envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg
 };

 static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init},
+  {.submsg = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_EcdsConfigDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = {
  &envoy_admin_v3_EcdsConfigDump_submsgs[0],
  &envoy_admin_v3_EcdsConfigDump__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -469,9 +468,9 @@ const upb_MiniTable envoy_admin_v3_EcdsConfigDump_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Any_msg_init},
-  {.submsg = &google_protobuf_Timestamp_msg_init},
-  {.submsg = &envoy_admin_v3_UpdateFailureState_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
+  {.submsg = &google__protobuf__Timestamp_msg_init},
+  {.submsg = &envoy__admin__v3__UpdateFailureState_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[5] = {
@ -482,7 +481,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__
  {5, UPB_SIZE(16, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init = {
+const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init = {
  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0],
  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0],
  UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -499,25 +498,25 @@ const upb_MiniTable envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init = {
 };

 static const upb_MiniTable *messages_layout[19] = {
-  &envoy_admin_v3_UpdateFailureState_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_StaticListener_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msg_init,
-  &envoy_admin_v3_ListenersConfigDump_DynamicListener_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_StaticCluster_msg_init,
-  &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msg_init,
-  &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msg_init,
-  &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msg_init,
-  &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msg_init,
-  &envoy_admin_v3_EcdsConfigDump_msg_init,
-  &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_msg_init,
+  &envoy__admin__v3__UpdateFailureState_msg_init,
+  &envoy__admin__v3__ListenersConfigDump_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init,
+  &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init,
+  &envoy__admin__v3__ClustersConfigDump_msg_init,
+  &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init,
+  &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init,
+  &envoy__admin__v3__RoutesConfigDump_msg_init,
+  &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init,
+  &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init,
+  &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init,
+  &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init,
+  &envoy__admin__v3__EcdsConfigDump_msg_init,
+  &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h
@ -0,0 +1,48 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/config_dump_shared.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init;
+extern const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/init_dump.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/init_dump.proto
 *
@ -10,7 +9,12 @@
 #define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/init_dump.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -19,20 +23,18 @@ extern "C" {

 typedef struct envoy_admin_v3_UnreadyTargetsDumps envoy_admin_v3_UnreadyTargetsDumps;
 typedef struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump;
-extern const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_msg_init;
-extern const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init;



 /* envoy.admin.v3.UnreadyTargetsDumps */

 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDumps_new(upb_Arena* arena) {
-  return (envoy_admin_v3_UnreadyTargetsDumps*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_msg_init, arena);
+  return (envoy_admin_v3_UnreadyTargetsDumps*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDumps_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_UnreadyTargetsDumps* ret = envoy_admin_v3_UnreadyTargetsDumps_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +44,7 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDump
                           int options, upb_Arena* arena) {
  envoy_admin_v3_UnreadyTargetsDumps* ret = envoy_admin_v3_UnreadyTargetsDumps_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +52,13 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps* envoy_admin_v3_UnreadyTargetsDump
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_serialize(const envoy_admin_v3_UnreadyTargetsDumps* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_serialize_ex(const envoy_admin_v3_UnreadyTargetsDumps* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_clear_unready_targets_dumps(envoy_admin_v3_UnreadyTargetsDumps* msg) {
@ -118,7 +120,7 @@ UPB_INLINE struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_a
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* sub = (struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, arena);
+  struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* sub = (struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -127,12 +129,12 @@ UPB_INLINE struct envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_a
 /* envoy.admin.v3.UnreadyTargetsDumps.UnreadyTargetsDump */

 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(upb_Arena* arena) {
-  return (envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, arena);
+  return (envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump*)_upb_Message_New(&envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* ret = envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -142,7 +144,7 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3
                           int options, upb_Arena* arena) {
  envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* ret = envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -150,13 +152,13 @@ UPB_INLINE envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* envoy_admin_v3
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_serialize(const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_serialize_ex(const envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_clear_name(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg) {
@ -237,8 +239,6 @@ UPB_INLINE bool envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_add_target
  return true;
 }

-extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/init_dump.proto
 *
@ -8,21 +7,21 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/init_dump.upb.h"
-#include "udpa/annotations/status.upb.h"
+#include "envoy/admin/v3/init_dump.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init},
+  {.submsg = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_msg_init = {
+const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = {
  &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0],
  &envoy_admin_v3_UnreadyTargetsDumps__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -37,7 +36,7 @@ static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps_UnreadyTarget
  {2, UPB_SIZE(0, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init = {
+const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init = {
  NULL,
  &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -50,8 +49,8 @@ const upb_MiniTable envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_in
 };

 static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_UnreadyTargetsDumps_msg_init,
-  &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_msg_init,
+  &envoy__admin__v3__UnreadyTargetsDumps_msg_init,
+  &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h
@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/init_dump.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init;
+extern const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/listeners.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/listeners.proto
 *
@ -10,7 +9,14 @@
 #define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/listeners.upb_minitable.h"
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -19,22 +25,19 @@ extern "C" {

 typedef struct envoy_admin_v3_Listeners envoy_admin_v3_Listeners;
 typedef struct envoy_admin_v3_ListenerStatus envoy_admin_v3_ListenerStatus;
-extern const upb_MiniTable envoy_admin_v3_Listeners_msg_init;
-extern const upb_MiniTable envoy_admin_v3_ListenerStatus_msg_init;
 struct envoy_config_core_v3_Address;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;



 /* envoy.admin.v3.Listeners */

 UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Listeners*)_upb_Message_New(&envoy_admin_v3_Listeners_msg_init, arena);
+  return (envoy_admin_v3_Listeners*)_upb_Message_New(&envoy__admin__v3__Listeners_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_Listeners* ret = envoy_admin_v3_Listeners_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Listeners_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Listeners_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -44,7 +47,7 @@ UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse_ex(const cha
                           int options, upb_Arena* arena) {
  envoy_admin_v3_Listeners* ret = envoy_admin_v3_Listeners_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Listeners_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Listeners_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -52,13 +55,13 @@ UPB_INLINE envoy_admin_v3_Listeners* envoy_admin_v3_Listeners_parse_ex(const cha
 }
 UPB_INLINE char* envoy_admin_v3_Listeners_serialize(const envoy_admin_v3_Listeners* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Listeners_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Listeners_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Listeners_serialize_ex(const envoy_admin_v3_Listeners* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Listeners_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Listeners_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Listeners_clear_listener_statuses(envoy_admin_v3_Listeners* msg) {
@ -120,7 +123,7 @@ UPB_INLINE struct envoy_admin_v3_ListenerStatus* envoy_admin_v3_Listeners_add_li
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_admin_v3_ListenerStatus* sub = (struct envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy_admin_v3_ListenerStatus_msg_init, arena);
+  struct envoy_admin_v3_ListenerStatus* sub = (struct envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy__admin__v3__ListenerStatus_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -129,12 +132,12 @@ UPB_INLINE struct envoy_admin_v3_ListenerStatus* envoy_admin_v3_Listeners_add_li
 /* envoy.admin.v3.ListenerStatus */

 UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy_admin_v3_ListenerStatus_msg_init, arena);
+  return (envoy_admin_v3_ListenerStatus*)_upb_Message_New(&envoy__admin__v3__ListenerStatus_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_ListenerStatus* ret = envoy_admin_v3_ListenerStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenerStatus_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -144,7 +147,7 @@ UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse_ex
                           int options, upb_Arena* arena) {
  envoy_admin_v3_ListenerStatus* ret = envoy_admin_v3_ListenerStatus_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ListenerStatus_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ListenerStatus_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -152,13 +155,13 @@ UPB_INLINE envoy_admin_v3_ListenerStatus* envoy_admin_v3_ListenerStatus_parse_ex
 }
 UPB_INLINE char* envoy_admin_v3_ListenerStatus_serialize(const envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenerStatus_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenerStatus_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ListenerStatus_serialize_ex(const envoy_admin_v3_ListenerStatus* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ListenerStatus_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ListenerStatus_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ListenerStatus_clear_name(envoy_admin_v3_ListenerStatus* msg) {
@ -236,7 +239,7 @@ UPB_INLINE void envoy_admin_v3_ListenerStatus_set_local_address(envoy_admin_v3_L
 UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_mutable_local_address(envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_ListenerStatus_local_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
    if (sub) envoy_admin_v3_ListenerStatus_set_local_address(msg, sub);
  }
  return sub;
@ -262,14 +265,12 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_ad
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
 }

-extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/listeners.proto
 *
@ -8,23 +7,23 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/listeners.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/listeners.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_Listeners_submsgs[1] = {
-  {.submsg = &envoy_admin_v3_ListenerStatus_msg_init},
+  {.submsg = &envoy__admin__v3__ListenerStatus_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_Listeners_msg_init = {
+const upb_MiniTable envoy__admin__v3__Listeners_msg_init = {
  &envoy_admin_v3_Listeners_submsgs[0],
  &envoy_admin_v3_Listeners__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -35,8 +34,8 @@ const upb_MiniTable envoy_admin_v3_Listeners_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_ListenerStatus_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
@ -45,7 +44,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = {
  {3, UPB_SIZE(8, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ListenerStatus_msg_init = {
+const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = {
  &envoy_admin_v3_ListenerStatus_submsgs[0],
  &envoy_admin_v3_ListenerStatus__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -58,8 +57,8 @@ const upb_MiniTable envoy_admin_v3_ListenerStatus_msg_init = {
 };

 static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_Listeners_msg_init,
-  &envoy_admin_v3_ListenerStatus_msg_init,
+  &envoy__admin__v3__Listeners_msg_init,
+  &envoy__admin__v3__ListenerStatus_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h
@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/listeners.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__Listeners_msg_init;
+extern const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/memory.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/memory.proto
 *
@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/memory.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,19 +23,18 @@ extern "C" {
 #endif

 typedef struct envoy_admin_v3_Memory envoy_admin_v3_Memory;
-extern const upb_MiniTable envoy_admin_v3_Memory_msg_init;



 /* envoy.admin.v3.Memory */

 UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_new(upb_Arena* arena) {
-  return (envoy_admin_v3_Memory*)_upb_Message_New(&envoy_admin_v3_Memory_msg_init, arena);
+  return (envoy_admin_v3_Memory*)_upb_Message_New(&envoy__admin__v3__Memory_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_Memory* ret = envoy_admin_v3_Memory_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Memory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Memory_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -40,7 +44,7 @@ UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse_ex(const char* buf
                           int options, upb_Arena* arena) {
  envoy_admin_v3_Memory* ret = envoy_admin_v3_Memory_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_Memory_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__Memory_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -48,13 +52,13 @@ UPB_INLINE envoy_admin_v3_Memory* envoy_admin_v3_Memory_parse_ex(const char* buf
 }
 UPB_INLINE char* envoy_admin_v3_Memory_serialize(const envoy_admin_v3_Memory* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Memory_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Memory_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_Memory_serialize_ex(const envoy_admin_v3_Memory* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_Memory_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__Memory_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_Memory_clear_allocated(envoy_admin_v3_Memory* msg) {
@ -149,8 +153,6 @@ UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Me
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/memory.proto
 *
@ -8,9 +7,9 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/memory.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/memory.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -24,7 +23,7 @@ static const upb_MiniTableField envoy_admin_v3_Memory__fields[6] = {
  {6, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_Memory_msg_init = {
+const upb_MiniTable envoy__admin__v3__Memory_msg_init = {
  NULL,
  &envoy_admin_v3_Memory__fields[0],
  48, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -41,7 +40,7 @@ const upb_MiniTable envoy_admin_v3_Memory_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_Memory_msg_init,
+  &envoy__admin__v3__Memory_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/memory.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__Memory_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/metrics.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/metrics.proto
 *
@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,7 +23,6 @@ extern "C" {
 #endif

 typedef struct envoy_admin_v3_SimpleMetric envoy_admin_v3_SimpleMetric;
-extern const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init;

 typedef enum {
  envoy_admin_v3_SimpleMetric_COUNTER = 0,
@ -30,12 +34,12 @@ typedef enum {
 /* envoy.admin.v3.SimpleMetric */

 UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_new(upb_Arena* arena) {
-  return (envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy_admin_v3_SimpleMetric_msg_init, arena);
+  return (envoy_admin_v3_SimpleMetric*)_upb_Message_New(&envoy__admin__v3__SimpleMetric_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_SimpleMetric* ret = envoy_admin_v3_SimpleMetric_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SimpleMetric_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SimpleMetric_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -45,7 +49,7 @@ UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse_ex(con
                           int options, upb_Arena* arena) {
  envoy_admin_v3_SimpleMetric* ret = envoy_admin_v3_SimpleMetric_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_SimpleMetric_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__SimpleMetric_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -53,13 +57,13 @@ UPB_INLINE envoy_admin_v3_SimpleMetric* envoy_admin_v3_SimpleMetric_parse_ex(con
 }
 UPB_INLINE char* envoy_admin_v3_SimpleMetric_serialize(const envoy_admin_v3_SimpleMetric* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SimpleMetric_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SimpleMetric_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_SimpleMetric_serialize_ex(const envoy_admin_v3_SimpleMetric* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_SimpleMetric_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__SimpleMetric_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_SimpleMetric_clear_type(envoy_admin_v3_SimpleMetric* msg) {
@ -109,8 +113,6 @@ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/metrics.proto
 *
@ -8,9 +7,9 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/metrics.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/metrics.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -21,7 +20,7 @@ static const upb_MiniTableField envoy_admin_v3_SimpleMetric__fields[3] = {
  {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init = {
+const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init = {
  NULL,
  &envoy_admin_v3_SimpleMetric__fields[0],
  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -34,7 +33,7 @@ const upb_MiniTable envoy_admin_v3_SimpleMetric_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_SimpleMetric_msg_init,
+  &envoy__admin__v3__SimpleMetric_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/metrics.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/mutex_stats.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/mutex_stats.proto
 *
@ -10,7 +9,13 @@
 #define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/mutex_stats.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,19 +23,18 @@ extern "C" {
 #endif

 typedef struct envoy_admin_v3_MutexStats envoy_admin_v3_MutexStats;
-extern const upb_MiniTable envoy_admin_v3_MutexStats_msg_init;



 /* envoy.admin.v3.MutexStats */

 UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_new(upb_Arena* arena) {
-  return (envoy_admin_v3_MutexStats*)_upb_Message_New(&envoy_admin_v3_MutexStats_msg_init, arena);
+  return (envoy_admin_v3_MutexStats*)_upb_Message_New(&envoy__admin__v3__MutexStats_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_MutexStats* ret = envoy_admin_v3_MutexStats_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_MutexStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__MutexStats_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -40,7 +44,7 @@ UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_MutexStats* ret = envoy_admin_v3_MutexStats_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_MutexStats_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__MutexStats_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -48,13 +52,13 @@ UPB_INLINE envoy_admin_v3_MutexStats* envoy_admin_v3_MutexStats_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_MutexStats_serialize(const envoy_admin_v3_MutexStats* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_MutexStats_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__MutexStats_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_MutexStats_serialize_ex(const envoy_admin_v3_MutexStats* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_MutexStats_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__MutexStats_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_MutexStats_clear_num_contentions(envoy_admin_v3_MutexStats* msg) {
@ -104,8 +108,6 @@ UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/mutex_stats.proto
 *
@ -8,9 +7,9 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/mutex_stats.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/mutex_stats.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -21,7 +20,7 @@ static const upb_MiniTableField envoy_admin_v3_MutexStats__fields[3] = {
  {3, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_MutexStats_msg_init = {
+const upb_MiniTable envoy__admin__v3__MutexStats_msg_init = {
  NULL,
  &envoy_admin_v3_MutexStats__fields[0],
  24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -34,7 +33,7 @@ const upb_MiniTable envoy_admin_v3_MutexStats_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_MutexStats_msg_init,
+  &envoy__admin__v3__MutexStats_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/mutex_stats.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__MutexStats_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/server_info.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/server_info.proto
 *
@ -10,7 +9,15 @@
 #define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/server_info.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -19,12 +26,8 @@ extern "C" {

 typedef struct envoy_admin_v3_ServerInfo envoy_admin_v3_ServerInfo;
 typedef struct envoy_admin_v3_CommandLineOptions envoy_admin_v3_CommandLineOptions;
-extern const upb_MiniTable envoy_admin_v3_ServerInfo_msg_init;
-extern const upb_MiniTable envoy_admin_v3_CommandLineOptions_msg_init;
 struct envoy_config_core_v3_Node;
 struct google_protobuf_Duration;
-extern const upb_MiniTable envoy_config_core_v3_Node_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;

 typedef enum {
  envoy_admin_v3_CommandLineOptions_Gradual = 0,
@ -54,12 +57,12 @@ typedef enum {
 /* envoy.admin.v3.ServerInfo */

 UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_new(upb_Arena* arena) {
-  return (envoy_admin_v3_ServerInfo*)_upb_Message_New(&envoy_admin_v3_ServerInfo_msg_init, arena);
+  return (envoy_admin_v3_ServerInfo*)_upb_Message_New(&envoy__admin__v3__ServerInfo_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_ServerInfo* ret = envoy_admin_v3_ServerInfo_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ServerInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ServerInfo_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -69,7 +72,7 @@ UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_ServerInfo* ret = envoy_admin_v3_ServerInfo_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_ServerInfo_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__ServerInfo_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -77,13 +80,13 @@ UPB_INLINE envoy_admin_v3_ServerInfo* envoy_admin_v3_ServerInfo_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_ServerInfo_serialize(const envoy_admin_v3_ServerInfo* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ServerInfo_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ServerInfo_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_ServerInfo_serialize_ex(const envoy_admin_v3_ServerInfo* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_ServerInfo_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__ServerInfo_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_ServerInfo_clear_version(envoy_admin_v3_ServerInfo* msg) {
@ -195,7 +198,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_current_epoch(envoy_admin_v
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_current_epoch(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_current_epoch(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_admin_v3_ServerInfo_set_uptime_current_epoch(msg, sub);
  }
  return sub;
@ -207,7 +210,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_all_epochs(envoy_admin_v3_S
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_all_epochs(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_all_epochs(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_admin_v3_ServerInfo_set_uptime_all_epochs(msg, sub);
  }
  return sub;
@ -223,7 +226,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_command_line_options(envoy_admin_v
 UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_mutable_command_line_options(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
  struct envoy_admin_v3_CommandLineOptions* sub = (struct envoy_admin_v3_CommandLineOptions*)envoy_admin_v3_ServerInfo_command_line_options(msg);
  if (sub == NULL) {
-    sub = (struct envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy_admin_v3_CommandLineOptions_msg_init, arena);
+    sub = (struct envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy__admin__v3__CommandLineOptions_msg_init, arena);
    if (sub) envoy_admin_v3_ServerInfo_set_command_line_options(msg, sub);
  }
  return sub;
@ -235,7 +238,7 @@ UPB_INLINE void envoy_admin_v3_ServerInfo_set_node(envoy_admin_v3_ServerInfo *ms
 UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_node(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_admin_v3_ServerInfo_node(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy_config_core_v3_Node_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Node*)_upb_Message_New(&envoy__config__core__v3__Node_msg_init, arena);
    if (sub) envoy_admin_v3_ServerInfo_set_node(msg, sub);
  }
  return sub;
@ -244,12 +247,12 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_n
 /* envoy.admin.v3.CommandLineOptions */

 UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_new(upb_Arena* arena) {
-  return (envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy_admin_v3_CommandLineOptions_msg_init, arena);
+  return (envoy_admin_v3_CommandLineOptions*)_upb_Message_New(&envoy__admin__v3__CommandLineOptions_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_CommandLineOptions* ret = envoy_admin_v3_CommandLineOptions_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CommandLineOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CommandLineOptions_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -259,7 +262,7 @@ UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_
                           int options, upb_Arena* arena) {
  envoy_admin_v3_CommandLineOptions* ret = envoy_admin_v3_CommandLineOptions_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_CommandLineOptions_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__CommandLineOptions_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -267,13 +270,13 @@ UPB_INLINE envoy_admin_v3_CommandLineOptions* envoy_admin_v3_CommandLineOptions_
 }
 UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize(const envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CommandLineOptions_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CommandLineOptions_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize_ex(const envoy_admin_v3_CommandLineOptions* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_CommandLineOptions_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__CommandLineOptions_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id(envoy_admin_v3_CommandLineOptions* msg) {
@ -778,7 +781,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_file_flush_interval(envoy_
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_file_flush_interval(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_file_flush_interval(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_admin_v3_CommandLineOptions_set_file_flush_interval(msg, sub);
  }
  return sub;
@ -790,7 +793,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_time(envoy_admin_v3_
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_drain_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_drain_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_admin_v3_CommandLineOptions_set_drain_time(msg, sub);
  }
  return sub;
@ -802,7 +805,7 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(envoy
 UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_parent_shutdown_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_parent_shutdown_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(msg, sub);
  }
  return sub;
@ -916,8 +919,6 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_stats_tag(envoy_admin_v3_C
  return true;
 }

-extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/server_info.proto
 *
@ -8,20 +7,20 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/server_info.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
+#include "envoy/admin/v3/server_info.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_ServerInfo_submsgs[4] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_admin_v3_CommandLineOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__admin__v3__CommandLineOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
@ -34,7 +33,7 @@ static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = {
  {7, UPB_SIZE(20, 64), 4, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_ServerInfo_msg_init = {
+const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = {
  &envoy_admin_v3_ServerInfo_submsgs[0],
  &envoy_admin_v3_ServerInfo__fields[0],
  UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
@ -51,9 +50,9 @@ const upb_MiniTable envoy_admin_v3_ServerInfo_msg_init = {
 };

 static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = {
@ -93,7 +92,7 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] =
  {38, UPB_SIZE(68, 288), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_CommandLineOptions_msg_init = {
+const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = {
  &envoy_admin_v3_CommandLineOptions_submsgs[0],
  &envoy_admin_v3_CommandLineOptions__fields[0],
  UPB_SIZE(176, 296), 34, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0,
@ -134,8 +133,8 @@ const upb_MiniTable envoy_admin_v3_CommandLineOptions_msg_init = {
 };

 static const upb_MiniTable *messages_layout[2] = {
-  &envoy_admin_v3_ServerInfo_msg_init,
-  &envoy_admin_v3_CommandLineOptions_msg_init,
+  &envoy__admin__v3__ServerInfo_msg_init,
+  &envoy__admin__v3__CommandLineOptions_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h
@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/server_info.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init;
+extern const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h
+++ b/src/core/ext/upb-generated/envoy/admin/v3/tap.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/tap.proto
 *
@ -10,7 +9,15 @@
 #define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/admin/v3/tap.upb_minitable.h"
+
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,21 +25,19 @@ extern "C" {
 #endif

 typedef struct envoy_admin_v3_TapRequest envoy_admin_v3_TapRequest;
-extern const upb_MiniTable envoy_admin_v3_TapRequest_msg_init;
 struct envoy_config_tap_v3_TapConfig;
-extern const upb_MiniTable envoy_config_tap_v3_TapConfig_msg_init;



 /* envoy.admin.v3.TapRequest */

 UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_new(upb_Arena* arena) {
-  return (envoy_admin_v3_TapRequest*)_upb_Message_New(&envoy_admin_v3_TapRequest_msg_init, arena);
+  return (envoy_admin_v3_TapRequest*)_upb_Message_New(&envoy__admin__v3__TapRequest_msg_init, arena);
 }
 UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_admin_v3_TapRequest* ret = envoy_admin_v3_TapRequest_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_TapRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__TapRequest_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +47,7 @@ UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_admin_v3_TapRequest* ret = envoy_admin_v3_TapRequest_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_admin_v3_TapRequest_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__admin__v3__TapRequest_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +55,13 @@ UPB_INLINE envoy_admin_v3_TapRequest* envoy_admin_v3_TapRequest_parse_ex(const c
 }
 UPB_INLINE char* envoy_admin_v3_TapRequest_serialize(const envoy_admin_v3_TapRequest* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_TapRequest_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__TapRequest_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_admin_v3_TapRequest_serialize_ex(const envoy_admin_v3_TapRequest* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_admin_v3_TapRequest_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__admin__v3__TapRequest_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_admin_v3_TapRequest_clear_config_id(envoy_admin_v3_TapRequest* msg) {
@ -97,14 +102,12 @@ UPB_INLINE void envoy_admin_v3_TapRequest_set_tap_config(envoy_admin_v3_TapReque
 UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutable_tap_config(envoy_admin_v3_TapRequest* msg, upb_Arena* arena) {
  struct envoy_config_tap_v3_TapConfig* sub = (struct envoy_config_tap_v3_TapConfig*)envoy_admin_v3_TapRequest_tap_config(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy_config_tap_v3_TapConfig_msg_init, arena);
+    sub = (struct envoy_config_tap_v3_TapConfig*)_upb_Message_New(&envoy__config__tap__v3__TapConfig_msg_init, arena);
    if (sub) envoy_admin_v3_TapRequest_set_tap_config(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/admin/v3/tap.proto
 *
@ -8,17 +7,17 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/admin/v3/tap.upb.h"
-#include "envoy/config/tap/v3/common.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/admin/v3/tap.upb_minitable.h"
+#include "envoy/config/tap/v3/common.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_admin_v3_TapRequest_submsgs[1] = {
-  {.submsg = &envoy_config_tap_v3_TapConfig_msg_init},
+  {.submsg = &envoy__config__tap__v3__TapConfig_msg_init},
 };

 static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
@ -26,7 +25,7 @@ static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = {
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_admin_v3_TapRequest_msg_init = {
+const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = {
  &envoy_admin_v3_TapRequest_submsgs[0],
  &envoy_admin_v3_TapRequest__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -39,7 +38,7 @@ const upb_MiniTable envoy_admin_v3_TapRequest_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_admin_v3_TapRequest_msg_init,
+  &envoy__admin__v3__TapRequest_msg_init,
 };

 const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/admin/v3/tap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__admin__v3__TapRequest_msg_init;
+
+extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
+++ b/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/annotations/deprecation.proto
 *
@ -10,21 +9,20 @@
 #define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/annotations/deprecation.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
 extern "C" {
 #endif

-extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext;
-extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext;
-extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext;
-extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext;
 struct google_protobuf_EnumValueOptions;
 struct google_protobuf_FieldOptions;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;


 UPB_INLINE bool envoy_annotations_has_disallowed_by_default(const struct google_protobuf_FieldOptions* msg) {
@ -115,8 +113,6 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go
  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
  UPB_ASSERT(ok);
 }
-extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/annotations/deprecation.proto
 *
@ -8,35 +7,33 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "google/protobuf/descriptor.upb.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

-extern const upb_MiniTable google_protobuf_EnumValueOptions_msg_init;
-extern const upb_MiniTable google_protobuf_FieldOptions_msg_init;
 const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext = {
  {189503207, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
+  &google__protobuf__FieldOptions_msg_init,
  {.submsg = NULL},

 };
 const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext = {
-  {157299826, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  &google_protobuf_FieldOptions_msg_init,
+  {157299826, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  &google__protobuf__FieldOptions_msg_init,
  {.submsg = NULL},

 };
 const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext = {
  {70100853, 0, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
+  &google__protobuf__EnumValueOptions_msg_init,
  {.submsg = NULL},

 };
 const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext = {
-  {181198657, 0, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  &google_protobuf_EnumValueOptions_msg_init,
+  {181198657, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  &google__protobuf__EnumValueOptions_msg_init,
  {.submsg = NULL},

 };
--- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h
@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/deprecation.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_ext;
+extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_ext;
+extern const upb_MiniTableExtension envoy_annotations_disallowed_by_default_enum_ext;
+extern const upb_MiniTableExtension envoy_annotations_deprecated_at_minor_version_enum_ext;
+
+extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/annotations/resource.upb.h
+++ b/src/core/ext/upb-generated/envoy/annotations/resource.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/annotations/resource.proto
 *
@ -10,7 +9,12 @@
 #define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/annotations/resource.upb_minitable.h"
+
+#include "google/protobuf/descriptor.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,22 +22,19 @@ extern "C" {
 #endif

 typedef struct envoy_annotations_ResourceAnnotation envoy_annotations_ResourceAnnotation;
-extern const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init;
-extern const upb_MiniTableExtension envoy_annotations_resource_ext;
 struct google_protobuf_ServiceOptions;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;



 /* envoy.annotations.ResourceAnnotation */

 UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_new(upb_Arena* arena) {
-  return (envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy_annotations_ResourceAnnotation_msg_init, arena);
+  return (envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy__annotations__ResourceAnnotation_msg_init, arena);
 }
 UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnotation_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__annotations__ResourceAnnotation_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -43,7 +44,7 @@ UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnot
                           int options, upb_Arena* arena) {
  envoy_annotations_ResourceAnnotation* ret = envoy_annotations_ResourceAnnotation_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_annotations_ResourceAnnotation_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__annotations__ResourceAnnotation_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -51,13 +52,13 @@ UPB_INLINE envoy_annotations_ResourceAnnotation* envoy_annotations_ResourceAnnot
 }
 UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize(const envoy_annotations_ResourceAnnotation* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_annotations_ResourceAnnotation_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__annotations__ResourceAnnotation_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_annotations_ResourceAnnotation_serialize_ex(const envoy_annotations_ResourceAnnotation* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_annotations_ResourceAnnotation_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__annotations__ResourceAnnotation_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_annotations_ResourceAnnotation_clear_type(envoy_annotations_ResourceAnnotation* msg) {
@ -99,8 +100,6 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt
  bool ok = _upb_Message_SetExtensionField(msg, ext, &val, arena);
  UPB_ASSERT(ok);
 }
-extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/annotations/resource.proto
 *
@ -8,8 +7,8 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/annotations/resource.upb.h"
-#include "google/protobuf/descriptor.upb.h"
+#include "envoy/annotations/resource.upb_minitable.h"
+#include "google/protobuf/descriptor.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -18,7 +17,7 @@ static const upb_MiniTableField envoy_annotations_ResourceAnnotation__fields[1]
  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init = {
+const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = {
  NULL,
  &envoy_annotations_ResourceAnnotation__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -29,15 +28,13 @@ const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_annotations_ResourceAnnotation_msg_init,
+  &envoy__annotations__ResourceAnnotation_msg_init,
 };

-extern const upb_MiniTable envoy_annotations_ResourceAnnotation_msg_init;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msg_init;
 const upb_MiniTableExtension envoy_annotations_resource_ext = {
  {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  &google_protobuf_ServiceOptions_msg_init,
-  {.submsg = &envoy_annotations_ResourceAnnotation_msg_init},
+  &google__protobuf__ServiceOptions_msg_init,
+  {.submsg = &envoy__annotations__ResourceAnnotation_msg_init},

 };

--- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h
@ -0,0 +1,31 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/annotations/resource.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init;
+extern const upb_MiniTableExtension envoy_annotations_resource_ext;
+
+extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/accesslog/v3/accesslog.proto
 *
@ -10,7 +9,21 @@
 #define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -33,34 +46,12 @@ typedef struct envoy_config_accesslog_v3_GrpcStatusFilter envoy_config_accesslog
 typedef struct envoy_config_accesslog_v3_MetadataFilter envoy_config_accesslog_v3_MetadataFilter;
 typedef struct envoy_config_accesslog_v3_LogTypeFilter envoy_config_accesslog_v3_LogTypeFilter;
 typedef struct envoy_config_accesslog_v3_ExtensionFilter envoy_config_accesslog_v3_ExtensionFilter;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ComparisonFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_StatusCodeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_DurationFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_TraceableFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_RuntimeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_AndFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_OrFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_HeaderFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ResponseFlagFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_GrpcStatusFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_MetadataFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_LogTypeFilter_msg_init;
-extern const upb_MiniTable envoy_config_accesslog_v3_ExtensionFilter_msg_init;
 struct envoy_config_core_v3_RuntimeUInt32;
 struct envoy_config_route_v3_HeaderMatcher;
 struct envoy_type_matcher_v3_MetadataMatcher;
 struct envoy_type_v3_FractionalPercent;
 struct google_protobuf_Any;
 struct google_protobuf_BoolValue;
-extern const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_MetadataMatcher_msg_init;
-extern const upb_MiniTable envoy_type_v3_FractionalPercent_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;

 typedef enum {
  envoy_config_accesslog_v3_ComparisonFilter_EQ = 0,
@ -93,12 +84,12 @@ typedef enum {
 /* envoy.config.accesslog.v3.AccessLog */

 UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLog_msg_init, arena);
+  return (envoy_config_accesslog_v3_AccessLog*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLog_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_AccessLog_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLog_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -108,7 +99,7 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_Access
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_AccessLog* ret = envoy_config_accesslog_v3_AccessLog_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLog_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLog_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -116,13 +107,13 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLog* envoy_config_accesslog_v3_Access
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize(const envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLog_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLog_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AccessLog_serialize_ex(const envoy_config_accesslog_v3_AccessLog* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLog_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLog_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -186,7 +177,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_filter(envoy_config_acce
 UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_mutable_filter(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_config_accesslog_v3_AccessLog_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLog_set_filter(msg, sub);
  }
  return sub;
@ -198,7 +189,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_typed_config(envoy_confi
 UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutable_typed_config(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_AccessLog_typed_config(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLog_set_typed_config(msg, sub);
  }
  return sub;
@ -207,12 +198,12 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutab
 /* envoy.config.accesslog.v3.AccessLogFilter */

 UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLogFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -222,7 +213,7 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_AccessLogFilter* ret = envoy_config_accesslog_v3_AccessLogFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -230,13 +221,13 @@ UPB_INLINE envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize(const envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AccessLogFilter_serialize_ex(const envoy_config_accesslog_v3_AccessLogFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AccessLogFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AccessLogFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -462,7 +453,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter
 UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_StatusCodeFilter* sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_StatusCodeFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(msg, sub);
  }
  return sub;
@ -474,7 +465,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(en
 UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_DurationFilter* sub = (struct envoy_config_accesslog_v3_DurationFilter*)envoy_config_accesslog_v3_AccessLogFilter_duration_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy_config_accesslog_v3_DurationFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy__config__accesslog__v3__DurationFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(msg, sub);
  }
  return sub;
@ -486,7 +477,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_f
 UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_NotHealthCheckFilter* sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(msg, sub);
  }
  return sub;
@ -498,7 +489,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(e
 UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_TraceableFilter* sub = (struct envoy_config_accesslog_v3_TraceableFilter*)envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy_config_accesslog_v3_TraceableFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy__config__accesslog__v3__TraceableFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(msg, sub);
  }
  return sub;
@ -510,7 +501,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(env
 UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_RuntimeFilter* sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_RuntimeFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__RuntimeFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(msg, sub);
  }
  return sub;
@ -522,7 +513,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(envoy_c
 UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_AndFilter* sub = (struct envoy_config_accesslog_v3_AndFilter*)envoy_config_accesslog_v3_AccessLogFilter_and_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AndFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AndFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(msg, sub);
  }
  return sub;
@ -534,7 +525,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(envoy_co
 UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_OrFilter* sub = (struct envoy_config_accesslog_v3_OrFilter*)envoy_config_accesslog_v3_AccessLogFilter_or_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy_config_accesslog_v3_OrFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy__config__accesslog__v3__OrFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(msg, sub);
  }
  return sub;
@ -546,7 +537,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(envo
 UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_HeaderFilter* sub = (struct envoy_config_accesslog_v3_HeaderFilter*)envoy_config_accesslog_v3_AccessLogFilter_header_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy_config_accesslog_v3_HeaderFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy__config__accesslog__v3__HeaderFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(msg, sub);
  }
  return sub;
@ -558,7 +549,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filt
 UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_ResponseFlagFilter* sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(msg, sub);
  }
  return sub;
@ -570,7 +561,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter
 UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_GrpcStatusFilter* sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(msg, sub);
  }
  return sub;
@ -582,7 +573,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(e
 UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_ExtensionFilter* sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)envoy_config_accesslog_v3_AccessLogFilter_extension_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ExtensionFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ExtensionFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(msg, sub);
  }
  return sub;
@ -594,7 +585,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(en
 UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_MetadataFilter* sub = (struct envoy_config_accesslog_v3_MetadataFilter*)envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy_config_accesslog_v3_MetadataFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy__config__accesslog__v3__MetadataFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(msg, sub);
  }
  return sub;
@ -606,7 +597,7 @@ UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(en
 UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_LogTypeFilter* sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_LogTypeFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__LogTypeFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(msg, sub);
  }
  return sub;
@ -615,12 +606,12 @@ UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslo
 /* envoy.config.accesslog.v3.ComparisonFilter */

 UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_ComparisonFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -630,7 +621,7 @@ UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_ComparisonFilter* ret = envoy_config_accesslog_v3_ComparisonFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -638,13 +629,13 @@ UPB_INLINE envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize(const envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ComparisonFilter_serialize_ex(const envoy_config_accesslog_v3_ComparisonFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ComparisonFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ComparisonFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_clear_op(envoy_config_accesslog_v3_ComparisonFilter* msg) {
@ -685,7 +676,7 @@ UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_value(envoy_confi
 UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_mutable_value(envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_RuntimeUInt32* sub = (struct envoy_config_core_v3_RuntimeUInt32*)envoy_config_accesslog_v3_ComparisonFilter_value(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy_config_core_v3_RuntimeUInt32_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RuntimeUInt32*)_upb_Message_New(&envoy__config__core__v3__RuntimeUInt32_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_ComparisonFilter_set_value(msg, sub);
  }
  return sub;
@ -694,12 +685,12 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_
 /* envoy.config.accesslog.v3.StatusCodeFilter */

 UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_StatusCodeFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_StatusCodeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__StatusCodeFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_StatusCodeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -709,7 +700,7 @@ UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_StatusCodeFilter* ret = envoy_config_accesslog_v3_StatusCodeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -717,13 +708,13 @@ UPB_INLINE envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3
 }
 UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize(const envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_StatusCodeFilter_serialize_ex(const envoy_config_accesslog_v3_StatusCodeFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_StatusCodeFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__StatusCodeFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_clear_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg) {
@ -749,7 +740,7 @@ UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(envoy_
 UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_mutable_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_StatusCodeFilter_comparison(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(msg, sub);
  }
  return sub;
@ -758,12 +749,12 @@ UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_acces
 /* envoy.config.accesslog.v3.DurationFilter */

 UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy_config_accesslog_v3_DurationFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_DurationFilter*)_upb_Message_New(&envoy__config__accesslog__v3__DurationFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_DurationFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__DurationFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -773,7 +764,7 @@ UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_D
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_DurationFilter* ret = envoy_config_accesslog_v3_DurationFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_DurationFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__DurationFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -781,13 +772,13 @@ UPB_INLINE envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_D
 }
 UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize(const envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_DurationFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__DurationFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_DurationFilter_serialize_ex(const envoy_config_accesslog_v3_DurationFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_DurationFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__DurationFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_clear_comparison(envoy_config_accesslog_v3_DurationFilter* msg) {
@ -813,7 +804,7 @@ UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_set_comparison(envoy_co
 UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_mutable_comparison(envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena) {
  struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_DurationFilter_comparison(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ComparisonFilter_msg_init, arena);
+    sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ComparisonFilter_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_DurationFilter_set_comparison(msg, sub);
  }
  return sub;
@ -822,12 +813,12 @@ UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_acces
 /* envoy.config.accesslog.v3.NotHealthCheckFilter */

 UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_NotHealthCheckFilter*)_upb_Message_New(&envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_NotHealthCheckFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -837,7 +828,7 @@ UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslo
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_NotHealthCheckFilter* ret = envoy_config_accesslog_v3_NotHealthCheckFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -845,13 +836,13 @@ UPB_INLINE envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslo
 }
 UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize_ex(const envoy_config_accesslog_v3_NotHealthCheckFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }

@ -859,12 +850,12 @@ UPB_INLINE char* envoy_config_accesslog_v3_NotHealthCheckFilter_serialize_ex(con
 /* envoy.config.accesslog.v3.TraceableFilter */

 UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy_config_accesslog_v3_TraceableFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_TraceableFilter*)_upb_Message_New(&envoy__config__accesslog__v3__TraceableFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_TraceableFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__TraceableFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -874,7 +865,7 @@ UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_TraceableFilter* ret = envoy_config_accesslog_v3_TraceableFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_TraceableFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__TraceableFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -882,13 +873,13 @@ UPB_INLINE envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_
 }
 UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize(const envoy_config_accesslog_v3_TraceableFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_TraceableFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__TraceableFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize_ex(const envoy_config_accesslog_v3_TraceableFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_TraceableFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__TraceableFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }

@ -896,12 +887,12 @@ UPB_INLINE char* envoy_config_accesslog_v3_TraceableFilter_serialize_ex(const en
 /* envoy.config.accesslog.v3.RuntimeFilter */

 UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_RuntimeFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_RuntimeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__RuntimeFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_RuntimeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -911,7 +902,7 @@ UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_Ru
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_RuntimeFilter* ret = envoy_config_accesslog_v3_RuntimeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -919,13 +910,13 @@ UPB_INLINE envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_Ru
 }
 UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize(const envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_RuntimeFilter_serialize_ex(const envoy_config_accesslog_v3_RuntimeFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_RuntimeFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__RuntimeFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_clear_runtime_key(envoy_config_accesslog_v3_RuntimeFilter* msg) {
@ -977,7 +968,7 @@ UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(envo
 UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_mutable_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena) {
  struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy_type_v3_FractionalPercent_msg_init, arena);
+    sub = (struct envoy_type_v3_FractionalPercent*)_upb_Message_New(&envoy__type__v3__FractionalPercent_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(msg, sub);
  }
  return sub;
@ -990,12 +981,12 @@ UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_use_independent_rand
 /* envoy.config.accesslog.v3.AndFilter */

 UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AndFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_AndFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AndFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AndFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1005,7 +996,7 @@ UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFil
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_AndFilter* ret = envoy_config_accesslog_v3_AndFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_AndFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__AndFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1013,13 +1004,13 @@ UPB_INLINE envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AndFil
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize(const envoy_config_accesslog_v3_AndFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AndFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AndFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_AndFilter_serialize_ex(const envoy_config_accesslog_v3_AndFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_AndFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__AndFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_AndFilter_clear_filters(envoy_config_accesslog_v3_AndFilter* msg) {
@ -1081,7 +1072,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -1090,12 +1081,12 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access
 /* envoy.config.accesslog.v3.OrFilter */

 UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy_config_accesslog_v3_OrFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_OrFilter*)_upb_Message_New(&envoy__config__accesslog__v3__OrFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__OrFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1105,7 +1096,7 @@ UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilte
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_OrFilter* ret = envoy_config_accesslog_v3_OrFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_OrFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__OrFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1113,13 +1104,13 @@ UPB_INLINE envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_OrFilte
 }
 UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize(const envoy_config_accesslog_v3_OrFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_OrFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__OrFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_OrFilter_serialize_ex(const envoy_config_accesslog_v3_OrFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_OrFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__OrFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_OrFilter_clear_filters(envoy_config_accesslog_v3_OrFilter* msg) {
@ -1181,7 +1172,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy_config_accesslog_v3_AccessLogFilter_msg_init, arena);
+  struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)_upb_Message_New(&envoy__config__accesslog__v3__AccessLogFilter_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -1190,12 +1181,12 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access
 /* envoy.config.accesslog.v3.HeaderFilter */

 UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy_config_accesslog_v3_HeaderFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_HeaderFilter*)_upb_Message_New(&envoy__config__accesslog__v3__HeaderFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_HeaderFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__HeaderFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1205,7 +1196,7 @@ UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_Hea
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_HeaderFilter* ret = envoy_config_accesslog_v3_HeaderFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_HeaderFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__HeaderFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1213,13 +1204,13 @@ UPB_INLINE envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_Hea
 }
 UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize(const envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_HeaderFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__HeaderFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_HeaderFilter_serialize_ex(const envoy_config_accesslog_v3_HeaderFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_HeaderFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__HeaderFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_clear_header(envoy_config_accesslog_v3_HeaderFilter* msg) {
@ -1245,7 +1236,7 @@ UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_set_header(envoy_config_a
 UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_mutable_header(envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena) {
  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_accesslog_v3_HeaderFilter_header(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+    sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_HeaderFilter_set_header(msg, sub);
  }
  return sub;
@ -1254,12 +1245,12 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3
 /* envoy.config.accesslog.v3.ResponseFlagFilter */

 UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_ResponseFlagFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_ResponseFlagFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1269,7 +1260,7 @@ UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_ResponseFlagFilter* ret = envoy_config_accesslog_v3_ResponseFlagFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1277,13 +1268,13 @@ UPB_INLINE envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ResponseFlagFilter_serialize_ex(const envoy_config_accesslog_v3_ResponseFlagFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_ResponseFlagFilter_clear_flags(envoy_config_accesslog_v3_ResponseFlagFilter* msg) {
@ -1352,12 +1343,12 @@ UPB_INLINE bool envoy_config_accesslog_v3_ResponseFlagFilter_add_flags(envoy_con
 /* envoy.config.accesslog.v3.GrpcStatusFilter */

 UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_GrpcStatusFilter*)_upb_Message_New(&envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_GrpcStatusFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1367,7 +1358,7 @@ UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_GrpcStatusFilter* ret = envoy_config_accesslog_v3_GrpcStatusFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1375,13 +1366,13 @@ UPB_INLINE envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3
 }
 UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_GrpcStatusFilter_serialize_ex(const envoy_config_accesslog_v3_GrpcStatusFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_clear_statuses(envoy_config_accesslog_v3_GrpcStatusFilter* msg) {
@ -1465,12 +1456,12 @@ UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_set_exclude(envoy_con
 /* envoy.config.accesslog.v3.MetadataFilter */

 UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy_config_accesslog_v3_MetadataFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_MetadataFilter*)_upb_Message_New(&envoy__config__accesslog__v3__MetadataFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_MetadataFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__MetadataFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1480,7 +1471,7 @@ UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_M
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_MetadataFilter* ret = envoy_config_accesslog_v3_MetadataFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_MetadataFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__MetadataFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1488,13 +1479,13 @@ UPB_INLINE envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_M
 }
 UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize(const envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_MetadataFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__MetadataFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_MetadataFilter_serialize_ex(const envoy_config_accesslog_v3_MetadataFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_MetadataFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__MetadataFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_clear_matcher(envoy_config_accesslog_v3_MetadataFilter* msg) {
@ -1535,7 +1526,7 @@ UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_matcher(envoy_confi
 UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_mutable_matcher(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
  struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_accesslog_v3_MetadataFilter_matcher(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy_type_matcher_v3_MetadataMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_MetadataMatcher*)_upb_Message_New(&envoy__type__matcher__v3__MetadataMatcher_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_matcher(msg, sub);
  }
  return sub;
@ -1547,7 +1538,7 @@ UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_fo
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_mutable_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) {
  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(msg, sub);
  }
  return sub;
@ -1556,12 +1547,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataF
 /* envoy.config.accesslog.v3.LogTypeFilter */

 UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy_config_accesslog_v3_LogTypeFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_LogTypeFilter*)_upb_Message_New(&envoy__config__accesslog__v3__LogTypeFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_LogTypeFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1571,7 +1562,7 @@ UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_Lo
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_LogTypeFilter* ret = envoy_config_accesslog_v3_LogTypeFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1579,13 +1570,13 @@ UPB_INLINE envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_Lo
 }
 UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize(const envoy_config_accesslog_v3_LogTypeFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_LogTypeFilter_serialize_ex(const envoy_config_accesslog_v3_LogTypeFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_LogTypeFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__LogTypeFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_clear_types(envoy_config_accesslog_v3_LogTypeFilter* msg) {
@ -1669,12 +1660,12 @@ UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_set_exclude(envoy_config
 /* envoy.config.accesslog.v3.ExtensionFilter */

 UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_new(upb_Arena* arena) {
-  return (envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy_config_accesslog_v3_ExtensionFilter_msg_init, arena);
+  return (envoy_config_accesslog_v3_ExtensionFilter*)_upb_Message_New(&envoy__config__accesslog__v3__ExtensionFilter_msg_init, arena);
 }
 UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_ExtensionFilter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1684,7 +1675,7 @@ UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_
                           int options, upb_Arena* arena) {
  envoy_config_accesslog_v3_ExtensionFilter* ret = envoy_config_accesslog_v3_ExtensionFilter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1692,13 +1683,13 @@ UPB_INLINE envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize(const envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_accesslog_v3_ExtensionFilter_serialize_ex(const envoy_config_accesslog_v3_ExtensionFilter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_accesslog_v3_ExtensionFilter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__accesslog__v3__ExtensionFilter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -1747,14 +1738,12 @@ UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(envoy
 UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_mutable_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_ExtensionFilter_typed_config(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/accesslog/v3/accesslog.proto
 *
@ -8,24 +7,24 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/data/accesslog/v3/accesslog.upb.h"
-#include "envoy/type/matcher/v3/metadata.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/data/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/type/matcher/v3/metadata.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLog_submsgs[2] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] = {
@ -34,7 +33,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] =
  {4, UPB_SIZE(12, 32), UPB_SIZE(-9, -5), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = {
  &envoy_config_accesslog_v3_AccessLog_submsgs[0],
  &envoy_config_accesslog_v3_AccessLog__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0,
@ -51,19 +50,19 @@ const upb_MiniTable envoy_config_accesslog_v3_AccessLog_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = {
-  {.submsg = &envoy_config_accesslog_v3_StatusCodeFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_DurationFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_TraceableFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_RuntimeFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AndFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_OrFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_HeaderFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_ExtensionFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_MetadataFilter_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_LogTypeFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__DurationFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__TraceableFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__RuntimeFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AndFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__OrFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__HeaderFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ExtensionFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__MetadataFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__LogTypeFilter_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__fields[13] = {
@ -82,7 +81,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__field
  {13, UPB_SIZE(4, 8), -1, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = {
  &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0],
  &envoy_config_accesslog_v3_AccessLogFilter__fields[0],
  UPB_SIZE(8, 16), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
@ -107,7 +106,7 @@ const upb_MiniTable envoy_config_accesslog_v3_AccessLogFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_RuntimeUInt32_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeUInt32_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fields[2] = {
@ -115,7 +114,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fiel
  {2, 8, 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_ComparisonFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = {
  &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0],
  &envoy_config_accesslog_v3_ComparisonFilter__fields[0],
  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -128,14 +127,14 @@ const upb_MiniTable envoy_config_accesslog_v3_ComparisonFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_ComparisonFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ComparisonFilter_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_StatusCodeFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = {
  &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0],
  &envoy_config_accesslog_v3_StatusCodeFilter__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -146,14 +145,14 @@ const upb_MiniTable envoy_config_accesslog_v3_StatusCodeFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_ComparisonFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__ComparisonFilter_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_DurationFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = {
  &envoy_config_accesslog_v3_DurationFilter_submsgs[0],
  &envoy_config_accesslog_v3_DurationFilter__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -163,20 +162,20 @@ const upb_MiniTable envoy_config_accesslog_v3_DurationFilter_msg_init = {
  })
 };

-const upb_MiniTable envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init = {
  NULL,
  NULL,
  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 };

-const upb_MiniTable envoy_config_accesslog_v3_TraceableFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = {
  NULL,
  NULL,
  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[3] = {
@ -185,7 +184,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[
  {3, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_RuntimeFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = {
  &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0],
  &envoy_config_accesslog_v3_RuntimeFilter__fields[0],
  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -198,14 +197,14 @@ const upb_MiniTable envoy_config_accesslog_v3_RuntimeFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_AndFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_AndFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = {
  &envoy_config_accesslog_v3_AndFilter_submsgs[0],
  &envoy_config_accesslog_v3_AndFilter__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -216,14 +215,14 @@ const upb_MiniTable envoy_config_accesslog_v3_AndFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_OrFilter_submsgs[1] = {
-  {.submsg = &envoy_config_accesslog_v3_AccessLogFilter_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLogFilter_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] = {
  {2, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_OrFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = {
  &envoy_config_accesslog_v3_OrFilter_submsgs[0],
  &envoy_config_accesslog_v3_OrFilter__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
@ -236,14 +235,14 @@ const upb_MiniTable envoy_config_accesslog_v3_OrFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_HeaderFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = {
  &envoy_config_accesslog_v3_HeaderFilter_submsgs[0],
  &envoy_config_accesslog_v3_HeaderFilter__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -257,7 +256,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fi
  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_ResponseFlagFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init = {
  NULL,
  &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -272,7 +271,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_GrpcStatusFilter__fiel
  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_GrpcStatusFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = {
  NULL,
  &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -285,8 +284,8 @@ const upb_MiniTable envoy_config_accesslog_v3_GrpcStatusFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = {
-  {.submsg = &envoy_type_matcher_v3_MetadataMatcher_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
+  {.submsg = &envoy__type__matcher__v3__MetadataMatcher_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields[2] = {
@ -294,7 +293,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_MetadataFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = {
  &envoy_config_accesslog_v3_MetadataFilter_submsgs[0],
  &envoy_config_accesslog_v3_MetadataFilter__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -311,7 +310,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[
  {2, UPB_SIZE(4, 0), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_LogTypeFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = {
  NULL,
  &envoy_config_accesslog_v3_LogTypeFilter__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -324,7 +323,7 @@ const upb_MiniTable envoy_config_accesslog_v3_LogTypeFilter_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__fields[2] = {
@ -332,7 +331,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__field
  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_accesslog_v3_ExtensionFilter_msg_init = {
+const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = {
  &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0],
  &envoy_config_accesslog_v3_ExtensionFilter__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
@ -345,22 +344,22 @@ const upb_MiniTable envoy_config_accesslog_v3_ExtensionFilter_msg_init = {
 };

 static const upb_MiniTable *messages_layout[16] = {
-  &envoy_config_accesslog_v3_AccessLog_msg_init,
-  &envoy_config_accesslog_v3_AccessLogFilter_msg_init,
-  &envoy_config_accesslog_v3_ComparisonFilter_msg_init,
-  &envoy_config_accesslog_v3_StatusCodeFilter_msg_init,
-  &envoy_config_accesslog_v3_DurationFilter_msg_init,
-  &envoy_config_accesslog_v3_NotHealthCheckFilter_msg_init,
-  &envoy_config_accesslog_v3_TraceableFilter_msg_init,
-  &envoy_config_accesslog_v3_RuntimeFilter_msg_init,
-  &envoy_config_accesslog_v3_AndFilter_msg_init,
-  &envoy_config_accesslog_v3_OrFilter_msg_init,
-  &envoy_config_accesslog_v3_HeaderFilter_msg_init,
-  &envoy_config_accesslog_v3_ResponseFlagFilter_msg_init,
-  &envoy_config_accesslog_v3_GrpcStatusFilter_msg_init,
-  &envoy_config_accesslog_v3_MetadataFilter_msg_init,
-  &envoy_config_accesslog_v3_LogTypeFilter_msg_init,
-  &envoy_config_accesslog_v3_ExtensionFilter_msg_init,
+  &envoy__config__accesslog__v3__AccessLog_msg_init,
+  &envoy__config__accesslog__v3__AccessLogFilter_msg_init,
+  &envoy__config__accesslog__v3__ComparisonFilter_msg_init,
+  &envoy__config__accesslog__v3__StatusCodeFilter_msg_init,
+  &envoy__config__accesslog__v3__DurationFilter_msg_init,
+  &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init,
+  &envoy__config__accesslog__v3__TraceableFilter_msg_init,
+  &envoy__config__accesslog__v3__RuntimeFilter_msg_init,
+  &envoy__config__accesslog__v3__AndFilter_msg_init,
+  &envoy__config__accesslog__v3__OrFilter_msg_init,
+  &envoy__config__accesslog__v3__HeaderFilter_msg_init,
+  &envoy__config__accesslog__v3__ResponseFlagFilter_msg_init,
+  &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init,
+  &envoy__config__accesslog__v3__MetadataFilter_msg_init,
+  &envoy__config__accesslog__v3__LogTypeFilter_msg_init,
+  &envoy__config__accesslog__v3__ExtensionFilter_msg_init,
 };

 const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h
@ -0,0 +1,45 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/accesslog/v3/accesslog.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init;
+extern const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init;
+
+extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h
--- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/bootstrap/v3/bootstrap.proto
 *
@ -8,64 +7,64 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/bootstrap/v3/bootstrap.upb.h"
-#include "envoy/config/accesslog/v3/accesslog.upb.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/resolver.upb.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "envoy/config/listener/v3/listener.upb.h"
-#include "envoy/config/metrics/v3/stats.upb.h"
-#include "envoy/config/overload/v3/overload.upb.h"
-#include "envoy/config/trace/v3/http_tracer.upb.h"
-#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/bootstrap/v3/bootstrap.upb_minitable.h"
+#include "envoy/config/accesslog/v3/accesslog.upb_minitable.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "envoy/config/listener/v3/listener.upb_minitable.h"
+#include "envoy/config/metrics/v3/stats.upb_minitable.h"
+#include "envoy/config/overload/v3/overload.upb_minitable.h"
+#include "envoy/config/trace/v3/http_tracer.upb_minitable.h"
+#include "envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[28] = {
-  {.submsg = &envoy_config_core_v3_Node_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_ClusterManager_msg_init},
-  {.submsg = &envoy_config_metrics_v3_StatsSink_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
-  {.submsg = &envoy_config_trace_v3_Tracing_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Admin_msg_init},
-  {.submsg = &envoy_config_metrics_v3_StatsConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-  {.submsg = &envoy_config_overload_v3_OverloadManager_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_LayeredRuntime_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdogs_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_FatalAction_msg_init},
-  {.submsg = &envoy_config_core_v3_DnsResolutionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__Node_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__ClusterManager_msg_init},
+  {.submsg = &envoy__config__metrics__v3__StatsSink_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
+  {.submsg = &envoy__config__trace__v3__Tracing_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Admin_msg_init},
+  {.submsg = &envoy__config__metrics__v3__StatsConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__overload__v3__OverloadManager_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__LayeredRuntime_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdogs_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__FatalAction_msg_init},
+  {.submsg = &envoy__config__core__v3__DnsResolutionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[36] = {
@ -107,7 +106,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[36]
  {38, UPB_SIZE(128, 304), 22, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap__fields[0],
  UPB_SIZE(168, 312), 36, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0,
@ -148,9 +147,9 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = {
-  {.submsg = &envoy_config_listener_v3_Listener_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_msg_init},
-  {.submsg = &envoy_extensions_transport_sockets_tls_v3_Secret_msg_init},
+  {.submsg = &envoy__config__listener__v3__Listener_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster_msg_init},
+  {.submsg = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = {
@ -159,7 +158,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResour
  {3, UPB_SIZE(8, 16), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -172,9 +171,9 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = {
@ -185,7 +184,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResou
  {6, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0],
  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0,
@ -202,14 +201,14 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_ini
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = {
-  {.submsg = &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -220,7 +219,7 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[2] = {
@ -228,7 +227,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationL
  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -241,15 +240,15 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_Log
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init = {
  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0],
  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -262,9 +261,9 @@ const upb_MiniTable envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInsta
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Admin_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-  {.submsg = &envoy_config_accesslog_v3_AccessLog_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+  {.submsg = &envoy__config__accesslog__v3__AccessLog_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = {
@ -276,7 +275,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = {
  {6, UPB_SIZE(16, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Admin_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = {
  &envoy_config_bootstrap_v3_Admin_submsgs[0],
  &envoy_config_bootstrap_v3_Admin__fields[0],
  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -293,9 +292,9 @@ const upb_MiniTable envoy_config_bootstrap_v3_Admin_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = {
-  {.submsg = &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init},
-  {.submsg = &envoy_config_core_v3_BindConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init},
+  {.submsg = &envoy__config__core__v3__BindConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields[4] = {
@ -305,7 +304,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields
  {4, UPB_SIZE(12, 40), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = {
  &envoy_config_bootstrap_v3_ClusterManager_submsgs[0],
  &envoy_config_bootstrap_v3_ClusterManager__fields[0],
  UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -322,7 +321,7 @@ const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_EventServiceConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__EventServiceConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = {
@ -330,7 +329,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_Outlier
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init = {
  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0],
  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -343,8 +342,8 @@ const upb_MiniTable envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_ms
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = {
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] = {
@ -352,7 +351,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] =
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Watchdogs_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = {
  &envoy_config_bootstrap_v3_Watchdogs_submsgs[0],
  &envoy_config_bootstrap_v3_Watchdogs__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -365,13 +364,13 @@ const upb_MiniTable envoy_config_bootstrap_v3_Watchdogs_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] = {
@ -384,7 +383,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] =
  {7, UPB_SIZE(28, 56), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = {
  &envoy_config_bootstrap_v3_Watchdog_submsgs[0],
  &envoy_config_bootstrap_v3_Watchdog__fields[0],
  UPB_SIZE(32, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0,
@ -401,7 +400,7 @@ const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = {
@ -409,7 +408,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogActio
  {2, UPB_SIZE(8, 4), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init = {
  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0],
  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0],
  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -422,14 +421,14 @@ const upb_MiniTable envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init =
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_FatalAction_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_FatalAction_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = {
  &envoy_config_bootstrap_v3_FatalAction_submsgs[0],
  &envoy_config_bootstrap_v3_FatalAction__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -440,7 +439,7 @@ const upb_MiniTable envoy_config_bootstrap_v3_FatalAction_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = {
@ -450,7 +449,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = {
  {4, UPB_SIZE(4, 56), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_Runtime_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = {
  &envoy_config_bootstrap_v3_Runtime_submsgs[0],
  &envoy_config_bootstrap_v3_Runtime__fields[0],
  UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -467,10 +466,10 @@ const upb_MiniTable envoy_config_bootstrap_v3_Runtime_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init},
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = {
@ -481,7 +480,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5
  {5, UPB_SIZE(4, 24), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = {
  &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0],
  &envoy_config_bootstrap_v3_RuntimeLayer__fields[0],
  UPB_SIZE(16, 32), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -503,7 +502,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer
  {3, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init = {
  NULL,
  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -515,14 +514,14 @@ const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init =
  })
 };

-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init = {
  NULL,
  NULL,
  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = {
@ -530,7 +529,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init = {
  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0],
  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -543,14 +542,14 @@ const upb_MiniTable envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init =
 };

 static const upb_MiniTableSub envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = {
-  {.submsg = &envoy_config_bootstrap_v3_RuntimeLayer_msg_init},
+  {.submsg = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init},
 };

 static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_LayeredRuntime_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = {
  &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0],
  &envoy_config_bootstrap_v3_LayeredRuntime__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -565,7 +564,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_CustomInlineHeader__fi
  {2, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_bootstrap_v3_CustomInlineHeader_msg_init = {
+const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = {
  NULL,
  &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -578,26 +577,26 @@ const upb_MiniTable envoy_config_bootstrap_v3_CustomInlineHeader_msg_init = {
 };

 static const upb_MiniTable *messages_layout[20] = {
-  &envoy_config_bootstrap_v3_Bootstrap_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_msg_init,
-  &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msg_init,
-  &envoy_config_bootstrap_v3_Admin_msg_init,
-  &envoy_config_bootstrap_v3_ClusterManager_msg_init,
-  &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msg_init,
-  &envoy_config_bootstrap_v3_Watchdogs_msg_init,
-  &envoy_config_bootstrap_v3_Watchdog_msg_init,
-  &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msg_init,
-  &envoy_config_bootstrap_v3_FatalAction_msg_init,
-  &envoy_config_bootstrap_v3_Runtime_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msg_init,
-  &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msg_init,
-  &envoy_config_bootstrap_v3_LayeredRuntime_msg_init,
-  &envoy_config_bootstrap_v3_CustomInlineHeader_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init,
+  &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init,
+  &envoy__config__bootstrap__v3__Admin_msg_init,
+  &envoy__config__bootstrap__v3__ClusterManager_msg_init,
+  &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init,
+  &envoy__config__bootstrap__v3__Watchdogs_msg_init,
+  &envoy__config__bootstrap__v3__Watchdog_msg_init,
+  &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init,
+  &envoy__config__bootstrap__v3__FatalAction_msg_init,
+  &envoy__config__bootstrap__v3__Runtime_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init,
+  &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init,
+  &envoy__config__bootstrap__v3__LayeredRuntime_msg_init,
+  &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init,
 };

 const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h
@ -0,0 +1,49 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/bootstrap/v3/bootstrap.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init;
+extern const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init;
+
+extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/circuit_breaker.proto
 *
@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -20,25 +29,20 @@ extern "C" {
 typedef struct envoy_config_cluster_v3_CircuitBreakers envoy_config_cluster_v3_CircuitBreakers;
 typedef struct envoy_config_cluster_v3_CircuitBreakers_Thresholds envoy_config_cluster_v3_CircuitBreakers_Thresholds;
 typedef struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init;
-extern const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init;
 struct envoy_type_v3_Percent;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_type_v3_Percent_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;



 /* envoy.config.cluster.v3.CircuitBreakers */

 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_CircuitBreakers_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_CircuitBreakers_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers* ret = envoy_config_cluster_v3_CircuitBreakers_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -48,7 +52,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Circ
                           int options, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers* ret = envoy_config_cluster_v3_CircuitBreakers_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -56,13 +60,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Circ
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_serialize(const envoy_config_cluster_v3_CircuitBreakers* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_clear_thresholds(envoy_config_cluster_v3_CircuitBreakers* msg) {
@ -161,7 +165,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -187,7 +191,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -196,12 +200,12 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_conf
 /* envoy.config.cluster.v3.CircuitBreakers.Thresholds */

 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_cluster_v3_CircuitBreakers_Thresholds_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers_Thresholds* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -211,7 +215,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_clus
                           int options, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers_Thresholds* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -219,13 +223,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds* envoy_config_clus
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_clear_priority(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg) {
@ -352,7 +356,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_conne
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connections(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connections(msg, sub);
  }
  return sub;
@ -364,7 +368,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pendi
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_pending_requests(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pending_requests(msg, sub);
  }
  return sub;
@ -376,7 +380,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_reque
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_requests(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_requests(msg, sub);
  }
  return sub;
@ -388,7 +392,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retri
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_retries(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retries(msg, sub);
  }
  return sub;
@ -404,7 +408,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_conne
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connection_pools(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connection_pools(msg, sub);
  }
  return sub;
@ -416,7 +420,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_bud
 UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) {
  struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_retry_budget(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, arena);
+    sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_budget(msg, sub);
  }
  return sub;
@ -425,12 +429,12 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget
 /* envoy.config.cluster.v3.CircuitBreakers.Thresholds.RetryBudget */

 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, arena);
+  return (envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)_upb_Message_New(&envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -440,7 +444,7 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy
                           int options, upb_Arena* arena) {
  envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* ret = envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -448,13 +452,13 @@ UPB_INLINE envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_serialize(const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_serialize_ex(const envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_clear_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg) {
@ -495,7 +499,7 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_s
 UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) {
  struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_budget_percent(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy_type_v3_Percent_msg_init, arena);
+    sub = (struct envoy_type_v3_Percent*)_upb_Message_New(&envoy__type__v3__Percent_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_budget_percent(msg, sub);
  }
  return sub;
@ -507,14 +511,12 @@ UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_s
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_min_retry_concurrency(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_min_retry_concurrency(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/circuit_breaker.proto
 *
@ -8,20 +7,20 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = {
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[2] = {
@ -29,7 +28,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[
  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = {
  &envoy_config_cluster_v3_CircuitBreakers_submsgs[0],
  &envoy_config_cluster_v3_CircuitBreakers__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -42,12 +41,12 @@ const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[8] = {
@ -61,7 +60,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol
  {8, UPB_SIZE(32, 56), 6, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init = {
  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0],
  &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0],
  UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -86,8 +85,8 @@ const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[2] = {
@ -95,7 +94,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init = {
  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0],
  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -108,9 +107,9 @@ const upb_MiniTable envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudg
 };

 static const upb_MiniTable *messages_layout[3] = {
-  &envoy_config_cluster_v3_CircuitBreakers_msg_init,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_msg_init,
-  &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_msg_init,
+  &envoy__config__cluster__v3__CircuitBreakers_msg_init,
+  &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init,
+  &envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init,
 };

 const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h
@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/circuit_breaker.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/cluster.proto
 *
@ -8,43 +7,43 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/cluster.upb.h"
-#include "envoy/config/cluster/v3/circuit_breaker.upb.h"
-#include "envoy/config/cluster/v3/filter.upb.h"
-#include "envoy/config/cluster/v3/outlier_detection.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/health_check.upb.h"
-#include "envoy/config/core/v3/protocol.upb.h"
-#include "envoy/config/core/v3/resolver.upb.h"
-#include "envoy/config/endpoint/v3/endpoint.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/core/v3/collection_entry.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/security.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/cluster/v3/cluster.upb_minitable.h"
+#include "envoy/config/cluster/v3/circuit_breaker.upb_minitable.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/health_check.upb_minitable.h"
+#include "envoy/config/core/v3/protocol.upb_minitable.h"
+#include "envoy/config/core/v3/resolver.upb_minitable.h"
+#include "envoy/config/endpoint/v3/endpoint.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/collection_entry.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/security.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_cluster_v3_ClusterCollection_submsgs[1] = {
-  {.submsg = &xds_core_v3_CollectionEntry_msg_init},
+  {.submsg = &xds__core__v3__CollectionEntry_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_ClusterCollection_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = {
  &envoy_config_cluster_v3_ClusterCollection_submsgs[0],
  &envoy_config_cluster_v3_ClusterCollection__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -55,45 +54,45 @@ const upb_MiniTable envoy_config_cluster_v3_ClusterCollection_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = {
-  {.submsg = &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthCheck_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_cluster_v3_CircuitBreakers_msg_init},
-  {.submsg = &envoy_config_core_v3_Http1ProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_Http2ProtocolOptions_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_cluster_v3_OutlierDetection_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_BindConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_TransportSocket_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_HttpProtocolOptions_msg_init},
-  {.submsg = &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init},
-  {.submsg = &envoy_config_endpoint_v3_ClusterLoadAssignment_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Filter_msg_init},
-  {.submsg = &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init},
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init},
-  {.submsg = &envoy_config_core_v3_UpstreamHttpProtocolOptions_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_TrackClusterStats_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_DnsResolutionConfig_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthCheck_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__cluster__v3__CircuitBreakers_msg_init},
+  {.submsg = &envoy__config__core__v3__Http1ProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__Http2ProtocolOptions_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__cluster__v3__OutlierDetection_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__BindConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TransportSocket_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__HttpProtocolOptions_msg_init},
+  {.submsg = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init},
+  {.submsg = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Filter_msg_init},
+  {.submsg = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init},
+  {.submsg = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__TrackClusterStats_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__DnsResolutionConfig_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = {
@ -150,7 +149,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = {
  {56, UPB_SIZE(180, 336), UPB_SIZE(-173, -29), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = {
  &envoy_config_cluster_v3_Cluster_submsgs[0],
  &envoy_config_cluster_v3_Cluster__fields[0],
  UPB_SIZE(200, 344), 51, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0,
@ -191,8 +190,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_core_v3_TransportSocket_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__core__v3__TransportSocket_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[3] = {
@ -201,7 +200,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketM
  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init = {
  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0],
  &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -214,7 +213,7 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_ini
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterType__fields[2] = {
@ -222,7 +221,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterTyp
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init = {
  &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0],
  &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -235,7 +234,7 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init =
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = {
@ -243,7 +242,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -256,8 +255,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init =
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[8] = {
@ -271,7 +270,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__
  {8, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0],
  UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -302,7 +301,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig_L
  {4, UPB_SIZE(12, 4), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init = {
  NULL,
  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0],
  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -319,9 +318,9 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelec
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeDouble_msg_init},
-  {.submsg = &envoy_type_v3_Percent_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeDouble_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[3] = {
@ -330,7 +329,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig_
  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0],
  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -343,14 +342,14 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = {
-  {.submsg = &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -361,9 +360,9 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &envoy_config_core_v3_RuntimeDouble_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__RuntimeDouble_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[3] = {
@ -372,7 +371,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbCo
  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0],
  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -385,8 +384,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_ini
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[3] = {
@ -395,7 +394,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig
  {4, UPB_SIZE(12, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0,
@ -412,14 +411,14 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init =
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[1] = {
  {1, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -430,7 +429,7 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[3] = {
@ -439,7 +438,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbCon
  {3, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0],
  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -452,12 +451,12 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init},
-  {.submsg = &envoy_config_core_v3_HealthStatusSet_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__HealthStatusSet_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[8] = {
@ -471,7 +470,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__
  {8, UPB_SIZE(24, 40), 4, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0],
  UPB_SIZE(32, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -496,8 +495,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
-  {.submsg = &google_protobuf_UInt64Value_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
+  {.submsg = &google__protobuf__UInt64Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[3] = {
@ -506,7 +505,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_Z
  {3, UPB_SIZE(12, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -518,14 +517,14 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbCo
  })
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init = {
  NULL,
  NULL,
  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[2] = {
@ -533,7 +532,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_C
  {2, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init = {
  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0],
  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -546,8 +545,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHas
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fields[2] = {
@ -555,7 +554,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fie
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_RefreshRate_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = {
  &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0],
  &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -568,8 +567,8 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_RefreshRate_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = {
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = {
@ -577,7 +576,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init = {
  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0],
  &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -590,15 +589,15 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init =
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init = {
  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0],
  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -611,14 +610,14 @@ const upb_MiniTable envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOption
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = {
-  {.submsg = &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init},
+  {.submsg = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = {
  &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0],
  &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -629,14 +628,14 @@ const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[1] = {
  {4, UPB_SIZE(4, 8), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init = {
  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0],
  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0,
@ -653,7 +652,7 @@ const upb_MiniTable envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init
 };

 static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_TcpKeepalive_msg_init},
+  {.submsg = &envoy__config__core__v3__TcpKeepalive_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[2] = {
@ -661,7 +660,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOption
  {2, UPB_SIZE(8, 1), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = {
  &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0],
  &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0],
  16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -678,7 +677,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_TrackClusterStats__field
  {2, 1, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_TrackClusterStats_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = {
  NULL,
  &envoy_config_cluster_v3_TrackClusterStats__fields[0],
  8, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -691,30 +690,30 @@ const upb_MiniTable envoy_config_cluster_v3_TrackClusterStats_msg_init = {
 };

 static const upb_MiniTable *messages_layout[24] = {
-  &envoy_config_cluster_v3_ClusterCollection_msg_init,
-  &envoy_config_cluster_v3_Cluster_msg_init,
-  &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msg_init,
-  &envoy_config_cluster_v3_Cluster_CustomClusterType_msg_init,
-  &envoy_config_cluster_v3_Cluster_EdsClusterConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_msg_init,
-  &envoy_config_cluster_v3_Cluster_SlowStartConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msg_init,
-  &envoy_config_cluster_v3_Cluster_RefreshRate_msg_init,
-  &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msg_init,
-  &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msg_init,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_msg_init,
-  &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msg_init,
-  &envoy_config_cluster_v3_UpstreamConnectionOptions_msg_init,
-  &envoy_config_cluster_v3_TrackClusterStats_msg_init,
+  &envoy__config__cluster__v3__ClusterCollection_msg_init,
+  &envoy__config__cluster__v3__Cluster_msg_init,
+  &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init,
+  &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init,
+  &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init,
+  &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init,
+  &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init,
+  &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init,
+  &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init,
+  &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init,
+  &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init,
+  &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init,
+  &envoy__config__cluster__v3__TrackClusterStats_msg_init,
 };

 const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h
@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/cluster.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init;
+extern const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/filter.proto
 *
@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,21 +25,19 @@ extern "C" {
 #endif

 typedef struct envoy_config_cluster_v3_Filter envoy_config_cluster_v3_Filter;
-extern const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;



 /* envoy.config.cluster.v3.Filter */

 UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy_config_cluster_v3_Filter_msg_init, arena);
+  return (envoy_config_cluster_v3_Filter*)_upb_Message_New(&envoy__config__cluster__v3__Filter_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_cluster_v3_Filter* ret = envoy_config_cluster_v3_Filter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Filter_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +47,7 @@ UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse_
                           int options, upb_Arena* arena) {
  envoy_config_cluster_v3_Filter* ret = envoy_config_cluster_v3_Filter_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_Filter_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__Filter_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +55,13 @@ UPB_INLINE envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Filter_parse_
 }
 UPB_INLINE char* envoy_config_cluster_v3_Filter_serialize(const envoy_config_cluster_v3_Filter* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Filter_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Filter_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_Filter_serialize_ex(const envoy_config_cluster_v3_Filter* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_Filter_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__Filter_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_Filter_clear_name(envoy_config_cluster_v3_Filter* msg) {
@ -97,14 +102,12 @@ UPB_INLINE void envoy_config_cluster_v3_Filter_set_typed_config(envoy_config_clu
 UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_typed_config(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Filter_typed_config(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_config_cluster_v3_Filter_set_typed_config(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/filter.proto
 *
@ -8,17 +7,17 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/filter.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/cluster/v3/filter.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_cluster_v3_Filter_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[2] = {
@ -26,7 +25,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[2] = {
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = {
  &envoy_config_cluster_v3_Filter_submsgs[0],
  &envoy_config_cluster_v3_Filter__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -39,7 +38,7 @@ const upb_MiniTable envoy_config_cluster_v3_Filter_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_cluster_v3_Filter_msg_init,
+  &envoy__config__cluster__v3__Filter_msg_init,
 };

 const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/filter.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/outlier_detection.proto
 *
@ -10,7 +9,16 @@
 #define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,23 +26,20 @@ extern "C" {
 #endif

 typedef struct envoy_config_cluster_v3_OutlierDetection envoy_config_cluster_v3_OutlierDetection;
-extern const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;



 /* envoy.config.cluster.v3.OutlierDetection */

 UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_OutlierDetection_new(upb_Arena* arena) {
-  return (envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy_config_cluster_v3_OutlierDetection_msg_init, arena);
+  return (envoy_config_cluster_v3_OutlierDetection*)_upb_Message_New(&envoy__config__cluster__v3__OutlierDetection_msg_init, arena);
 }
 UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_OutlierDetection_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_cluster_v3_OutlierDetection* ret = envoy_config_cluster_v3_OutlierDetection_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__OutlierDetection_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -44,7 +49,7 @@ UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Out
                           int options, upb_Arena* arena) {
  envoy_config_cluster_v3_OutlierDetection* ret = envoy_config_cluster_v3_OutlierDetection_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_cluster_v3_OutlierDetection_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__cluster__v3__OutlierDetection_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -52,13 +57,13 @@ UPB_INLINE envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Out
 }
 UPB_INLINE char* envoy_config_cluster_v3_OutlierDetection_serialize(const envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_OutlierDetection_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__OutlierDetection_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_cluster_v3_OutlierDetection_serialize_ex(const envoy_config_cluster_v3_OutlierDetection* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_cluster_v3_OutlierDetection_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__cluster__v3__OutlierDetection_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg) {
@ -395,7 +400,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(env
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_5xx(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(msg, sub);
  }
  return sub;
@ -407,7 +412,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_interval(envoy_conf
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_interval(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_interval(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_interval(msg, sub);
  }
  return sub;
@ -419,7 +424,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_base_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_base_ejection_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(msg, sub);
  }
  return sub;
@ -431,7 +436,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percen
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_max_ejection_percent(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percent(msg, sub);
  }
  return sub;
@ -443,7 +448,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_5xx(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_5xx(msg, sub);
  }
  return sub;
@ -455,7 +460,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_r
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_success_rate(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_rate(msg, sub);
  }
  return sub;
@ -467,7 +472,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimu
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_minimum_hosts(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimum_hosts(msg, sub);
  }
  return sub;
@ -479,7 +484,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_reques
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_request_volume(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_request_volume(msg, sub);
  }
  return sub;
@ -491,7 +496,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_stdev_factor(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_factor(msg, sub);
  }
  return sub;
@ -503,7 +508,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_gateway_failure(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway_failure(msg, sub);
  }
  return sub;
@ -515,7 +520,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_gateway_failure(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_gateway_failure(msg, sub);
  }
  return sub;
@ -531,7 +536,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_o
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_local_origin_failure(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_origin_failure(msg, sub);
  }
  return sub;
@ -543,7 +548,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecuti
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_local_origin_failure(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_local_origin_failure(msg, sub);
  }
  return sub;
@ -555,7 +560,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_ori
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_local_origin_success_rate(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_origin_success_rate(msg, sub);
  }
  return sub;
@ -567,7 +572,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_threshold(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_threshold(msg, sub);
  }
  return sub;
@ -579,7 +584,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_p
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage(msg, sub);
  }
  return sub;
@ -591,7 +596,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_p
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage_local_origin(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage_local_origin(msg, sub);
  }
  return sub;
@ -603,7 +608,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_minimum_hosts(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_minimum_hosts(msg, sub);
  }
  return sub;
@ -615,7 +620,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_request_volume(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_request_volume(msg, sub);
  }
  return sub;
@ -627,7 +632,7 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(e
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(msg, sub);
  }
  return sub;
@ -639,14 +644,12 @@ UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_j
 UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time_jitter(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time_jitter(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_jitter(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/cluster/v3/outlier_detection.proto
 *
@ -8,38 +7,38 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/cluster/v3/outlier_detection.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[21] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
 };

 static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[22] = {
@ -67,7 +66,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields
  {22, UPB_SIZE(88, 168), 21, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init = {
+const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = {
  &envoy_config_cluster_v3_OutlierDetection_submsgs[0],
  &envoy_config_cluster_v3_OutlierDetection__fields[0],
  UPB_SIZE(96, 176), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0,
@ -108,7 +107,7 @@ const upb_MiniTable envoy_config_cluster_v3_OutlierDetection_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_cluster_v3_OutlierDetection_msg_init,
+  &envoy__config__cluster__v3__OutlierDetection_msg_init,
 };

 const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/cluster/v3/outlier_detection.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init;
+
+extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/common/matcher/v3/matcher.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/common/matcher/v3/matcher.proto
 *
@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -32,39 +41,21 @@ typedef struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet envoy_conf
 typedef struct envoy_config_common_matcher_v3_HttpHeadersMatch envoy_config_common_matcher_v3_HttpHeadersMatch;
 typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch;
 typedef struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init;
-extern const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_config_route_v3_HeaderMatcher;
 struct envoy_type_matcher_v3_StringMatcher;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_route_v3_HeaderMatcher_msg_init;
-extern const upb_MiniTable envoy_type_matcher_v3_StringMatcher_msg_init;



 /* envoy.config.common.matcher.v3.Matcher */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -74,7 +65,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher* ret = envoy_config_common_matcher_v3_Matcher_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -82,13 +73,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize(const envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -153,7 +144,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_list(envoy_co
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_mutable_matcher_list(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)envoy_config_common_matcher_v3_Matcher_matcher_list(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_list(msg, sub);
  }
  return sub;
@ -165,7 +156,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_tree(envoy_co
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_mutable_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherTree* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)envoy_config_common_matcher_v3_Matcher_matcher_tree(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_set_matcher_tree(msg, sub);
  }
  return sub;
@ -177,7 +168,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_on_no_match(envoy_con
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_mutable_on_no_match(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_on_no_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_set_on_no_match(msg, sub);
  }
  return sub;
@ -186,12 +177,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_c
 /* envoy.config.common.matcher.v3.Matcher.OnMatch */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_OnMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -201,7 +192,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_m
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_OnMatch* ret = envoy_config_common_matcher_v3_Matcher_OnMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -209,13 +200,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_m
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_OnMatch_serialize_ex(const envoy_config_common_matcher_v3_Matcher_OnMatch* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -265,7 +256,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(envoy
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher* sub = (struct envoy_config_common_matcher_v3_Matcher*)envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(msg, sub);
  }
  return sub;
@ -277,7 +268,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(envoy_
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_OnMatch_action(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(msg, sub);
  }
  return sub;
@ -286,12 +277,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common
 /* envoy.config.common.matcher.v3.Matcher.MatcherList */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_MatcherList_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -301,7 +292,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_comm
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -309,13 +300,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_comm
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_clear_matchers(envoy_config_common_matcher_v3_Matcher_MatcherList* msg) {
@ -377,7 +368,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatche
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -386,12 +377,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatche
 /* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -401,7 +392,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_c
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -409,13 +400,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_c
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -497,7 +488,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(msg, sub);
  }
  return sub;
@ -509,7 +500,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(msg, sub);
  }
  return sub;
@ -521,7 +512,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(msg, sub);
  }
  return sub;
@ -533,7 +524,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(msg, sub);
  }
  return sub;
@ -542,12 +533,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*
 /* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -557,7 +548,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePr
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -565,13 +556,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePr
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -636,7 +627,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Sin
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(msg, sub);
  }
  return sub;
@ -648,7 +639,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Sin
 UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
  struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy_type_matcher_v3_StringMatcher_msg_init, arena);
+    sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_Message_New(&envoy__type__matcher__v3__StringMatcher_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(msg, sub);
  }
  return sub;
@ -660,7 +651,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Sin
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(msg, sub);
  }
  return sub;
@ -669,12 +660,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common
 /* envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -684,7 +675,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Predicat
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -692,13 +683,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Predicat
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* msg) {
@ -760,7 +751,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
+  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -769,12 +760,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*
 /* envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -784,7 +775,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envo
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* ret = envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -792,13 +783,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* envo
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_clear_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg) {
@ -839,7 +830,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(msg, sub);
  }
  return sub;
@ -851,7 +842,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(msg, sub);
  }
  return sub;
@ -860,12 +851,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_c
 /* envoy.config.common.matcher.v3.Matcher.MatcherTree */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_MatcherTree_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -875,7 +866,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_comm
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherTree* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -883,13 +874,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_comm
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -970,7 +961,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(env
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_input(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(msg, sub);
  }
  return sub;
@ -982,7 +973,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_mat
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(msg, sub);
  }
  return sub;
@ -994,7 +985,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_ma
 UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(msg, sub);
  }
  return sub;
@ -1006,7 +997,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_ma
 UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+    sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(msg, sub);
  }
  return sub;
@ -1015,12 +1006,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common
 /* envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap */

 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, arena);
+  return (envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)_upb_Message_New(&envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1030,7 +1021,7 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_co
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* ret = envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1038,13 +1029,13 @@ UPB_INLINE envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_co
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_serialize_ex(const envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_clear_map(envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* msg) {
@ -1118,12 +1109,12 @@ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapE
 /* envoy.config.common.matcher.v3.MatchPredicate */

 UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
+  return (envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1133,7 +1124,7 @@ UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_ma
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_MatchPredicate* ret = envoy_config_common_matcher_v3_MatchPredicate_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1141,13 +1132,13 @@ UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_ma
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize(const envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -1325,7 +1316,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_or_match(envoy
 UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_or_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_or_match(msg, sub);
  }
  return sub;
@ -1337,7 +1328,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_and_match(envo
 UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_and_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_and_match(msg, sub);
  }
  return sub;
@ -1349,7 +1340,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_not_match(envo
 UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_mutable_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_common_matcher_v3_MatchPredicate_not_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_not_match(msg, sub);
  }
  return sub;
@ -1365,7 +1356,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_h
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(msg, sub);
  }
  return sub;
@ -1377,7 +1368,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_t
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(msg, sub);
  }
  return sub;
@ -1389,7 +1380,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(msg, sub);
  }
  return sub;
@ -1401,7 +1392,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(msg, sub);
  }
  return sub;
@ -1413,7 +1404,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_g
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(msg, sub);
  }
  return sub;
@ -1425,7 +1416,7 @@ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_
 UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) {
  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
+    sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
    if (sub) envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(msg, sub);
  }
  return sub;
@ -1434,12 +1425,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_con
 /* envoy.config.common.matcher.v3.MatchPredicate.MatchSet */

 UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, arena);
+  return (envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1449,7 +1440,7 @@ UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_MatchPredicate_MatchSet* ret = envoy_config_common_matcher_v3_MatchPredicate_MatchSet_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1457,13 +1448,13 @@ UPB_INLINE envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_MatchPredicate_MatchSet_serialize_ex(const envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_MatchSet_clear_rules(envoy_config_common_matcher_v3_MatchPredicate_MatchSet* msg) {
@ -1525,7 +1516,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_co
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy_config_common_matcher_v3_MatchPredicate_msg_init, arena);
+  struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)_upb_Message_New(&envoy__config__common__matcher__v3__MatchPredicate_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -1534,12 +1525,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_co
 /* envoy.config.common.matcher.v3.HttpHeadersMatch */

 UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, arena);
+  return (envoy_config_common_matcher_v3_HttpHeadersMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_HttpHeadersMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1549,7 +1540,7 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpHeadersMatch* ret = envoy_config_common_matcher_v3_HttpHeadersMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1557,13 +1548,13 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpHeadersMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpHeadersMatch* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_HttpHeadersMatch_clear_headers(envoy_config_common_matcher_v3_HttpHeadersMatch* msg) {
@ -1625,7 +1616,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_common_match
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy_config_route_v3_HeaderMatcher_msg_init, arena);
+  struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_Message_New(&envoy__config__route__v3__HeaderMatcher_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -1634,12 +1625,12 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_common_match
 /* envoy.config.common.matcher.v3.HttpGenericBodyMatch */

 UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, arena);
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1649,7 +1640,7 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_com
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpGenericBodyMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1657,13 +1648,13 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_com
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_clear_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg) {
@ -1740,7 +1731,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTex
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
+  struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -1749,12 +1740,12 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTex
 /* envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch */

 UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(upb_Arena* arena) {
-  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, arena);
+  return (envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*)_upb_Message_New(&envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, arena);
 }
 UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -1764,7 +1755,7 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*
                           int options, upb_Arena* arena) {
  envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* ret = envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -1772,13 +1763,13 @@ UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch*
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_serialize_ex(const envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -1830,8 +1821,6 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextM
  _upb_Message_SetNonExtensionField(msg, &field, &value);
 }

-extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/common/matcher/v3/matcher.proto
 *
@ -8,21 +7,21 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/common/matcher/v3/matcher.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/route/v3/route_components.upb.h"
-#include "envoy/type/matcher/v3/string.upb.h"
-#include "xds/annotations/v3/status.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/common/matcher/v3/matcher.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/route/v3/route_components.upb_minitable.h"
+#include "envoy/type/matcher/v3/string.upb_minitable.h"
+#include "xds/annotations/v3/status.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_submsgs[3] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3] = {
@ -31,7 +30,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3
  {3, 8, 1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -44,8 +43,8 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__fields[2] = {
@ -53,7 +52,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__
  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -66,14 +65,14 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -84,10 +83,10 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[4] = {
@ -97,7 +96,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
  {4, UPB_SIZE(4, 8), -1, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0],
  UPB_SIZE(8, 16), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -114,9 +113,9 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_type_matcher_v3_StringMatcher_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__type__matcher__v3__StringMatcher_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[3] = {
@ -125,7 +124,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
  {3, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0],
  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -138,14 +137,14 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -156,8 +155,8 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[2] = {
@ -165,7 +164,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -178,10 +177,10 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatc
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = {
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[4] = {
@ -191,7 +190,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr
  {4, UPB_SIZE(12, 16), UPB_SIZE(-9, -5), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0],
  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -208,29 +207,29 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = {
  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0],
  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -243,15 +242,15 @@ const upb_MiniTable envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = {
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init},
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__fields[10] = {
@ -267,7 +266,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__f
  {10, UPB_SIZE(4, 8), -1, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init = {
  &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0],
  &envoy_config_common_matcher_v3_MatchPredicate__fields[0],
  UPB_SIZE(8, 16), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
@ -292,14 +291,14 @@ const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_MatchPredicate_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__MatchPredicate_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init = {
  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0],
  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -310,14 +309,14 @@ const upb_MiniTable envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_i
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = {
-  {.submsg = &envoy_config_route_v3_HeaderMatcher_msg_init},
+  {.submsg = &envoy__config__route__v3__HeaderMatcher_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init = {
  &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0],
  &envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -328,7 +327,7 @@ const upb_MiniTable envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = {
-  {.submsg = &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init},
+  {.submsg = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init},
 };

 static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[2] = {
@ -336,7 +335,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMa
  {2, UPB_SIZE(4, 8), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init = {
  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0],
  &envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -353,7 +352,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMa
  {2, UPB_SIZE(4, 8), -1, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init = {
+const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init = {
  NULL,
  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -366,21 +365,21 @@ const upb_MiniTable envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericT
 };

 static const upb_MiniTable *messages_layout[15] = {
-  &envoy_config_common_matcher_v3_Matcher_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_OnMatch_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_msg_init,
-  &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_msg_init,
-  &envoy_config_common_matcher_v3_MatchPredicate_msg_init,
-  &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_msg_init,
-  &envoy_config_common_matcher_v3_HttpHeadersMatch_msg_init,
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_msg_init,
-  &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_msg_init,
+  &envoy__config__common__matcher__v3__Matcher_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init,
+  &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init,
+  &envoy__config__common__matcher__v3__MatchPredicate_msg_init,
+  &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init,
+  &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init,
+  &envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init,
+  &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init,
 };

 const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h
@ -0,0 +1,44 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/common/matcher/v3/matcher.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init;
+extern const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init;
+
+extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/address.proto
 *
@ -10,7 +9,17 @@
 #define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/address.upb_minitable.h"
+
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -25,22 +34,10 @@ typedef struct envoy_config_core_v3_ExtraSourceAddress envoy_config_core_v3_Extr
 typedef struct envoy_config_core_v3_BindConfig envoy_config_core_v3_BindConfig;
 typedef struct envoy_config_core_v3_Address envoy_config_core_v3_Address;
 typedef struct envoy_config_core_v3_CidrRange envoy_config_core_v3_CidrRange;
-extern const upb_MiniTable envoy_config_core_v3_Pipe_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_EnvoyInternalAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtraSourceAddress_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_Address_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init;
 struct envoy_config_core_v3_SocketOption;
 struct envoy_config_core_v3_SocketOptionsOverride;
 struct google_protobuf_BoolValue;
 struct google_protobuf_UInt32Value;
-extern const upb_MiniTable envoy_config_core_v3_SocketOption_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SocketOptionsOverride_msg_init;
-extern const upb_MiniTable google_protobuf_BoolValue_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;

 typedef enum {
  envoy_config_core_v3_SocketAddress_TCP = 0,
@ -52,12 +49,12 @@ typedef enum {
 /* envoy.config.core.v3.Pipe */

 UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy_config_core_v3_Pipe_msg_init, arena);
+  return (envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy__config__core__v3__Pipe_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_Pipe* ret = envoy_config_core_v3_Pipe_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Pipe_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Pipe_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -67,7 +64,7 @@ UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse_ex(const c
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_Pipe* ret = envoy_config_core_v3_Pipe_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Pipe_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Pipe_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -75,13 +72,13 @@ UPB_INLINE envoy_config_core_v3_Pipe* envoy_config_core_v3_Pipe_parse_ex(const c
 }
 UPB_INLINE char* envoy_config_core_v3_Pipe_serialize(const envoy_config_core_v3_Pipe* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Pipe_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Pipe_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Pipe_serialize_ex(const envoy_config_core_v3_Pipe* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Pipe_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Pipe_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_Pipe_clear_path(envoy_config_core_v3_Pipe* msg) {
@ -119,12 +116,12 @@ UPB_INLINE void envoy_config_core_v3_Pipe_set_mode(envoy_config_core_v3_Pipe *ms
 /* envoy.config.core.v3.EnvoyInternalAddress */

 UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_EnvoyInternalAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy_config_core_v3_EnvoyInternalAddress_msg_init, arena);
+  return (envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy__config__core__v3__EnvoyInternalAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_EnvoyInternalAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_EnvoyInternalAddress* ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -134,7 +131,7 @@ UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Envoy
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_EnvoyInternalAddress* ret = envoy_config_core_v3_EnvoyInternalAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -142,13 +139,13 @@ UPB_INLINE envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Envoy
 }
 UPB_INLINE char* envoy_config_core_v3_EnvoyInternalAddress_serialize(const envoy_config_core_v3_EnvoyInternalAddress* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_EnvoyInternalAddress_serialize_ex(const envoy_config_core_v3_EnvoyInternalAddress* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EnvoyInternalAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EnvoyInternalAddress_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -198,12 +195,12 @@ UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_endpoint_id(envoy_
 /* envoy.config.core.v3.SocketAddress */

 UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+  return (envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_SocketAddress* ret = envoy_config_core_v3_SocketAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -213,7 +210,7 @@ UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddres
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_SocketAddress* ret = envoy_config_core_v3_SocketAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SocketAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SocketAddress_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -221,13 +218,13 @@ UPB_INLINE envoy_config_core_v3_SocketAddress* envoy_config_core_v3_SocketAddres
 }
 UPB_INLINE char* envoy_config_core_v3_SocketAddress_serialize(const envoy_config_core_v3_SocketAddress* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketAddress_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SocketAddress_serialize_ex(const envoy_config_core_v3_SocketAddress* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SocketAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SocketAddress_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -342,12 +339,12 @@ UPB_INLINE void envoy_config_core_v3_SocketAddress_set_ipv4_compat(envoy_config_
 /* envoy.config.core.v3.TcpKeepalive */

 UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy_config_core_v3_TcpKeepalive_msg_init, arena);
+  return (envoy_config_core_v3_TcpKeepalive*)_upb_Message_New(&envoy__config__core__v3__TcpKeepalive_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_TcpKeepalive* ret = envoy_config_core_v3_TcpKeepalive_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpKeepalive_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -357,7 +354,7 @@ UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_TcpKeepalive* ret = envoy_config_core_v3_TcpKeepalive_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TcpKeepalive_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TcpKeepalive_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -365,13 +362,13 @@ UPB_INLINE envoy_config_core_v3_TcpKeepalive* envoy_config_core_v3_TcpKeepalive_
 }
 UPB_INLINE char* envoy_config_core_v3_TcpKeepalive_serialize(const envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpKeepalive_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpKeepalive_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_TcpKeepalive_serialize_ex(const envoy_config_core_v3_TcpKeepalive* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TcpKeepalive_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TcpKeepalive_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_TcpKeepalive_clear_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg) {
@ -427,7 +424,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(envoy_con
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_probes(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(msg, sub);
  }
  return sub;
@ -439,7 +436,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_time(envoy_confi
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_time(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_time(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_time(msg, sub);
  }
  return sub;
@ -451,7 +448,7 @@ UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(envoy_c
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_interval(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_interval(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(msg, sub);
  }
  return sub;
@ -460,12 +457,12 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive
 /* envoy.config.core.v3.ExtraSourceAddress */

 UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSourceAddress_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy_config_core_v3_ExtraSourceAddress_msg_init, arena);
+  return (envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy__config__core__v3__ExtraSourceAddress_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSourceAddress_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_ExtraSourceAddress* ret = envoy_config_core_v3_ExtraSourceAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtraSourceAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtraSourceAddress_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -475,7 +472,7 @@ UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSo
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_ExtraSourceAddress* ret = envoy_config_core_v3_ExtraSourceAddress_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtraSourceAddress_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtraSourceAddress_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -483,13 +480,13 @@ UPB_INLINE envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ExtraSo
 }
 UPB_INLINE char* envoy_config_core_v3_ExtraSourceAddress_serialize(const envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtraSourceAddress_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtraSourceAddress_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ExtraSourceAddress_serialize_ex(const envoy_config_core_v3_ExtraSourceAddress* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtraSourceAddress_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtraSourceAddress_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_clear_address(envoy_config_core_v3_ExtraSourceAddress* msg) {
@ -530,7 +527,7 @@ UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_address(envoy_config
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_ExtraSourceAddress_mutable_address(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_ExtraSourceAddress_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
    if (sub) envoy_config_core_v3_ExtraSourceAddress_set_address(msg, sub);
  }
  return sub;
@ -542,7 +539,7 @@ UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_socket_options(envoy
 UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_ExtraSourceAddress_mutable_socket_options(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_core_v3_ExtraSourceAddress_socket_options(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy_config_core_v3_SocketOptionsOverride_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketOptionsOverride*)_upb_Message_New(&envoy__config__core__v3__SocketOptionsOverride_msg_init, arena);
    if (sub) envoy_config_core_v3_ExtraSourceAddress_set_socket_options(msg, sub);
  }
  return sub;
@ -551,12 +548,12 @@ UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_
 /* envoy.config.core.v3.BindConfig */

 UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy_config_core_v3_BindConfig_msg_init, arena);
+  return (envoy_config_core_v3_BindConfig*)_upb_Message_New(&envoy__config__core__v3__BindConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_BindConfig* ret = envoy_config_core_v3_BindConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BindConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -566,7 +563,7 @@ UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_pars
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_BindConfig* ret = envoy_config_core_v3_BindConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BindConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BindConfig_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -574,13 +571,13 @@ UPB_INLINE envoy_config_core_v3_BindConfig* envoy_config_core_v3_BindConfig_pars
 }
 UPB_INLINE char* envoy_config_core_v3_BindConfig_serialize(const envoy_config_core_v3_BindConfig* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BindConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BindConfig_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_BindConfig_serialize_ex(const envoy_config_core_v3_BindConfig* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BindConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BindConfig_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_BindConfig_clear_source_address(envoy_config_core_v3_BindConfig* msg) {
@ -732,7 +729,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_set_source_address(envoy_config_
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindConfig_mutable_source_address(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_BindConfig_source_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
    if (sub) envoy_config_core_v3_BindConfig_set_source_address(msg, sub);
  }
  return sub;
@ -744,7 +741,7 @@ UPB_INLINE void envoy_config_core_v3_BindConfig_set_freebind(envoy_config_core_v
 UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_BindConfig_mutable_freebind(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) {
  struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_BindConfig_freebind(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google_protobuf_BoolValue_msg_init, arena);
+    sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena);
    if (sub) envoy_config_core_v3_BindConfig_set_freebind(msg, sub);
  }
  return sub;
@ -770,7 +767,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_BindCo
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy_config_core_v3_SocketOption_msg_init, arena);
+  struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_Message_New(&envoy__config__core__v3__SocketOption_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -796,7 +793,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindC
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -822,7 +819,7 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_ExtraSourceAddress* sub = (struct envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy_config_core_v3_ExtraSourceAddress_msg_init, arena);
+  struct envoy_config_core_v3_ExtraSourceAddress* sub = (struct envoy_config_core_v3_ExtraSourceAddress*)_upb_Message_New(&envoy__config__core__v3__ExtraSourceAddress_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -831,12 +828,12 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_
 /* envoy.config.core.v3.Address */

 UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_Address*)_upb_Message_New(&envoy_config_core_v3_Address_msg_init, arena);
+  return (envoy_config_core_v3_Address*)_upb_Message_New(&envoy__config__core__v3__Address_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_Address* ret = envoy_config_core_v3_Address_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Address_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Address_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -846,7 +843,7 @@ UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse_ex(c
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_Address* ret = envoy_config_core_v3_Address_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_Address_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__Address_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -854,13 +851,13 @@ UPB_INLINE envoy_config_core_v3_Address* envoy_config_core_v3_Address_parse_ex(c
 }
 UPB_INLINE char* envoy_config_core_v3_Address_serialize(const envoy_config_core_v3_Address* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Address_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Address_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_Address_serialize_ex(const envoy_config_core_v3_Address* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_Address_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__Address_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -926,7 +923,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_socket_address(envoy_config_cor
 UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Address_mutable_socket_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_Address_socket_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy_config_core_v3_SocketAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SocketAddress*)_upb_Message_New(&envoy__config__core__v3__SocketAddress_msg_init, arena);
    if (sub) envoy_config_core_v3_Address_set_socket_address(msg, sub);
  }
  return sub;
@ -938,7 +935,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_pipe(envoy_config_core_v3_Addre
 UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutable_pipe(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_Pipe* sub = (struct envoy_config_core_v3_Pipe*)envoy_config_core_v3_Address_pipe(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy_config_core_v3_Pipe_msg_init, arena);
+    sub = (struct envoy_config_core_v3_Pipe*)_upb_Message_New(&envoy__config__core__v3__Pipe_msg_init, arena);
    if (sub) envoy_config_core_v3_Address_set_pipe(msg, sub);
  }
  return sub;
@ -950,7 +947,7 @@ UPB_INLINE void envoy_config_core_v3_Address_set_envoy_internal_address(envoy_co
 UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Address_mutable_envoy_internal_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_EnvoyInternalAddress* sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)envoy_config_core_v3_Address_envoy_internal_address(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy_config_core_v3_EnvoyInternalAddress_msg_init, arena);
+    sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)_upb_Message_New(&envoy__config__core__v3__EnvoyInternalAddress_msg_init, arena);
    if (sub) envoy_config_core_v3_Address_set_envoy_internal_address(msg, sub);
  }
  return sub;
@ -959,12 +956,12 @@ UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v
 /* envoy.config.core.v3.CidrRange */

 UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy_config_core_v3_CidrRange_msg_init, arena);
+  return (envoy_config_core_v3_CidrRange*)_upb_Message_New(&envoy__config__core__v3__CidrRange_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_CidrRange* ret = envoy_config_core_v3_CidrRange_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__CidrRange_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -974,7 +971,7 @@ UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse_
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_CidrRange* ret = envoy_config_core_v3_CidrRange_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_CidrRange_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__CidrRange_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -982,13 +979,13 @@ UPB_INLINE envoy_config_core_v3_CidrRange* envoy_config_core_v3_CidrRange_parse_
 }
 UPB_INLINE char* envoy_config_core_v3_CidrRange_serialize(const envoy_config_core_v3_CidrRange* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_CidrRange_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__CidrRange_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_CidrRange_serialize_ex(const envoy_config_core_v3_CidrRange* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_CidrRange_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__CidrRange_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_CidrRange_clear_address_prefix(envoy_config_core_v3_CidrRange* msg) {
@ -1029,14 +1026,12 @@ UPB_INLINE void envoy_config_core_v3_CidrRange_set_prefix_len(envoy_config_core_
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mutable_prefix_len(envoy_config_core_v3_CidrRange* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_CidrRange_prefix_len(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_core_v3_CidrRange_set_prefix_len(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/address.proto
 *
@ -8,13 +7,13 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/socket_option.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/socket_option.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -24,7 +23,7 @@ static const upb_MiniTableField envoy_config_core_v3_Pipe__fields[2] = {
  {2, 0, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Pipe_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Pipe_msg_init = {
  NULL,
  &envoy_config_core_v3_Pipe__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -41,7 +40,7 @@ static const upb_MiniTableField envoy_config_core_v3_EnvoyInternalAddress__field
  {2, UPB_SIZE(12, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_EnvoyInternalAddress_msg_init = {
+const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init = {
  NULL,
  &envoy_config_core_v3_EnvoyInternalAddress__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -62,7 +61,7 @@ static const upb_MiniTableField envoy_config_core_v3_SocketAddress__fields[6] =
  {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init = {
+const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = {
  NULL,
  &envoy_config_core_v3_SocketAddress__fields[0],
  UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -79,9 +78,9 @@ const upb_MiniTable envoy_config_core_v3_SocketAddress_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_TcpKeepalive_submsgs[3] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = {
@ -90,7 +89,7 @@ static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = {
  {3, UPB_SIZE(12, 24), 3, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init = {
+const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = {
  &envoy_config_core_v3_TcpKeepalive_submsgs[0],
  &envoy_config_core_v3_TcpKeepalive__fields[0],
  UPB_SIZE(16, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -103,8 +102,8 @@ const upb_MiniTable envoy_config_core_v3_TcpKeepalive_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOptionsOverride_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOptionsOverride_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[2] = {
@ -112,7 +111,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_ExtraSourceAddress_msg_init = {
+const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = {
  &envoy_config_core_v3_ExtraSourceAddress_submsgs[0],
  &envoy_config_core_v3_ExtraSourceAddress__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -125,11 +124,11 @@ const upb_MiniTable envoy_config_core_v3_ExtraSourceAddress_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[5] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketOption_msg_init},
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_ExtraSourceAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketOption_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__ExtraSourceAddress_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[5] = {
@ -140,7 +139,7 @@ static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[5] = {
  {5, UPB_SIZE(20, 40), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init = {
+const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = {
  &envoy_config_core_v3_BindConfig_submsgs[0],
  &envoy_config_core_v3_BindConfig__fields[0],
  UPB_SIZE(24, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
@ -157,9 +156,9 @@ const upb_MiniTable envoy_config_core_v3_BindConfig_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_Address_submsgs[3] = {
-  {.submsg = &envoy_config_core_v3_SocketAddress_msg_init},
-  {.submsg = &envoy_config_core_v3_Pipe_msg_init},
-  {.submsg = &envoy_config_core_v3_EnvoyInternalAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__SocketAddress_msg_init},
+  {.submsg = &envoy__config__core__v3__Pipe_msg_init},
+  {.submsg = &envoy__config__core__v3__EnvoyInternalAddress_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = {
@ -168,7 +167,7 @@ static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = {
  {3, UPB_SIZE(4, 8), -1, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Address_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Address_msg_init = {
  &envoy_config_core_v3_Address_submsgs[0],
  &envoy_config_core_v3_Address__fields[0],
  UPB_SIZE(8, 16), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -181,7 +180,7 @@ const upb_MiniTable envoy_config_core_v3_Address_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_CidrRange_submsgs[1] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = {
@ -189,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = {
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init = {
+const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = {
  &envoy_config_core_v3_CidrRange_submsgs[0],
  &envoy_config_core_v3_CidrRange__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -202,14 +201,14 @@ const upb_MiniTable envoy_config_core_v3_CidrRange_msg_init = {
 };

 static const upb_MiniTable *messages_layout[8] = {
-  &envoy_config_core_v3_Pipe_msg_init,
-  &envoy_config_core_v3_EnvoyInternalAddress_msg_init,
-  &envoy_config_core_v3_SocketAddress_msg_init,
-  &envoy_config_core_v3_TcpKeepalive_msg_init,
-  &envoy_config_core_v3_ExtraSourceAddress_msg_init,
-  &envoy_config_core_v3_BindConfig_msg_init,
-  &envoy_config_core_v3_Address_msg_init,
-  &envoy_config_core_v3_CidrRange_msg_init,
+  &envoy__config__core__v3__Pipe_msg_init,
+  &envoy__config__core__v3__EnvoyInternalAddress_msg_init,
+  &envoy__config__core__v3__SocketAddress_msg_init,
+  &envoy__config__core__v3__TcpKeepalive_msg_init,
+  &envoy__config__core__v3__ExtraSourceAddress_msg_init,
+  &envoy__config__core__v3__BindConfig_msg_init,
+  &envoy__config__core__v3__Address_msg_init,
+  &envoy__config__core__v3__CidrRange_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h
@ -0,0 +1,37 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/address.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__Pipe_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Address_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/backoff.proto
 *
@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,21 +25,19 @@ extern "C" {
 #endif

 typedef struct envoy_config_core_v3_BackoffStrategy envoy_config_core_v3_BackoffStrategy;
-extern const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init;
 struct google_protobuf_Duration;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;



 /* envoy.config.core.v3.BackoffStrategy */

 UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStrategy_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy_config_core_v3_BackoffStrategy_msg_init, arena);
+  return (envoy_config_core_v3_BackoffStrategy*)_upb_Message_New(&envoy__config__core__v3__BackoffStrategy_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStrategy_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_BackoffStrategy* ret = envoy_config_core_v3_BackoffStrategy_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BackoffStrategy_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStr
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_BackoffStrategy* ret = envoy_config_core_v3_BackoffStrategy_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_BackoffStrategy_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__BackoffStrategy_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_BackoffStr
 }
 UPB_INLINE char* envoy_config_core_v3_BackoffStrategy_serialize(const envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BackoffStrategy_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BackoffStrategy_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_BackoffStrategy_serialize_ex(const envoy_config_core_v3_BackoffStrategy* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_BackoffStrategy_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__BackoffStrategy_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_BackoffStrategy_clear_base_interval(envoy_config_core_v3_BackoffStrategy* msg) {
@ -97,7 +102,7 @@ UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_base_interval(envoy_con
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_base_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_base_interval(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_core_v3_BackoffStrategy_set_base_interval(msg, sub);
  }
  return sub;
@ -109,14 +114,12 @@ UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_max_interval(envoy_conf
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_max_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_max_interval(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_core_v3_BackoffStrategy_set_max_interval(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/backoff.proto
 *
@ -8,18 +7,18 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/backoff.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_core_v3_BackoffStrategy_submsgs[2] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2] = {
@ -27,7 +26,7 @@ static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2]
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init = {
+const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = {
  &envoy_config_core_v3_BackoffStrategy_submsgs[0],
  &envoy_config_core_v3_BackoffStrategy__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -40,7 +39,7 @@ const upb_MiniTable envoy_config_core_v3_BackoffStrategy_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_BackoffStrategy_msg_init,
+  &envoy__config__core__v3__BackoffStrategy_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/backoff.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
--- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/base.proto
 *
@ -8,21 +7,21 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/address.upb.h"
-#include "envoy/config/core/v3/backoff.upb.h"
-#include "envoy/config/core/v3/http_uri.upb.h"
-#include "envoy/type/v3/percent.upb.h"
-#include "envoy/type/v3/semantic_version.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/struct.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/core/v3/context_params.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/migrate.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/address.upb_minitable.h"
+#include "envoy/config/core/v3/backoff.upb_minitable.h"
+#include "envoy/config/core/v3/http_uri.upb_minitable.h"
+#include "envoy/type/v3/percent.upb_minitable.h"
+#include "envoy/type/v3/semantic_version.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/struct.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/context_params.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/migrate.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"
@ -33,7 +32,7 @@ static const upb_MiniTableField envoy_config_core_v3_Locality__fields[3] = {
  {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Locality_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Locality_msg_init = {
  NULL,
  &envoy_config_core_v3_Locality__fields[0],
  UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -46,8 +45,8 @@ const upb_MiniTable envoy_config_core_v3_Locality_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_BuildVersion_submsgs[2] = {
-  {.submsg = &envoy_type_v3_SemanticVersion_msg_init},
-  {.submsg = &google_protobuf_Struct_msg_init},
+  {.submsg = &envoy__type__v3__SemanticVersion_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = {
@ -55,7 +54,7 @@ static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = {
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_BuildVersion_msg_init = {
+const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = {
  &envoy_config_core_v3_BuildVersion_submsgs[0],
  &envoy_config_core_v3_BuildVersion__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -68,7 +67,7 @@ const upb_MiniTable envoy_config_core_v3_BuildVersion_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_BuildVersion_msg_init},
+  {.submsg = &envoy__config__core__v3__BuildVersion_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = {
@ -80,7 +79,7 @@ static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = {
  {6, UPB_SIZE(12, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Extension_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Extension_msg_init = {
  &envoy_config_core_v3_Extension_submsgs[0],
  &envoy_config_core_v3_Extension__fields[0],
  UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
@ -97,12 +96,12 @@ const upb_MiniTable envoy_config_core_v3_Extension_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_Node_submsgs[6] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
-  {.submsg = &envoy_config_core_v3_Locality_msg_init},
-  {.submsg = &envoy_config_core_v3_BuildVersion_msg_init},
-  {.submsg = &envoy_config_core_v3_Extension_msg_init},
-  {.submsg = &envoy_config_core_v3_Address_msg_init},
-  {.submsg = &envoy_config_core_v3_Node_DynamicParametersEntry_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
+  {.submsg = &envoy__config__core__v3__Locality_msg_init},
+  {.submsg = &envoy__config__core__v3__BuildVersion_msg_init},
+  {.submsg = &envoy__config__core__v3__Extension_msg_init},
+  {.submsg = &envoy__config__core__v3__Address_msg_init},
+  {.submsg = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = {
@ -119,7 +118,7 @@ static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = {
  {12, UPB_SIZE(28, 112), 0, 5, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Node_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Node_msg_init = {
  &envoy_config_core_v3_Node_submsgs[0],
  &envoy_config_core_v3_Node__fields[0],
  UPB_SIZE(64, 120), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0,
@ -144,15 +143,15 @@ const upb_MiniTable envoy_config_core_v3_Node_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = {
-  {.submsg = &xds_core_v3_ContextParams_msg_init},
+  {.submsg = &xds__core__v3__ContextParams_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Node_DynamicParametersEntry_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init = {
  &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0],
  &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -165,8 +164,8 @@ const upb_MiniTable envoy_config_core_v3_Node_DynamicParametersEntry_msg_init =
 };

 static const upb_MiniTableSub envoy_config_core_v3_Metadata_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init},
-  {.submsg = &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init},
+  {.submsg = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = {
@ -174,22 +173,22 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = {
  {2, UPB_SIZE(4, 8), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Metadata_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = {
  &envoy_config_core_v3_Metadata_submsgs[0],
  &envoy_config_core_v3_Metadata__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0,
 };

 static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Struct_msg_init},
+  {.submsg = &google__protobuf__Struct_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init = {
  &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0],
  &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -202,15 +201,15 @@ const upb_MiniTable envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init =
 };

 static const upb_MiniTableSub envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[2] = {
-  {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
+  {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
  {2, UPB_SIZE(16, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init = {
+const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init = {
  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0],
  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0],
  UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -227,7 +226,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeUInt32__fields[2] =
  {3, UPB_SIZE(4, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = {
  NULL,
  &envoy_config_core_v3_RuntimeUInt32__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0,
@ -240,7 +239,7 @@ const upb_MiniTable envoy_config_core_v3_RuntimeUInt32_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RuntimePercent_submsgs[1] = {
-  {.submsg = &envoy_type_v3_Percent_msg_init},
+  {.submsg = &envoy__type__v3__Percent_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] = {
@ -248,7 +247,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] =
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RuntimePercent_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = {
  &envoy_config_core_v3_RuntimePercent_submsgs[0],
  &envoy_config_core_v3_RuntimePercent__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -265,7 +264,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeDouble__fields[2] =
  {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = {
  NULL,
  &envoy_config_core_v3_RuntimeDouble__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -278,7 +277,7 @@ const upb_MiniTable envoy_config_core_v3_RuntimeDouble_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = {
-  {.submsg = &google_protobuf_BoolValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[2] = {
@ -286,7 +285,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RuntimeFeatureFlag_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = {
  &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0],
  &envoy_config_core_v3_RuntimeFeatureFlag__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -303,7 +302,7 @@ static const upb_MiniTableField envoy_config_core_v3_QueryParameter__fields[2] =
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_QueryParameter_msg_init = {
+const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init = {
  NULL,
  &envoy_config_core_v3_QueryParameter__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -320,7 +319,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderValue__fields[2] = {
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_HeaderValue_msg_init = {
+const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = {
  NULL,
  &envoy_config_core_v3_HeaderValue__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -333,8 +332,8 @@ const upb_MiniTable envoy_config_core_v3_HeaderValue_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_HeaderValueOption_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_HeaderValue_msg_init},
-  {.submsg = &google_protobuf_BoolValue_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValue_msg_init},
+  {.submsg = &google__protobuf__BoolValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4] = {
@ -344,7 +343,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4
  {4, UPB_SIZE(16, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init = {
+const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = {
  &envoy_config_core_v3_HeaderValueOption_submsgs[0],
  &envoy_config_core_v3_HeaderValueOption__fields[0],
  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -361,14 +360,14 @@ const upb_MiniTable envoy_config_core_v3_HeaderValueOption_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_HeaderMap_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_HeaderValue_msg_init},
+  {.submsg = &envoy__config__core__v3__HeaderValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = {
  {1, 0, 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_HeaderMap_msg_init = {
+const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = {
  &envoy_config_core_v3_HeaderMap_submsgs[0],
  &envoy_config_core_v3_HeaderMap__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -382,7 +381,7 @@ static const upb_MiniTableField envoy_config_core_v3_WatchedDirectory__fields[1]
  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init = {
+const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = {
  NULL,
  &envoy_config_core_v3_WatchedDirectory__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -399,7 +398,7 @@ static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[4] = {
  {4, UPB_SIZE(4, 8), -1, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_DataSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = {
  NULL,
  &envoy_config_core_v3_DataSource__fields[0],
  UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -416,8 +415,8 @@ const upb_MiniTable envoy_config_core_v3_DataSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_BackoffStrategy_msg_init},
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
+  {.submsg = &envoy__config__core__v3__BackoffStrategy_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = {
@ -425,7 +424,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = {
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RetryPolicy_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = {
  &envoy_config_core_v3_RetryPolicy_submsgs[0],
  &envoy_config_core_v3_RetryPolicy__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -438,8 +437,8 @@ const upb_MiniTable envoy_config_core_v3_RetryPolicy_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_HttpUri_msg_init},
-  {.submsg = &envoy_config_core_v3_RetryPolicy_msg_init},
+  {.submsg = &envoy__config__core__v3__HttpUri_msg_init},
+  {.submsg = &envoy__config__core__v3__RetryPolicy_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3] = {
@ -448,7 +447,7 @@ static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3]
  {3, UPB_SIZE(8, 32), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RemoteDataSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = {
  &envoy_config_core_v3_RemoteDataSource_submsgs[0],
  &envoy_config_core_v3_RemoteDataSource__fields[0],
  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
@ -461,8 +460,8 @@ const upb_MiniTable envoy_config_core_v3_RemoteDataSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_AsyncDataSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_DataSource_msg_init},
-  {.submsg = &envoy_config_core_v3_RemoteDataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__DataSource_msg_init},
+  {.submsg = &envoy__config__core__v3__RemoteDataSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2] = {
@ -470,7 +469,7 @@ static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2]
  {2, UPB_SIZE(4, 8), -1, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_AsyncDataSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = {
  &envoy_config_core_v3_AsyncDataSource_submsgs[0],
  &envoy_config_core_v3_AsyncDataSource__fields[0],
  UPB_SIZE(8, 16), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -483,7 +482,7 @@ const upb_MiniTable envoy_config_core_v3_AsyncDataSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_TransportSocket_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2] = {
@ -491,7 +490,7 @@ static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2]
  {3, UPB_SIZE(4, 24), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init = {
+const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = {
  &envoy_config_core_v3_TransportSocket_submsgs[0],
  &envoy_config_core_v3_TransportSocket__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0,
@ -504,7 +503,7 @@ const upb_MiniTable envoy_config_core_v3_TransportSocket_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = {
-  {.submsg = &envoy_type_v3_FractionalPercent_msg_init},
+  {.submsg = &envoy__type__v3__FractionalPercent_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__fields[2] = {
@ -512,7 +511,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__f
  {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RuntimeFractionalPercent_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = {
  &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0],
  &envoy_config_core_v3_RuntimeFractionalPercent__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -528,7 +527,7 @@ static const upb_MiniTableField envoy_config_core_v3_ControlPlane__fields[1] = {
  {1, 0, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_ControlPlane_msg_init = {
+const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init = {
  NULL,
  &envoy_config_core_v3_ControlPlane__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -539,30 +538,30 @@ const upb_MiniTable envoy_config_core_v3_ControlPlane_msg_init = {
 };

 static const upb_MiniTable *messages_layout[24] = {
-  &envoy_config_core_v3_Locality_msg_init,
-  &envoy_config_core_v3_BuildVersion_msg_init,
-  &envoy_config_core_v3_Extension_msg_init,
-  &envoy_config_core_v3_Node_msg_init,
-  &envoy_config_core_v3_Node_DynamicParametersEntry_msg_init,
-  &envoy_config_core_v3_Metadata_msg_init,
-  &envoy_config_core_v3_Metadata_FilterMetadataEntry_msg_init,
-  &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_msg_init,
-  &envoy_config_core_v3_RuntimeUInt32_msg_init,
-  &envoy_config_core_v3_RuntimePercent_msg_init,
-  &envoy_config_core_v3_RuntimeDouble_msg_init,
-  &envoy_config_core_v3_RuntimeFeatureFlag_msg_init,
-  &envoy_config_core_v3_QueryParameter_msg_init,
-  &envoy_config_core_v3_HeaderValue_msg_init,
-  &envoy_config_core_v3_HeaderValueOption_msg_init,
-  &envoy_config_core_v3_HeaderMap_msg_init,
-  &envoy_config_core_v3_WatchedDirectory_msg_init,
-  &envoy_config_core_v3_DataSource_msg_init,
-  &envoy_config_core_v3_RetryPolicy_msg_init,
-  &envoy_config_core_v3_RemoteDataSource_msg_init,
-  &envoy_config_core_v3_AsyncDataSource_msg_init,
-  &envoy_config_core_v3_TransportSocket_msg_init,
-  &envoy_config_core_v3_RuntimeFractionalPercent_msg_init,
-  &envoy_config_core_v3_ControlPlane_msg_init,
+  &envoy__config__core__v3__Locality_msg_init,
+  &envoy__config__core__v3__BuildVersion_msg_init,
+  &envoy__config__core__v3__Extension_msg_init,
+  &envoy__config__core__v3__Node_msg_init,
+  &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init,
+  &envoy__config__core__v3__Metadata_msg_init,
+  &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init,
+  &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init,
+  &envoy__config__core__v3__RuntimeUInt32_msg_init,
+  &envoy__config__core__v3__RuntimePercent_msg_init,
+  &envoy__config__core__v3__RuntimeDouble_msg_init,
+  &envoy__config__core__v3__RuntimeFeatureFlag_msg_init,
+  &envoy__config__core__v3__QueryParameter_msg_init,
+  &envoy__config__core__v3__HeaderValue_msg_init,
+  &envoy__config__core__v3__HeaderValueOption_msg_init,
+  &envoy__config__core__v3__HeaderMap_msg_init,
+  &envoy__config__core__v3__WatchedDirectory_msg_init,
+  &envoy__config__core__v3__DataSource_msg_init,
+  &envoy__config__core__v3__RetryPolicy_msg_init,
+  &envoy__config__core__v3__RemoteDataSource_msg_init,
+  &envoy__config__core__v3__AsyncDataSource_msg_init,
+  &envoy__config__core__v3__TransportSocket_msg_init,
+  &envoy__config__core__v3__RuntimeFractionalPercent_msg_init,
+  &envoy__config__core__v3__ControlPlane_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h
@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/base.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__Locality_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Extension_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Node_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__DataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/config_source.proto
 *
@ -10,7 +9,22 @@
 #define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/authority.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -24,13 +38,6 @@ typedef struct envoy_config_core_v3_RateLimitSettings envoy_config_core_v3_RateL
 typedef struct envoy_config_core_v3_PathConfigSource envoy_config_core_v3_PathConfigSource;
 typedef struct envoy_config_core_v3_ConfigSource envoy_config_core_v3_ConfigSource;
 typedef struct envoy_config_core_v3_ExtensionConfigSource envoy_config_core_v3_ExtensionConfigSource;
-extern const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_AggregatedConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_SelfConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_RateLimitSettings_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_PathConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init;
 struct envoy_config_core_v3_GrpcService;
 struct envoy_config_core_v3_TypedExtensionConfig;
 struct envoy_config_core_v3_WatchedDirectory;
@ -39,14 +46,6 @@ struct google_protobuf_DoubleValue;
 struct google_protobuf_Duration;
 struct google_protobuf_UInt32Value;
 struct xds_core_v3_Authority;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_WatchedDirectory_msg_init;
-extern const upb_MiniTable google_protobuf_Any_msg_init;
-extern const upb_MiniTable google_protobuf_DoubleValue_msg_init;
-extern const upb_MiniTable google_protobuf_Duration_msg_init;
-extern const upb_MiniTable google_protobuf_UInt32Value_msg_init;
-extern const upb_MiniTable xds_core_v3_Authority_msg_init;

 typedef enum {
  envoy_config_core_v3_ApiConfigSource_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE = 0,
@ -68,12 +67,12 @@ typedef enum {
 /* envoy.config.core.v3.ApiConfigSource */

 UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_ApiConfigSource* ret = envoy_config_core_v3_ApiConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ApiConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -83,7 +82,7 @@ UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigS
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_ApiConfigSource* ret = envoy_config_core_v3_ApiConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ApiConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ApiConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -91,13 +90,13 @@ UPB_INLINE envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ApiConfigS
 }
 UPB_INLINE char* envoy_config_core_v3_ApiConfigSource_serialize(const envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ApiConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ApiConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ApiConfigSource_serialize_ex(const envoy_config_core_v3_ApiConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ApiConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ApiConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ApiConfigSource_clear_api_type(envoy_config_core_v3_ApiConfigSource* msg) {
@ -325,7 +324,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_refresh_delay(envoy_con
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_refresh_delay(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_refresh_delay(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_core_v3_ApiConfigSource_set_refresh_delay(msg, sub);
  }
  return sub;
@ -351,7 +350,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_ApiConf
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -363,7 +362,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_request_timeout(envoy_c
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_request_timeout(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_request_timeout(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_core_v3_ApiConfigSource_set_request_timeout(msg, sub);
  }
  return sub;
@ -375,7 +374,7 @@ UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(env
 UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_ApiConfigSource_mutable_rate_limit_settings(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_RateLimitSettings* sub = (struct envoy_config_core_v3_RateLimitSettings*)envoy_config_core_v3_ApiConfigSource_rate_limit_settings(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy_config_core_v3_RateLimitSettings_msg_init, arena);
+    sub = (struct envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy__config__core__v3__RateLimitSettings_msg_init, arena);
    if (sub) envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(msg, sub);
  }
  return sub;
@ -409,7 +408,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -418,12 +417,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v
 /* envoy.config.core.v3.AggregatedConfigSource */

 UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_AggregatedConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy_config_core_v3_AggregatedConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy__config__core__v3__AggregatedConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_AggregatedConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_AggregatedConfigSource* ret = envoy_config_core_v3_AggregatedConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AggregatedConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -433,7 +432,7 @@ UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_Agg
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_AggregatedConfigSource* ret = envoy_config_core_v3_AggregatedConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_AggregatedConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__AggregatedConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -441,13 +440,13 @@ UPB_INLINE envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_Agg
 }
 UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize(const envoy_config_core_v3_AggregatedConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AggregatedConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AggregatedConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize_ex(const envoy_config_core_v3_AggregatedConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_AggregatedConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__AggregatedConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }

@ -455,12 +454,12 @@ UPB_INLINE char* envoy_config_core_v3_AggregatedConfigSource_serialize_ex(const
 /* envoy.config.core.v3.SelfConfigSource */

 UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy_config_core_v3_SelfConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy__config__core__v3__SelfConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_SelfConfigSource* ret = envoy_config_core_v3_SelfConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SelfConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -470,7 +469,7 @@ UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfi
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_SelfConfigSource* ret = envoy_config_core_v3_SelfConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_SelfConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__SelfConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -478,13 +477,13 @@ UPB_INLINE envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_SelfConfi
 }
 UPB_INLINE char* envoy_config_core_v3_SelfConfigSource_serialize(const envoy_config_core_v3_SelfConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SelfConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SelfConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_SelfConfigSource_serialize_ex(const envoy_config_core_v3_SelfConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_SelfConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__SelfConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_SelfConfigSource_clear_transport_api_version(envoy_config_core_v3_SelfConfigSource* msg) {
@ -507,12 +506,12 @@ UPB_INLINE void envoy_config_core_v3_SelfConfigSource_set_transport_api_version(
 /* envoy.config.core.v3.RateLimitSettings */

 UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimitSettings_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy_config_core_v3_RateLimitSettings_msg_init, arena);
+  return (envoy_config_core_v3_RateLimitSettings*)_upb_Message_New(&envoy__config__core__v3__RateLimitSettings_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimitSettings_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_RateLimitSettings* ret = envoy_config_core_v3_RateLimitSettings_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RateLimitSettings_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -522,7 +521,7 @@ UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimi
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_RateLimitSettings* ret = envoy_config_core_v3_RateLimitSettings_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_RateLimitSettings_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__RateLimitSettings_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -530,13 +529,13 @@ UPB_INLINE envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_RateLimi
 }
 UPB_INLINE char* envoy_config_core_v3_RateLimitSettings_serialize(const envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RateLimitSettings_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RateLimitSettings_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_RateLimitSettings_serialize_ex(const envoy_config_core_v3_RateLimitSettings* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_RateLimitSettings_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__RateLimitSettings_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_RateLimitSettings_clear_max_tokens(envoy_config_core_v3_RateLimitSettings* msg) {
@ -577,7 +576,7 @@ UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_max_tokens(envoy_conf
 UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSettings_mutable_max_tokens(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) {
  struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RateLimitSettings_max_tokens(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google_protobuf_UInt32Value_msg_init, arena);
+    sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena);
    if (sub) envoy_config_core_v3_RateLimitSettings_set_max_tokens(msg, sub);
  }
  return sub;
@ -589,7 +588,7 @@ UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_fill_rate(envoy_confi
 UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSettings_mutable_fill_rate(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) {
  struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_core_v3_RateLimitSettings_fill_rate(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google_protobuf_DoubleValue_msg_init, arena);
+    sub = (struct google_protobuf_DoubleValue*)_upb_Message_New(&google__protobuf__DoubleValue_msg_init, arena);
    if (sub) envoy_config_core_v3_RateLimitSettings_set_fill_rate(msg, sub);
  }
  return sub;
@ -598,12 +597,12 @@ UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSet
 /* envoy.config.core.v3.PathConfigSource */

 UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy_config_core_v3_PathConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy__config__core__v3__PathConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_PathConfigSource* ret = envoy_config_core_v3_PathConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_PathConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__PathConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -613,7 +612,7 @@ UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfi
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_PathConfigSource* ret = envoy_config_core_v3_PathConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_PathConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__PathConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -621,13 +620,13 @@ UPB_INLINE envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_PathConfi
 }
 UPB_INLINE char* envoy_config_core_v3_PathConfigSource_serialize(const envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_PathConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__PathConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_PathConfigSource_serialize_ex(const envoy_config_core_v3_PathConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_PathConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__PathConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_PathConfigSource_clear_path(envoy_config_core_v3_PathConfigSource* msg) {
@ -668,7 +667,7 @@ UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_watched_directory(envo
 UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_PathConfigSource_mutable_watched_directory(envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_PathConfigSource_watched_directory(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy_config_core_v3_WatchedDirectory_msg_init, arena);
+    sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena);
    if (sub) envoy_config_core_v3_PathConfigSource_set_watched_directory(msg, sub);
  }
  return sub;
@ -677,12 +676,12 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_Pa
 /* envoy.config.core.v3.ConfigSource */

 UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_ConfigSource* ret = envoy_config_core_v3_ConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -692,7 +691,7 @@ UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_ConfigSource* ret = envoy_config_core_v3_ConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -700,13 +699,13 @@ UPB_INLINE envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ConfigSource_
 }
 UPB_INLINE char* envoy_config_core_v3_ConfigSource_serialize(const envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ConfigSource_serialize_ex(const envoy_config_core_v3_ConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -871,7 +870,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_api_config_source(envoy_co
 UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ConfigSource_mutable_api_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_core_v3_ConfigSource_api_config_source(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy_config_core_v3_ApiConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_Message_New(&envoy__config__core__v3__ApiConfigSource_msg_init, arena);
    if (sub) envoy_config_core_v3_ConfigSource_set_api_config_source(msg, sub);
  }
  return sub;
@ -883,7 +882,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_ads(envoy_config_core_v3_C
 UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_ConfigSource_mutable_ads(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_AggregatedConfigSource* sub = (struct envoy_config_core_v3_AggregatedConfigSource*)envoy_config_core_v3_ConfigSource_ads(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy_config_core_v3_AggregatedConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_AggregatedConfigSource*)_upb_Message_New(&envoy__config__core__v3__AggregatedConfigSource_msg_init, arena);
    if (sub) envoy_config_core_v3_ConfigSource_set_ads(msg, sub);
  }
  return sub;
@ -895,7 +894,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(envo
 UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mutable_initial_fetch_timeout(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
  struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ConfigSource_initial_fetch_timeout(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google_protobuf_Duration_msg_init, arena);
+    sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena);
    if (sub) envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(msg, sub);
  }
  return sub;
@ -907,7 +906,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_self(envoy_config_core_v3_
 UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_ConfigSource_mutable_self(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_SelfConfigSource* sub = (struct envoy_config_core_v3_SelfConfigSource*)envoy_config_core_v3_ConfigSource_self(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy_config_core_v3_SelfConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_SelfConfigSource*)_upb_Message_New(&envoy__config__core__v3__SelfConfigSource_msg_init, arena);
    if (sub) envoy_config_core_v3_ConfigSource_set_self(msg, sub);
  }
  return sub;
@ -937,7 +936,7 @@ UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_a
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct xds_core_v3_Authority* sub = (struct xds_core_v3_Authority*)_upb_Message_New(&xds_core_v3_Authority_msg_init, arena);
+  struct xds_core_v3_Authority* sub = (struct xds_core_v3_Authority*)_upb_Message_New(&xds__core__v3__Authority_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -949,7 +948,7 @@ UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path_config_source(envoy_c
 UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_ConfigSource_mutable_path_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_PathConfigSource* sub = (struct envoy_config_core_v3_PathConfigSource*)envoy_config_core_v3_ConfigSource_path_config_source(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy_config_core_v3_PathConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_PathConfigSource*)_upb_Message_New(&envoy__config__core__v3__PathConfigSource_msg_init, arena);
    if (sub) envoy_config_core_v3_ConfigSource_set_path_config_source(msg, sub);
  }
  return sub;
@ -958,12 +957,12 @@ UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_Co
 /* envoy.config.core.v3.ExtensionConfigSource */

 UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_ExtensionConfigSource_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy_config_core_v3_ExtensionConfigSource_msg_init, arena);
+  return (envoy_config_core_v3_ExtensionConfigSource*)_upb_Message_New(&envoy__config__core__v3__ExtensionConfigSource_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_ExtensionConfigSource_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_ExtensionConfigSource* ret = envoy_config_core_v3_ExtensionConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtensionConfigSource_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -973,7 +972,7 @@ UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_Exte
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_ExtensionConfigSource* ret = envoy_config_core_v3_ExtensionConfigSource_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_ExtensionConfigSource_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__ExtensionConfigSource_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -981,13 +980,13 @@ UPB_INLINE envoy_config_core_v3_ExtensionConfigSource* envoy_config_core_v3_Exte
 }
 UPB_INLINE char* envoy_config_core_v3_ExtensionConfigSource_serialize(const envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtensionConfigSource_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtensionConfigSource_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_ExtensionConfigSource_serialize_ex(const envoy_config_core_v3_ExtensionConfigSource* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_ExtensionConfigSource_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__ExtensionConfigSource_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_clear_config_source(envoy_config_core_v3_ExtensionConfigSource* msg) {
@ -1076,7 +1075,7 @@ UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_config_source(env
 UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ExtensionConfigSource_mutable_config_source(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_core_v3_ExtensionConfigSource_config_source(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy_config_core_v3_ConfigSource_msg_init, arena);
+    sub = (struct envoy_config_core_v3_ConfigSource*)_upb_Message_New(&envoy__config__core__v3__ConfigSource_msg_init, arena);
    if (sub) envoy_config_core_v3_ExtensionConfigSource_set_config_source(msg, sub);
  }
  return sub;
@ -1088,7 +1087,7 @@ UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_default_config(en
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSource_mutable_default_config(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_ExtensionConfigSource_default_config(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_config_core_v3_ExtensionConfigSource_set_default_config(msg, sub);
  }
  return sub;
@ -1122,8 +1121,6 @@ UPB_INLINE bool envoy_config_core_v3_ExtensionConfigSource_add_type_urls(envoy_c
  return true;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/config_source.proto
 *
@ -8,28 +7,28 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/config_source.upb.h"
-#include "envoy/config/core/v3/base.upb.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "google/protobuf/duration.upb.h"
-#include "google/protobuf/wrappers.upb.h"
-#include "xds/core/v3/authority.upb.h"
-#include "envoy/annotations/deprecation.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/config_source.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "google/protobuf/duration.upb_minitable.h"
+#include "google/protobuf/wrappers.upb_minitable.h"
+#include "xds/core/v3/authority.upb_minitable.h"
+#include "envoy/annotations/deprecation.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_core_v3_ApiConfigSource_submsgs[5] = {
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_RateLimitSettings_msg_init},
-  {.submsg = &envoy_config_core_v3_TypedExtensionConfig_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__RateLimitSettings_msg_init},
+  {.submsg = &envoy__config__core__v3__TypedExtensionConfig_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9] = {
@ -44,7 +43,7 @@ static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9]
  {9, UPB_SIZE(36, 56), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = {
  &envoy_config_core_v3_ApiConfigSource_submsgs[0],
  &envoy_config_core_v3_ApiConfigSource__fields[0],
  UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0,
@ -68,7 +67,7 @@ const upb_MiniTable envoy_config_core_v3_ApiConfigSource_msg_init = {
  })
 };

-const upb_MiniTable envoy_config_core_v3_AggregatedConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = {
  NULL,
  NULL,
  0, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0,
@ -78,7 +77,7 @@ static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1]
  {1, 0, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_SelfConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = {
  NULL,
  &envoy_config_core_v3_SelfConfigSource__fields[0],
  8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -89,8 +88,8 @@ const upb_MiniTable envoy_config_core_v3_SelfConfigSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_RateLimitSettings_submsgs[2] = {
-  {.submsg = &google_protobuf_UInt32Value_msg_init},
-  {.submsg = &google_protobuf_DoubleValue_msg_init},
+  {.submsg = &google__protobuf__UInt32Value_msg_init},
+  {.submsg = &google__protobuf__DoubleValue_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2] = {
@ -98,7 +97,7 @@ static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2
  {2, UPB_SIZE(8, 16), 2, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_RateLimitSettings_msg_init = {
+const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = {
  &envoy_config_core_v3_RateLimitSettings_submsgs[0],
  &envoy_config_core_v3_RateLimitSettings__fields[0],
  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -111,7 +110,7 @@ const upb_MiniTable envoy_config_core_v3_RateLimitSettings_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_WatchedDirectory_msg_init},
+  {.submsg = &envoy__config__core__v3__WatchedDirectory_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2] = {
@ -119,7 +118,7 @@ static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2]
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_PathConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = {
  &envoy_config_core_v3_PathConfigSource_submsgs[0],
  &envoy_config_core_v3_PathConfigSource__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -132,12 +131,12 @@ const upb_MiniTable envoy_config_core_v3_PathConfigSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_ConfigSource_submsgs[6] = {
-  {.submsg = &envoy_config_core_v3_ApiConfigSource_msg_init},
-  {.submsg = &envoy_config_core_v3_AggregatedConfigSource_msg_init},
-  {.submsg = &google_protobuf_Duration_msg_init},
-  {.submsg = &envoy_config_core_v3_SelfConfigSource_msg_init},
-  {.submsg = &xds_core_v3_Authority_msg_init},
-  {.submsg = &envoy_config_core_v3_PathConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__ApiConfigSource_msg_init},
+  {.submsg = &envoy__config__core__v3__AggregatedConfigSource_msg_init},
+  {.submsg = &google__protobuf__Duration_msg_init},
+  {.submsg = &envoy__config__core__v3__SelfConfigSource_msg_init},
+  {.submsg = &xds__core__v3__Authority_msg_init},
+  {.submsg = &envoy__config__core__v3__PathConfigSource_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = {
@ -151,7 +150,7 @@ static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = {
  {8, UPB_SIZE(20, 16), UPB_SIZE(-9, -5), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = {
  &envoy_config_core_v3_ConfigSource_submsgs[0],
  &envoy_config_core_v3_ConfigSource__fields[0],
  UPB_SIZE(32, 48), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0,
@ -176,8 +175,8 @@ const upb_MiniTable envoy_config_core_v3_ConfigSource_msg_init = {
 };

 static const upb_MiniTableSub envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = {
-  {.submsg = &envoy_config_core_v3_ConfigSource_msg_init},
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &envoy__config__core__v3__ConfigSource_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fields[4] = {
@ -187,7 +186,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fiel
  {4, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init = {
+const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = {
  &envoy_config_core_v3_ExtensionConfigSource_submsgs[0],
  &envoy_config_core_v3_ExtensionConfigSource__fields[0],
  UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
@ -204,13 +203,13 @@ const upb_MiniTable envoy_config_core_v3_ExtensionConfigSource_msg_init = {
 };

 static const upb_MiniTable *messages_layout[7] = {
-  &envoy_config_core_v3_ApiConfigSource_msg_init,
-  &envoy_config_core_v3_AggregatedConfigSource_msg_init,
-  &envoy_config_core_v3_SelfConfigSource_msg_init,
-  &envoy_config_core_v3_RateLimitSettings_msg_init,
-  &envoy_config_core_v3_PathConfigSource_msg_init,
-  &envoy_config_core_v3_ConfigSource_msg_init,
-  &envoy_config_core_v3_ExtensionConfigSource_msg_init,
+  &envoy__config__core__v3__ApiConfigSource_msg_init,
+  &envoy__config__core__v3__AggregatedConfigSource_msg_init,
+  &envoy__config__core__v3__SelfConfigSource_msg_init,
+  &envoy__config__core__v3__RateLimitSettings_msg_init,
+  &envoy__config__core__v3__PathConfigSource_msg_init,
+  &envoy__config__core__v3__ConfigSource_msg_init,
+  &envoy__config__core__v3__ExtensionConfigSource_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h
@ -0,0 +1,36 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/config_source.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init;
+extern const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/event_service_config.proto
 *
@ -10,7 +9,15 @@
 #define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,21 +25,19 @@ extern "C" {
 #endif

 typedef struct envoy_config_core_v3_EventServiceConfig envoy_config_core_v3_EventServiceConfig;
-extern const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init;
 struct envoy_config_core_v3_GrpcService;
-extern const upb_MiniTable envoy_config_core_v3_GrpcService_msg_init;



 /* envoy.config.core.v3.EventServiceConfig */

 UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventServiceConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy_config_core_v3_EventServiceConfig_msg_init, arena);
+  return (envoy_config_core_v3_EventServiceConfig*)_upb_Message_New(&envoy__config__core__v3__EventServiceConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventServiceConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_EventServiceConfig* ret = envoy_config_core_v3_EventServiceConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EventServiceConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +47,7 @@ UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventSe
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_EventServiceConfig* ret = envoy_config_core_v3_EventServiceConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_EventServiceConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__EventServiceConfig_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +55,13 @@ UPB_INLINE envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_EventSe
 }
 UPB_INLINE char* envoy_config_core_v3_EventServiceConfig_serialize(const envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EventServiceConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EventServiceConfig_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_EventServiceConfig_serialize_ex(const envoy_config_core_v3_EventServiceConfig* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_EventServiceConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__EventServiceConfig_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 typedef enum {
@ -90,14 +95,12 @@ UPB_INLINE void envoy_config_core_v3_EventServiceConfig_set_grpc_service(envoy_c
 UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventServiceConfig_mutable_grpc_service(envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena) {
  struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_core_v3_EventServiceConfig_grpc_service(msg);
  if (sub == NULL) {
-    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy_config_core_v3_GrpcService_msg_init, arena);
+    sub = (struct envoy_config_core_v3_GrpcService*)_upb_Message_New(&envoy__config__core__v3__GrpcService_msg_init, arena);
    if (sub) envoy_config_core_v3_EventServiceConfig_set_grpc_service(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/event_service_config.proto
 *
@ -8,24 +7,24 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/event_service_config.upb.h"
-#include "envoy/config/core/v3/grpc_service.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "udpa/annotations/versioning.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/event_service_config.upb_minitable.h"
+#include "envoy/config/core/v3/grpc_service.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_core_v3_EventServiceConfig_submsgs[1] = {
-  {.submsg = &envoy_config_core_v3_GrpcService_msg_init},
+  {.submsg = &envoy__config__core__v3__GrpcService_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[1] = {
  {1, UPB_SIZE(4, 8), -1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init = {
+const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = {
  &envoy_config_core_v3_EventServiceConfig_submsgs[0],
  &envoy_config_core_v3_EventServiceConfig__fields[0],
  UPB_SIZE(8, 16), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
@ -36,7 +35,7 @@ const upb_MiniTable envoy_config_core_v3_EventServiceConfig_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_EventServiceConfig_msg_init,
+  &envoy__config__core__v3__EventServiceConfig_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/event_service_config.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/extension.proto
 *
@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -18,21 +24,19 @@ extern "C" {
 #endif

 typedef struct envoy_config_core_v3_TypedExtensionConfig envoy_config_core_v3_TypedExtensionConfig;
-extern const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init;
 struct google_protobuf_Any;
-extern const upb_MiniTable google_protobuf_Any_msg_init;



 /* envoy.config.core.v3.TypedExtensionConfig */

 UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy_config_core_v3_TypedExtensionConfig_msg_init, arena);
+  return (envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_TypedExtensionConfig_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TypedExtensionConfig_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +46,7 @@ UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_Typed
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_TypedExtensionConfig* ret = envoy_config_core_v3_TypedExtensionConfig_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_TypedExtensionConfig_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__TypedExtensionConfig_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +54,13 @@ UPB_INLINE envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_Typed
 }
 UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize(const envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TypedExtensionConfig_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_TypedExtensionConfig_serialize_ex(const envoy_config_core_v3_TypedExtensionConfig* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_TypedExtensionConfig_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__TypedExtensionConfig_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_clear_name(envoy_config_core_v3_TypedExtensionConfig* msg) {
@ -97,14 +101,12 @@ UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_typed_config(envoy
 UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_mutable_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) {
  struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TypedExtensionConfig_typed_config(msg);
  if (sub == NULL) {
-    sub = (struct google_protobuf_Any*)_upb_Message_New(&google_protobuf_Any_msg_init, arena);
+    sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena);
    if (sub) envoy_config_core_v3_TypedExtensionConfig_set_typed_config(msg, sub);
  }
  return sub;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/extension.proto
 *
@ -8,16 +7,16 @@

 #include <stddef.h>
 #include "upb/generated_code_support.h"
-#include "envoy/config/core/v3/extension.upb.h"
-#include "google/protobuf/any.upb.h"
-#include "udpa/annotations/status.upb.h"
-#include "validate/validate.upb.h"
+#include "envoy/config/core/v3/extension.upb_minitable.h"
+#include "google/protobuf/any.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"

 // Must be last.
 #include "upb/port/def.inc"

 static const upb_MiniTableSub envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = {
-  {.submsg = &google_protobuf_Any_msg_init},
+  {.submsg = &google__protobuf__Any_msg_init},
 };

 static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__fields[2] = {
@ -25,7 +24,7 @@ static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__field
  {2, UPB_SIZE(4, 24), 1, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
 };

-const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init = {
+const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = {
  &envoy_config_core_v3_TypedExtensionConfig_submsgs[0],
  &envoy_config_core_v3_TypedExtensionConfig__fields[0],
  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
@ -38,7 +37,7 @@ const upb_MiniTable envoy_config_core_v3_TypedExtensionConfig_msg_init = {
 };

 static const upb_MiniTable *messages_layout[1] = {
-  &envoy_config_core_v3_TypedExtensionConfig_msg_init,
+  &envoy__config__core__v3__TypedExtensionConfig_msg_init,
 };

 const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout = {
--- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
+++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h
@ -0,0 +1,30 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/config/core/v3/extension.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init;
+
+extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */
--- a/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
+++ b/src/core/ext/upb-generated/envoy/config/core/v3/grpc_method_list.upb.h
@ -1,5 +1,4 @@
-/* This file was generated by upbc (the upb compiler) from the input
- * file:
+/* This file was generated by upb_generator from the input file:
 *
 *     envoy/config/core/v3/grpc_method_list.proto
 *
@ -10,7 +9,14 @@
 #define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_

 #include "upb/generated_code_support.h"
-// Must be last. 
+
+#include "envoy/config/core/v3/grpc_method_list.upb_minitable.h"
+
+#include "udpa/annotations/status.upb_minitable.h"
+#include "udpa/annotations/versioning.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
 #include "upb/port/def.inc"

 #ifdef __cplusplus
@ -19,20 +25,18 @@ extern "C" {

 typedef struct envoy_config_core_v3_GrpcMethodList envoy_config_core_v3_GrpcMethodList;
 typedef struct envoy_config_core_v3_GrpcMethodList_Service envoy_config_core_v3_GrpcMethodList_Service;
-extern const upb_MiniTable envoy_config_core_v3_GrpcMethodList_msg_init;
-extern const upb_MiniTable envoy_config_core_v3_GrpcMethodList_Service_msg_init;



 /* envoy.config.core.v3.GrpcMethodList */

 UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodList_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcMethodList*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_msg_init, arena);
+  return (envoy_config_core_v3_GrpcMethodList*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodList_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_GrpcMethodList* ret = envoy_config_core_v3_GrpcMethodList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -42,7 +46,7 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodL
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_GrpcMethodList* ret = envoy_config_core_v3_GrpcMethodList_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -50,13 +54,13 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList* envoy_config_core_v3_GrpcMethodL
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_serialize(const envoy_config_core_v3_GrpcMethodList* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_serialize_ex(const envoy_config_core_v3_GrpcMethodList* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcMethodList_clear_services(envoy_config_core_v3_GrpcMethodList* msg) {
@ -118,7 +122,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core
  if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
    return NULL;
  }
-  struct envoy_config_core_v3_GrpcMethodList_Service* sub = (struct envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_Service_msg_init, arena);
+  struct envoy_config_core_v3_GrpcMethodList_Service* sub = (struct envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList__Service_msg_init, arena);
  if (!arr || !sub) return NULL;
  _upb_Array_Set(arr, arr->size - 1, &sub, sizeof(sub));
  return sub;
@ -127,12 +131,12 @@ UPB_INLINE struct envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core
 /* envoy.config.core.v3.GrpcMethodList.Service */

 UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_GrpcMethodList_Service_new(upb_Arena* arena) {
-  return (envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy_config_core_v3_GrpcMethodList_Service_msg_init, arena);
+  return (envoy_config_core_v3_GrpcMethodList_Service*)_upb_Message_New(&envoy__config__core__v3__GrpcMethodList__Service_msg_init, arena);
 }
 UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_GrpcMethodList_Service_parse(const char* buf, size_t size, upb_Arena* arena) {
  envoy_config_core_v3_GrpcMethodList_Service* ret = envoy_config_core_v3_GrpcMethodList_Service_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
    return NULL;
  }
  return ret;
@ -142,7 +146,7 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_Grp
                           int options, upb_Arena* arena) {
  envoy_config_core_v3_GrpcMethodList_Service* ret = envoy_config_core_v3_GrpcMethodList_Service_new(arena);
  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, extreg, options, arena) !=
+  if (upb_Decode(buf, size, ret, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, extreg, options, arena) !=
      kUpb_DecodeStatus_Ok) {
    return NULL;
  }
@ -150,13 +154,13 @@ UPB_INLINE envoy_config_core_v3_GrpcMethodList_Service* envoy_config_core_v3_Grp
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_Service_serialize(const envoy_config_core_v3_GrpcMethodList_Service* msg, upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, 0, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, 0, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE char* envoy_config_core_v3_GrpcMethodList_Service_serialize_ex(const envoy_config_core_v3_GrpcMethodList_Service* msg, int options,
                                 upb_Arena* arena, size_t* len) {
  char* ptr;
-  (void)upb_Encode(msg, &envoy_config_core_v3_GrpcMethodList_Service_msg_init, options, arena, &ptr, len);
+  (void)upb_Encode(msg, &envoy__config__core__v3__GrpcMethodList__Service_msg_init, options, arena, &ptr, len);
  return ptr;
 }
 UPB_INLINE void envoy_config_core_v3_GrpcMethodList_Service_clear_name(envoy_config_core_v3_GrpcMethodList_Service* msg) {
@ -237,8 +241,6 @@ UPB_INLINE bool envoy_config_core_v3_GrpcMethodList_Service_add_method_names(env
  return true;
 }

-extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_file_layout;
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
--- a/Show More
+++ b/Show More