diff --git a/src/core/lib/channel/context.h b/src/core/lib/channel/context.h
index fbe64803a33b1..46672c9a7ad0a 100644
--- a/src/core/lib/channel/context.h
+++ b/src/core/lib/channel/context.h
@@ -28,9 +28,7 @@
 /// Call context is represented as an array of \a grpc_call_context_elements.
 /// This enum represents the indexes into the array, where each index
 /// contains a different type of value.
-typedef enum {
-  GRPC_CONTEXT_COUNT
-} grpc_context_index;
+typedef enum { GRPC_CONTEXT_COUNT } grpc_context_index;
 
 struct grpc_call_context_element {
   void* value = nullptr;
diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h
index 6b292874d05d5..45b99aa920960 100644
--- a/src/core/telemetry/metrics.h
+++ b/src/core/telemetry/metrics.h
@@ -292,13 +292,12 @@ class StatsPlugin {
       const ChannelArgs& args) const = 0;
   // Gets a scope config for the client channel specified by \a scope. Note that
   // the stats plugin should have been enabled for the channel.
-  virtual std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
-  GetChannelScopeConfig(
+  virtual std::shared_ptr<StatsPlugin::ScopeConfig> GetChannelScopeConfig(
       const experimental::StatsPluginChannelScope& scope) const = 0;
   // Gets a scope config for the server specified by \a args. Note that the
   // stats plugin should have been enabled for the server.
-  virtual std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig>
-  GetServerScopeConfig(const grpc_core::ChannelArgs& args) const = 0;
+  virtual std::shared_ptr<StatsPlugin::ScopeConfig> GetServerScopeConfig(
+      const ChannelArgs& args) const = 0;
 
   // Adds \a value to the uint64 counter specified by \a handle. \a label_values
   // and \a optional_label_values specify attributes that are associated with
diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h
index 26f46ff629374..bc432ee614b6f 100644
--- a/test/core/test_util/fake_stats_plugin.h
+++ b/test/core/test_util/fake_stats_plugin.h
@@ -270,12 +270,12 @@ class FakeStatsPlugin : public StatsPlugin {
       const ChannelArgs& /*args*/) const override {
     return {true, nullptr};
   }
-  std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig> GetChannelScopeConfig(
+  std::shared_ptr<StatsPlugin::ScopeConfig> GetChannelScopeConfig(
       const experimental::StatsPluginChannelScope& scope) const override {
     return nullptr;
   }
-  std::shared_ptr<grpc_core::StatsPlugin::ScopeConfig> GetServerScopeConfig(
-      const grpc_core::ChannelArgs& args) const override {
+  std::shared_ptr<StatsPlugin::ScopeConfig> GetServerScopeConfig(
+      const ChannelArgs& args) const override {
     return nullptr;
   }