diff --git a/src/core/ext/transport/chttp2/transport/http2_client_transport.cc b/src/core/ext/transport/chttp2/transport/http2_client_transport.cc
index 0c8afb0bdb33c..0adfbaf5d59b2 100644
--- a/src/core/ext/transport/chttp2/transport/http2_client_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/http2_client_transport.cc
@@ -761,8 +761,7 @@ Http2ClientTransport::Http2ClientTransport(
 
   settings_timeout_ =
       channel_args.GetDurationFromIntMillis(GRPC_ARG_SETTINGS_TIMEOUT)
-          .value_or(std::max(keepalive_timeout_ * 2,
-                             grpc_core::Duration::Minutes(1)));
+          .value_or(std::max(keepalive_timeout_ * 2, Duration::Minutes(1)));
 
   std::optional<Http2SettingsFrame> settings_frame =
       settings_.MaybeSendUpdate();
diff --git a/src/core/ext/transport/chttp2/transport/http2_client_transport.h b/src/core/ext/transport/chttp2/transport/http2_client_transport.h
index 2eee8b2ea3999..967906ce00880 100644
--- a/src/core/ext/transport/chttp2/transport/http2_client_transport.h
+++ b/src/core/ext/transport/chttp2/transport/http2_client_transport.h
@@ -220,7 +220,7 @@ class Http2ClientTransport final : public ClientTransport {
 
   PromiseEndpoint endpoint_;
   Http2SettingsManager settings_;
-  grpc_core::Duration settings_timeout_;
+  Duration settings_timeout_;
 
   Http2FrameHeader current_frame_header_;
 
diff --git a/src/core/ext/transport/chttp2/transport/http2_transport.cc b/src/core/ext/transport/chttp2/transport/http2_transport.cc
index 78804408a6eff..60f1d6bd1b00a 100644
--- a/src/core/ext/transport/chttp2/transport/http2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/http2_transport.cc
@@ -41,7 +41,7 @@ namespace http2 {
 // TODO(tjagtap) : [PH2][P3] : We may not need this file. Delete once Server
 // Transport is complete.
 
-void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
+void ReadSettingsFromChannelArgs(const ChannelArgs& channel_args,
                                  Http2Settings& settings,
                                  const bool is_client) {
   int value =
@@ -68,8 +68,7 @@ void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
     // Refer to read_channel_args() in chttp2_transport.cc for more details.
   }
 
-  settings.SetMaxHeaderListSize(
-      grpc_core::GetHardLimitFromChannelArgs(channel_args));
+  settings.SetMaxHeaderListSize(GetHardLimitFromChannelArgs(channel_args));
 
   value = channel_args.GetInt(GRPC_ARG_HTTP2_MAX_FRAME_SIZE).value_or(-1);
   if (value >= 0) {
diff --git a/src/core/ext/transport/chttp2/transport/http2_transport.h b/src/core/ext/transport/chttp2/transport/http2_transport.h
index 8eedd99213ab8..f278a79aff718 100644
--- a/src/core/ext/transport/chttp2/transport/http2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/http2_transport.h
@@ -47,7 +47,7 @@ namespace http2 {
   DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))
 
 #define GRPC_HTTP2_COMMON_DLOG \
-DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))
+  DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))
 
 // Timeout for getting an ack back on settings changes
 #define GRPC_ARG_SETTINGS_TIMEOUT "grpc.http2.settings_timeout"
@@ -64,7 +64,7 @@ enum class HttpStreamState : uint8_t {
   kClosed,
 };
 
-void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
+void ReadSettingsFromChannelArgs(const ChannelArgs& channel_args,
                                  Http2Settings& settings, const bool is_client);
 
 void InitLocalSettings(Http2Settings& settings, const bool is_client);