diff --git a/envoy/config/metrics/v2/metrics_service.proto b/envoy/config/metrics/v2/metrics_service.proto
index 0cf19213..d2f60a6a 100644
--- a/envoy/config/metrics/v2/metrics_service.proto
+++ b/envoy/config/metrics/v2/metrics_service.proto
@@ -12,7 +12,7 @@ option java_multiple_files = true;
 
 // [#protodoc-title: Metrics service]
 
-// Metrics Service is configured as a built-in *envoy.metrics_service* :ref:`StatsSink
+// Metrics Service is configured as a built-in *envoy.stat_sinks.metrics_service* :ref:`StatsSink
 // <envoy_api_msg_config.metrics.v2.StatsSink>`. This opaque configuration will be used to create
 // Metrics Service.
 // [#extension: envoy.stat_sinks.metrics_service]
diff --git a/envoy/config/metrics/v2/stats.proto b/envoy/config/metrics/v2/stats.proto
index 321e1407..d3f79754 100644
--- a/envoy/config/metrics/v2/stats.proto
+++ b/envoy/config/metrics/v2/stats.proto
@@ -23,9 +23,9 @@ message StatsSink {
   // The name of the stats sink to instantiate. The name must match a supported
   // stats sink. The built-in stats sinks are:
   //
-  // * :ref:`envoy.statsd <envoy_api_msg_config.metrics.v2.StatsdSink>`
-  // * :ref:`envoy.dog_statsd <envoy_api_msg_config.metrics.v2.DogStatsdSink>`
-  // * :ref:`envoy.metrics_service <envoy_api_msg_config.metrics.v2.MetricsServiceConfig>`
+  // * :ref:`envoy.stat_sinks.statsd <envoy_api_msg_config.metrics.v2.StatsdSink>`
+  // * :ref:`envoy.stat_sinks.dog_statsd <envoy_api_msg_config.metrics.v2.DogStatsdSink>`
+  // * :ref:`envoy.stat_sinks.metrics_service <envoy_api_msg_config.metrics.v2.MetricsServiceConfig>`
   // * :ref:`envoy.stat_sinks.hystrix <envoy_api_msg_config.metrics.v2.HystrixSink>`
   //
   // Sinks optionally support tagged/multiple dimensional metrics.
@@ -243,7 +243,7 @@ message TagSpecifier {
   }
 }
 
