diff --git a/api/DedicatedWorkerGlobalScope.json b/api/DedicatedWorkerGlobalScope.json
index a9e25a69537935..9967be4c72ea64 100644
--- a/api/DedicatedWorkerGlobalScope.json
+++ b/api/DedicatedWorkerGlobalScope.json
@@ -155,7 +155,10 @@
         "__compat": {
           "description": "<code>message</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/message_event",
-          "spec_url": "https://html.spec.whatwg.org/multipage/indices.html#event-message",
+          "spec_url": [
+            "https://html.spec.whatwg.org/multipage/indices.html#event-message",
+            "https://html.spec.whatwg.org/multipage/workers.html#handler-dedicatedworkerglobalscope-onmessage"
+          ],
           "support": {
             "chrome": {
               "version_added": "4"
@@ -208,7 +211,10 @@
         "__compat": {
           "description": "<code>messageerror</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/messageerror_event",
-          "spec_url": "https://html.spec.whatwg.org/multipage/indices.html#event-messageerror",
+          "spec_url": [
+            "https://html.spec.whatwg.org/multipage/indices.html#event-messageerror",
+            "https://html.spec.whatwg.org/multipage/workers.html#handler-dedicatedworkerglobalscope-onmessageerror"
+          ],
           "support": {
             "chrome": {
               "version_added": "60"
@@ -311,112 +317,6 @@
           }
         }
       },
-      "onmessage": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/onmessage",
-          "spec_url": "https://html.spec.whatwg.org/multipage/workers.html#handler-dedicatedworkerglobalscope-onmessage",
-          "support": {
-            "chrome": {
-              "version_added": "4"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "deno": {
-              "version_added": "1.0"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "3.5"
-            },
-            "firefox_android": {
-              "version_added": "4"
-            },
-            "ie": {
-              "version_added": "10"
-            },
-            "opera": {
-              "version_added": "10.6"
-            },
-            "opera_android": {
-              "version_added": "11"
-            },
-            "safari": {
-              "version_added": "4"
-            },
-            "safari_ios": {
-              "version_added": "5"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "4.4"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
-      "onmessageerror": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/onmessageerror",
-          "spec_url": "https://html.spec.whatwg.org/multipage/workers.html#handler-dedicatedworkerglobalscope-onmessageerror",
-          "support": {
-            "chrome": {
-              "version_added": "60"
-            },
-            "chrome_android": {
-              "version_added": "60"
-            },
-            "deno": {
-              "version_added": "1.0"
-            },
-            "edge": {
-              "version_added": "18"
-            },
-            "firefox": {
-              "version_added": "57"
-            },
-            "firefox_android": {
-              "version_added": "57"
-            },
-            "ie": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": "47"
-            },
-            "opera_android": {
-              "version_added": "44"
-            },
-            "safari": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "safari_ios": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "samsunginternet_android": {
-              "version_added": "8.0"
-            },
-            "webview_android": {
-              "version_added": "60"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "postMessage": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/DedicatedWorkerGlobalScope/postMessage",
diff --git a/api/ServiceWorkerContainer.json b/api/ServiceWorkerContainer.json
index ae77c17ab5aac7..10089e292d9c3c 100644
--- a/api/ServiceWorkerContainer.json
+++ b/api/ServiceWorkerContainer.json
@@ -250,110 +250,70 @@
           }
         }
       },
-      "oncontrollerchange": {
+      "messageerror_event": {
         "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/oncontrollerchange",
-          "spec_url": "https://w3c.github.io/ServiceWorker/#dom-serviceworkercontainer-oncontrollerchange",
+          "description": "<code>messageerror</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/messageerror_event",
+          "spec_url": "https://w3c.github.io/ServiceWorker/#dom-serviceworkerglobalscope-onmessageerror",
           "support": {
             "chrome": {
-              "version_added": "40"
+              "version_added": "80"
             },
             "chrome_android": {
-              "version_added": "40"
-            },
-            "edge": {
-              "version_added": "17"
+              "version_added": "80"
             },
+            "edge": [
+              {
+                "version_added": "80"
+              },
+              {
+                "version_added": "17",
+                "version_removed": "79"
+              }
+            ],
             "firefox": {
-              "version_added": "44",
-              "notes": "<a href='https://www.mozilla.org/en-US/firefox/organizations/'>Extended Support Releases (ESR)</a> before Firefox 78 ESR do not support service workers and the Push API."
+              "version_added": "65"
             },
             "firefox_android": {
-              "version_added": "44"
+              "version_added": "65"
             },
             "ie": {
               "version_added": false
             },
             "opera": {
-              "version_added": "27"
+              "version_added": "67"
             },
             "opera_android": {
-              "version_added": "27"
+              "version_added": "57"
             },
             "safari": {
-              "version_added": "11.1"
+              "version_added": "11.1",
+              "partial_implementation": true,
+              "notes": "Although the <code>onmessageerror</code> property is supported, the <code>messageerror</code> event is never fired. See <a href='https://webkit.org/b/171216'>bug 171216</a>."
             },
             "safari_ios": {
-              "version_added": "11.3"
+              "version_added": "11.3",
+              "partial_implementation": true,
+              "notes": "Although the <code>onmessageerror</code> property is supported, the <code>messageerror</code> event is never fired. See <a href='https://webkit.org/b/171216'>bug 171216</a>."
             },
             "samsunginternet_android": {
-              "version_added": "4.0"
+              "version_added": "13.0"
             },
             "webview_android": {
-              "version_added": "40"
+              "version_added": "80"
             }
           },
           "status": {
-            "experimental": true,
+            "experimental": false,
             "standard_track": true,
             "deprecated": false
           }
         }
       },
-      "onerror": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/onerror",
-          "support": {
-            "chrome": {
-              "version_added": false
-            },
-            "chrome_android": {
-              "version_added": false
-            },
-            "edge": {
-              "version_added": false
-            },
-            "firefox": {
-              "version_added": "44",
-              "notes": "See <a href='https://bugzil.la/1714533'>bug 1714533</a>."
-            },
-            "firefox_android": {
-              "version_added": "44",
-              "notes": "See <a href='https://bugzil.la/1714533'>bug 1714533</a>."
-            },
-            "ie": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": false
-            },
-            "opera_android": {
-              "version_added": false
-            },
-            "safari": {
-              "version_added": false
-            },
-            "safari_ios": {
-              "version_added": false
-            },
-            "samsunginternet_android": {
-              "version_added": false
-            },
-            "webview_android": {
-              "version_added": false
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": false,
-            "deprecated": true
-          }
-        }
-      },
-      "onmessage": {
+      "oncontrollerchange": {
         "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/onmessage",
-          "spec_url": "https://w3c.github.io/ServiceWorker/#dom-serviceworkerglobalscope-onmessage",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/oncontrollerchange",
+          "spec_url": "https://w3c.github.io/ServiceWorker/#dom-serviceworkercontainer-oncontrollerchange",
           "support": {
             "chrome": {
               "version_added": "40"
@@ -400,62 +360,53 @@
           }
         }
       },
-      "onmessageerror": {
+      "onerror": {
         "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/onmessageerror",
-          "spec_url": "https://w3c.github.io/ServiceWorker/#dom-serviceworkerglobalscope-onmessageerror",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/ServiceWorkerContainer/onerror",
           "support": {
             "chrome": {
-              "version_added": "80"
+              "version_added": false
             },
             "chrome_android": {
-              "version_added": "80"
+              "version_added": false
+            },
+            "edge": {
+              "version_added": false
             },
-            "edge": [
-              {
-                "version_added": "80"
-              },
-              {
-                "version_added": "17",
-                "version_removed": "79"
-              }
-            ],
             "firefox": {
-              "version_added": "65"
+              "version_added": "44",
+              "notes": "See <a href='https://bugzil.la/1714533'>bug 1714533</a>."
             },
             "firefox_android": {
-              "version_added": "65"
+              "version_added": "44",
+              "notes": "See <a href='https://bugzil.la/1714533'>bug 1714533</a>."
             },
             "ie": {
               "version_added": false
             },
             "opera": {
-              "version_added": "67"
+              "version_added": false
             },
             "opera_android": {
-              "version_added": "57"
+              "version_added": false
             },
             "safari": {
-              "version_added": "11.1",
-              "partial_implementation": true,
-              "notes": "Although the <code>onmessageerror</code> property is supported, the <code>messageerror</code> event is never fired. See <a href='https://webkit.org/b/171216'>bug 171216</a>."
+              "version_added": false
             },
             "safari_ios": {
-              "version_added": "11.3",
-              "partial_implementation": true,
-              "notes": "Although the <code>onmessageerror</code> property is supported, the <code>messageerror</code> event is never fired. See <a href='https://webkit.org/b/171216'>bug 171216</a>."
+              "version_added": false
             },
             "samsunginternet_android": {
-              "version_added": "13.0"
+              "version_added": false
             },
             "webview_android": {
-              "version_added": "80"
+              "version_added": false
             }
           },
           "status": {
             "experimental": false,
-            "standard_track": true,
-            "deprecated": false
+            "standard_track": false,
+            "deprecated": true
           }
         }
       },
diff --git a/api/Window.json b/api/Window.json
index b030bc43502246..fdc43191855bdf 100644
--- a/api/Window.json
+++ b/api/Window.json
@@ -3437,7 +3437,10 @@
         "__compat": {
           "description": "<code>message</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Window/message_event",
-          "spec_url": "https://html.spec.whatwg.org/multipage/indices.html#event-message",
+          "spec_url": [
+            "https://html.spec.whatwg.org/multipage/indices.html#event-message",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-window-onmessage"
+          ],
           "support": {
             "chrome": {
               "version_added": "60"
@@ -3487,7 +3490,10 @@
         "__compat": {
           "description": "<code>messageerror</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Window/messageerror_event",
-          "spec_url": "https://html.spec.whatwg.org/multipage/indices.html#event-messageerror",
+          "spec_url": [
+            "https://html.spec.whatwg.org/multipage/indices.html#event-messageerror",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-window-onmessageerror"
+          ],
           "support": {
             "chrome": {
               "version_added": "60"
diff --git a/api/WindowEventHandlers.json b/api/WindowEventHandlers.json
index de0630b2996749..2f92f67bd7e2d9 100644
--- a/api/WindowEventHandlers.json
+++ b/api/WindowEventHandlers.json
@@ -293,106 +293,6 @@
           }
         }
       },
-      "onmessage": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/WindowEventHandlers/onmessage",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-window-onmessage",
-          "support": {
-            "chrome": {
-              "version_added": "60"
-            },
-            "chrome_android": {
-              "version_added": "60"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "8"
-            },
-            "opera": {
-              "version_added": "47"
-            },
-            "opera_android": {
-              "version_added": "44"
-            },
-            "safari": {
-              "version_added": "4"
-            },
-            "safari_ios": {
-              "version_added": "4"
-            },
-            "samsunginternet_android": {
-              "version_added": "8.0"
-            },
-            "webview_android": {
-              "version_added": "60"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
-      "onmessageerror": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/WindowEventHandlers/onmessageerror",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-window-onmessageerror",
-          "support": {
-            "chrome": {
-              "version_added": "60"
-            },
-            "chrome_android": {
-              "version_added": "60"
-            },
-            "edge": {
-              "version_added": "18"
-            },
-            "firefox": {
-              "version_added": "57"
-            },
-            "firefox_android": {
-              "version_added": "57"
-            },
-            "ie": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": "47"
-            },
-            "opera_android": {
-              "version_added": "44"
-            },
-            "safari": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "safari_ios": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "samsunginternet_android": {
-              "version_added": "8.0"
-            },
-            "webview_android": {
-              "version_added": "60"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "onoffline": {
         "__compat": {
           "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-window-onoffline",
diff --git a/api/Worker.json b/api/Worker.json
index 69e5daf4b5cbda..1f4c47856f36f4 100644
--- a/api/Worker.json
+++ b/api/Worker.json
@@ -542,118 +542,6 @@
           }
         }
       },
-      "onmessage": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Worker/onmessage",
-          "spec_url": "https://html.spec.whatwg.org/multipage/workers.html#handler-worker-onmessage",
-          "support": {
-            "chrome": {
-              "version_added": "4"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "deno": {
-              "version_added": "1.0"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "3.5"
-            },
-            "firefox_android": {
-              "version_added": "4"
-            },
-            "ie": {
-              "version_added": "10"
-            },
-            "nodejs": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": "10.6"
-            },
-            "opera_android": {
-              "version_added": "11"
-            },
-            "safari": {
-              "version_added": "4"
-            },
-            "safari_ios": {
-              "version_added": "5"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "4.4"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
-      "onmessageerror": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Worker/onmessageerror",
-          "spec_url": "https://html.spec.whatwg.org/multipage/workers.html#handler-worker-onmessageerror",
-          "support": {
-            "chrome": {
-              "version_added": "60"
-            },
-            "chrome_android": {
-              "version_added": "60"
-            },
-            "deno": {
-              "version_added": "1.0"
-            },
-            "edge": {
-              "version_added": "18"
-            },
-            "firefox": {
-              "version_added": "57"
-            },
-            "firefox_android": {
-              "version_added": "57"
-            },
-            "ie": {
-              "version_added": false
-            },
-            "nodejs": {
-              "version_added": false
-            },
-            "opera": {
-              "version_added": "47"
-            },
-            "opera_android": {
-              "version_added": "44"
-            },
-            "safari": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "safari_ios": {
-              "version_added": false,
-              "notes": "See <a href='https://webkit.org/b/171216'>bug 171216</a>."
-            },
-            "samsunginternet_android": {
-              "version_added": "8.0"
-            },
-            "webview_android": {
-              "version_added": "60"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "postMessage": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Worker/postMessage",