diff --git a/api/CustomElementRegistry.json b/api/CustomElementRegistry.json
index 172af3fb76a0ac..80a887bc42785f 100644
--- a/api/CustomElementRegistry.json
+++ b/api/CustomElementRegistry.json
@@ -5,7 +5,7 @@
         "mdn_url": "https://developer.mozilla.org/docs/Web/API/CustomElementRegistry",
         "spec_url": "https://html.spec.whatwg.org/multipage/custom-elements.html#custom-elements-api",
         "tags": [
-          "web-features:custom-elements"
+          "web-features:autonomous-custom-elements"
         ],
         "support": {
           "chrome": {
@@ -41,7 +41,7 @@
           "description": "Customized built-in element support",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/CustomElementRegistry/define#defining_a_customized_built-in_element",
           "tags": [
-            "web-features:custom-elements"
+            "web-features:customized-built-in-elements"
           ],
           "support": {
             "chrome": {
@@ -79,7 +79,7 @@
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/CustomElementRegistry/define",
           "spec_url": "https://html.spec.whatwg.org/multipage/custom-elements.html#dom-customelementregistry-define-dev",
           "tags": [
-            "web-features:custom-elements"
+            "web-features:autonomous-custom-elements"
           ],
           "support": {
             "chrome": {
diff --git a/api/Window.json b/api/Window.json
index bd9df290f1dc14..acc9ba7be97c20 100644
--- a/api/Window.json
+++ b/api/Window.json
@@ -994,7 +994,7 @@
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Window/customElements",
           "spec_url": "https://html.spec.whatwg.org/multipage/custom-elements.html#dom-window-customelements",
           "tags": [
-            "web-features:custom-elements"
+            "web-features:autonomous-custom-elements"
           ],
           "support": {
             "chrome": {
diff --git a/css/selectors/defined.json b/css/selectors/defined.json
index 6949e918ae330d..580cbf11d6b8d5 100644
--- a/css/selectors/defined.json
+++ b/css/selectors/defined.json
@@ -7,7 +7,7 @@
           "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:defined",
           "spec_url": "https://html.spec.whatwg.org/multipage/semantics-other.html#selector-defined",
           "tags": [
-            "web-features:custom-elements"
+            "web-features:autonomous-custom-elements"
           ],
           "support": {
             "chrome": {
diff --git a/css/selectors/host-context.json b/css/selectors/host-context.json
index db4ad20967f950..ee777cd9baa412 100644
--- a/css/selectors/host-context.json
+++ b/css/selectors/host-context.json
@@ -6,9 +6,6 @@
           "description": "<code>:host-context()</code>",
           "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:host-context",
           "spec_url": "https://drafts.csswg.org/css-scoping/#host-selector",
-          "tags": [
-            "web-features:custom-elements"
-          ],
           "support": {
             "chrome": {
               "version_added": "54"
diff --git a/css/selectors/host.json b/css/selectors/host.json
index 0b0264b64ac731..7e227daac412a9 100644
--- a/css/selectors/host.json
+++ b/css/selectors/host.json
@@ -6,9 +6,6 @@
           "description": "<code>:host</code>",
           "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:host",
           "spec_url": "https://drafts.csswg.org/css-scoping/#host-selector",
-          "tags": [
-            "web-features:custom-elements"
-          ],
           "support": {
             "chrome": {
               "version_added": "54"
diff --git a/css/selectors/part.json b/css/selectors/part.json
index b5471796fb45ca..cc3faf44b04654 100644
--- a/css/selectors/part.json
+++ b/css/selectors/part.json
@@ -6,9 +6,6 @@
           "description": "<code>::part</code>",
           "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/::part",
           "spec_url": "https://drafts.csswg.org/css-shadow-parts/#part",
-          "tags": [
-            "web-features:custom-elements"
-          ],
           "support": {
             "chrome": {
               "version_added": "73"