-// Stats configuration proto schema for built-in *envoy.statsd* sink. This sink does not support
+// Stats configuration proto schema for built-in *envoy.stat_sinks.statsd* sink. This sink does not support
 // tagged metrics.
 // [#extension: envoy.stat_sinks.statsd]
 message StatsdSink {
@@ -290,7 +290,7 @@ message StatsdSink {
   string prefix = 3;
 }
 
-// Stats configuration proto schema for built-in *envoy.dog_statsd* sink.
+// Stats configuration proto schema for built-in *envoy.stat_sinks.dog_statsd* sink.
 // The sink emits stats with `DogStatsD <https://docs.datadoghq.com/guides/dogstatsd/>`_
 // compatible tags. Tags are configurable via :ref:`StatsConfig
 // <envoy_api_msg_config.metrics.v2.StatsConfig>`.
diff --git a/envoy/config/metrics/v3/metrics_service.proto b/envoy/config/metrics/v3/metrics_service.proto
index 5a26875c..002aa748 100644
--- a/envoy/config/metrics/v3/metrics_service.proto
+++ b/envoy/config/metrics/v3/metrics_service.proto
@@ -14,7 +14,7 @@ option java_multiple_files = true;
 
 // [#protodoc-title: Metrics service]
 
-// Metrics Service is configured as a built-in *envoy.metrics_service* :ref:`StatsSink
+// Metrics Service is configured as a built-in *envoy.stat_sinks.metrics_service* :ref:`StatsSink
 // <envoy_api_msg_config.metrics.v3.StatsSink>`. This opaque configuration will be used to create
 // Metrics Service.
 // [#extension: envoy.stat_sinks.metrics_service]
diff --git a/envoy/config/metrics/v3/stats.proto b/envoy/config/metrics/v3/stats.proto
index 01f6bfa1..2f6f5bad 100644
--- a/envoy/config/metrics/v3/stats.proto
+++ b/envoy/config/metrics/v3/stats.proto
@@ -31,9 +31,9 @@ message StatsSink {
   // The name of the stats sink to instantiate. The name must match a supported
   // stats sink. The built-in stats sinks are:
   //
-  // * :ref:`envoy.statsd <envoy_api_msg_config.metrics.v3.StatsdSink>`
-  // * :ref:`envoy.dog_statsd <envoy_api_msg_config.metrics.v3.DogStatsdSink>`
-  // * :ref:`envoy.metrics_service <envoy_api_msg_config.metrics.v3.MetricsServiceConfig>`
+  // * :ref:`envoy.stat_sinks.statsd <envoy_api_msg_config.metrics.v3.StatsdSink>`
+  // * :ref:`envoy.stat_sinks.dog_statsd <envoy_api_msg_config.metrics.v3.DogStatsdSink>`
+  // * :ref:`envoy.stat_sinks.metrics_service <envoy_api_msg_config.metrics.v3.MetricsServiceConfig>`
   // * :ref:`envoy.stat_sinks.hystrix <envoy_api_msg_config.metrics.v3.HystrixSink>`
   //
   // Sinks optionally support tagged/multiple dimensional metrics.
@@ -258,7 +258,7 @@ message TagSpecifier {
   }
 }
 
-// Stats configuration proto schema for built-in *envoy.statsd* sink. This sink does not support
+// Stats configuration proto schema for built-in *envoy.stat_sinks.statsd* sink. This sink does not support
 // tagged metrics.
 // [#extension: envoy.stat_sinks.statsd]
 message StatsdSink {
@@ -307,7 +307,7 @@ message StatsdSink {
   string prefix = 3;
 }
 
-// Stats configuration proto schema for built-in *envoy.dog_statsd* sink.
+// Stats configuration proto schema for built-in *envoy.stat_sinks.dog_statsd* sink.
 // The sink emits stats with `DogStatsD <https://docs.datadoghq.com/guides/dogstatsd/>`_
 // compatible tags. Tags are configurable via :ref:`StatsConfig
 // <envoy_api_msg_config.metrics.v3.StatsConfig>`.
diff --git a/envoy/config/trace/v2/trace.proto b/envoy/config/trace/v2/trace.proto
index 4d87a034..ae578972 100644
--- a/envoy/config/trace/v2/trace.proto
+++ b/envoy/config/trace/v2/trace.proto
@@ -30,9 +30,9 @@ message Tracing {
     // The name of the HTTP trace driver to instantiate. The name must match a
     // supported HTTP trace driver. Built-in trace drivers:
     //
-    // - *envoy.lightstep*
-    // - *envoy.zipkin*
-    // - *envoy.dynamic.ot*
+    // - *envoy.tracers.lightstep*
+    // - *envoy.tracers.zipkin*
+    // - *envoy.tracers.dynamic_ot*
     // - *envoy.tracers.datadog*
     // - *envoy.tracers.opencensus*
     // - *envoy.tracers.xray*
diff --git a/envoy/config/trace/v3/trace.proto b/envoy/config/trace/v3/trace.proto
index ec5ac0a5..d1adb5ca 100644
--- a/envoy/config/trace/v3/trace.proto
+++ b/envoy/config/trace/v3/trace.proto
@@ -40,9 +40,9 @@ message Tracing {
     // The name of the HTTP trace driver to instantiate. The name must match a
     // supported HTTP trace driver. Built-in trace drivers:
     //
-    // - *envoy.lightstep*
-    // - *envoy.zipkin*
-    // - *envoy.dynamic.ot*
+    // - *envoy.tracers.lightstep*
+    // - *envoy.tracers.zipkin*
+    // - *envoy.tracers.dynamic_ot*
     // - *envoy.tracers.datadog*
     // - *envoy.tracers.opencensus*
     // - *envoy.tracers.xray*