diff --git a/CODEOWNERS b/CODEOWNERS
index 9ca4bae5c252..8f654266ecbd 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -84,8 +84,8 @@ extensions/filters/common/original_src @klarose @mattklein123
 /*/extensions/filters/http/cache @toddmgreer @jmarantz @penguingao @mpwarres @capoferro
 /*/extensions/http/cache/simple_http_cache @toddmgreer @jmarantz @penguingao @mpwarres @capoferro
 # aws_iam grpc credentials
-/*/extensions/grpc_credentials/aws_iam @lavignes @mattklein123
-/*/extensions/common/aws @lavignes @mattklein123
+/*/extensions/grpc_credentials/aws_iam @suniltheta @lavignes @mattklein123
+/*/extensions/common/aws @suniltheta @lavignes @mattklein123
 # adaptive concurrency limit extension.
 /*/extensions/filters/http/adaptive_concurrency @tonya11en @mattklein123
 # admission control extension.
@@ -147,8 +147,8 @@ extensions/filters/common/original_src @klarose @mattklein123
 # support for on-demand VHDS requests
 /*/extensions/filters/http/on_demand @dmitri-d @htuch @kyessenov
 /*/extensions/filters/network/connection_limit @mattklein123 @alyssawilk @delong-coder
-/*/extensions/filters/http/aws_request_signing @derekargueta @mattklein123 @marcomagdy
-/*/extensions/filters/http/aws_lambda @mattklein123 @marcomagdy @lavignes
+/*/extensions/filters/http/aws_request_signing @derekargueta @suniltheta @mattklein123 @marcomagdy
+/*/extensions/filters/http/aws_lambda @suniltheta @mattklein123 @marcomagdy @lavignes
 /*/extensions/filters/http/buffer @alyssawilk @mattklein123
 /*/extensions/transport_sockets/raw_buffer @alyssawilk @mattklein123
 # Watchdog Extensions
@@ -264,7 +264,7 @@ extensions/filters/http/oauth2 @derekargueta @mattklein123
 /*/extensions/http/stateful_session/header @ramaraochavali @wbpcode @cpakulski
 /*/extensions/filters/http/stateful_session @wbpcode @cpakulski
 # tracers
-/*/extensions/tracers/zipkin @wbpcode @Shikugawa @suniltheta @basvanbeek
+/*/extensions/tracers/zipkin @wbpcode @Shikugawa @basvanbeek
 /*/extensions/tracers/dynamic_ot @wbpcode @Shikugawa @basvanbeek
 /*/extensions/tracers/opencensus @wbpcode @Shikugawa @basvanbeek
 /*/extensions/tracers/common @wbpcode @Shikugawa @basvanbeek
diff --git a/source/extensions/common/aws/utility.cc b/source/extensions/common/aws/utility.cc
index 1643e4068ba7..a75d80f2255a 100644
--- a/source/extensions/common/aws/utility.cc
+++ b/source/extensions/common/aws/utility.cc
@@ -64,7 +64,7 @@ Utility::canonicalizeHeaders(const Http::RequestHeaderMap& headers,
       });
   // The AWS SDK has a quirk where it removes "default ports" (80, 443) from the host headers
   // Additionally, we canonicalize the :authority header as "host"
-  // TODO(lavignes): This may need to be tweaked to canonicalize :authority for HTTP/2 requests
+  // TODO(suniltheta): This may need to be tweaked to canonicalize :authority for HTTP/2 requests
   const absl::string_view authority_header = headers.getHostValue();
   if (!authority_header.empty()) {
     const auto parts = StringUtil::splitToken(authority_header, ":");
diff --git a/source/extensions/tracers/xray/daemon_broker.cc b/source/extensions/tracers/xray/daemon_broker.cc
index dcfa291e12d4..e344bc2d5d32 100644
--- a/source/extensions/tracers/xray/daemon_broker.cc
+++ b/source/extensions/tracers/xray/daemon_broker.cc
@@ -43,7 +43,7 @@ void DaemonBrokerImpl::send(const std::string& data) const {
                                                   nullptr /*local_ip*/, *address_);
 
   if (rc.return_value_ != payload.length()) {
-    // TODO(marcomagdy): report this in stats
+    // TODO(suniltheta): report this in stats
     ENVOY_LOG_TO_LOGGER(logger, debug, "Failed to send trace payload to the X-Ray daemon.");
   }
 }
diff --git a/source/extensions/tracers/xray/xray_tracer_impl.cc b/source/extensions/tracers/xray/xray_tracer_impl.cc
index 91ed870538db..ad1b2a6d8b00 100644
--- a/source/extensions/tracers/xray/xray_tracer_impl.cc
+++ b/source/extensions/tracers/xray/xray_tracer_impl.cc
@@ -75,7 +75,7 @@ Tracing::SpanPtr Driver::startSpan(const Tracing::Config& config,
   // If we have a XRay TraceID in the headers, then we create a SpanContext to pass that trace-id
   // around if no TraceID (which means no x-ray header) then this is a brand new span.
 
-  // TODO(marcomagdy) - how do we factor this into the logic above
+  // TODO(suniltheta) - how do we factor this into the logic above
   UNREFERENCED_PARAMETER(tracing_decision);
   const auto header = trace_context.getByKey(XRayTraceHeader);
   absl::optional<bool> should_trace;