diff --git a/xds/type/matcher/v3/cel.proto b/xds/type/matcher/v3/cel.proto
index 00f6ca0b..d9ed065b 100644
--- a/xds/type/matcher/v3/cel.proto
+++ b/xds/type/matcher/v3/cel.proto
@@ -31,7 +31,7 @@ option (xds.annotations.v3.file_status).work_in_progress = true;
 // for usage details.
 //
 // [#comment:TODO(sergiitk): Link HttpAttributesMatchInput + usage example.]
-// [#comment:TODO(sergiitk): Add extension category.]
+// [#comment:TODO(sergiitk): When implemented, add the extension tag.]
 message CelMatcher {
   // Either parsed or checked representation of the CEL program.
   type.v3.CelExpression expr_match = 1 [(validate.rules).message = {required: true}];
diff --git a/xds/type/matcher/v3/http_inputs.proto b/xds/type/matcher/v3/http_inputs.proto
index 303aa4ff..28775049 100644
--- a/xds/type/matcher/v3/http_inputs.proto
+++ b/xds/type/matcher/v3/http_inputs.proto
@@ -24,6 +24,6 @@ option (xds.annotations.v3.file_status).work_in_progress = true;
 // Refer to :ref:`Unified Matcher API <envoy_v3_api_msg_.xds.type.matcher.v3.Matcher>` documentation
 // for usage details.
 //
-// [#extension: envoy.matching.inputs.http_attributes]
+// [#comment:TODO(sergiitk): When implemented, add the extension tag.]
 message HttpAttributesCelMatchInput {
 }
diff --git a/xds/type/v3/cel.proto b/xds/type/v3/cel.proto
index a4f6b037..71f6cbaf 100644
--- a/xds/type/v3/cel.proto
+++ b/xds/type/v3/cel.proto
@@ -42,7 +42,7 @@ message CelExpression {
 //   Besides CEL evaluation raising an error explicitly, CEL program returning a type other than
 //   the ``string``, or not returning anything, are considered an error as well.
 //
-// [#comment:TODO(sergiitk): Add extension category.]
+// [#comment:TODO(sergiitk): When implemented, add the extension tag.]
 message CelExtractString {
   // The CEL expression used to extract a string from the CEL environment.
   // the "subject string") that should be replaced.