diff --git a/css/selectors/user-invalid.json b/css/selectors/user-invalid.json
index b4b82595ab5612..212f8b2c0edc9c 100644
--- a/css/selectors/user-invalid.json
+++ b/css/selectors/user-invalid.json
@@ -16,14 +16,24 @@
             "edge": {
               "version_added": false
             },
-            "firefox": {
-              "version_added": "4",
-              "alternative_name": "::-moz-ui-invalid"
-            },
-            "firefox_android": {
-              "version_added": "4",
-              "alternative_name": "::-moz-ui-invalid"
-            },
+            "firefox": [
+              {
+                "version_added": "88"
+              },
+              {
+                "version_added": "4",
+                "alternative_name": ":-moz-ui-invalid"
+              }
+            ],
+            "firefox_android": [
+              {
+                "version_added": "88"
+              },
+              {
+                "version_added": "4",
+                "alternative_name": ":-moz-ui-invalid"
+              }
+            ],
             "ie": {
               "version_added": false
             },
diff --git a/css/selectors/-moz-ui-valid.json b/css/selectors/user-valid.json
similarity index 59%
rename from css/selectors/-moz-ui-valid.json
rename to css/selectors/user-valid.json
index 927e60472ab2a3..33c6771b039483 100644
--- a/css/selectors/-moz-ui-valid.json
+++ b/css/selectors/user-valid.json
@@ -1,10 +1,11 @@
 {
   "css": {
     "selectors": {
-      "-moz-ui-valid": {
+      "user-valid": {
         "__compat": {
-          "description": "<code>:-moz-ui-valid</code>",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:-moz-ui-valid",
+          "description": "<code>:user-valid</code>",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/CSS/:user-valid",
+          "spec_url": "https://drafts.csswg.org/selectors/#user-valid-pseudo",
           "support": {
             "chrome": {
               "version_added": false
@@ -15,12 +16,24 @@
             "edge": {
               "version_added": false
             },
-            "firefox": {
-              "version_added": "4"
-            },
-            "firefox_android": {
-              "version_added": "4"
-            },
+            "firefox": [
+              {
+                "version_added": "88"
+              },
+              {
+                "version_added": "4",
+                "alternative_name": ":-moz-ui-valid"
+              }
+            ],
+            "firefox_android": [
+              {
+                "version_added": "88"
+              },
+              {
+                "version_added": "4",
+                "alternative_name": ":-moz-ui-valid"
+              }
+            ],
             "ie": {
               "version_added": false
             },
@@ -44,8 +57,8 @@
             }
           },
           "status": {
-            "experimental": false,
-            "standard_track": false,
+            "experimental": true,
+            "standard_track": true,
             "deprecated": false
           }
         }