diff --git a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-intercept.html.ini
similarity index 55%
rename from testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-intercept.html.ini
index 13dad9b86c2a1..f5c8766dc2700 100644
--- a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-intercept.html.ini
@@ -1,3 +1,3 @@
-[navigation-navigate-transitionWhile.html]
- [currententrychange fires for navigation.navigate() intercepted by transitionWhile()]
+[navigation-navigate-intercept.html]
+ [currententrychange fires for navigation.navigate() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html.ini b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html.ini
new file mode 100644
index 0000000000000..928ab87d0c97d
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-intercept.html.ini
@@ -0,0 +1,3 @@
+[navigation-navigate-replace-intercept.html]
+ [currententrychange fires for navigation.navigate() with replace intercepted by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html.ini
deleted file mode 100644
index cdf733b411dac..0000000000000
--- a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-navigate-replace-transitionWhile.html]
- [currententrychange fires for navigation.navigate() with replace intercepted by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-intercept.html.ini
similarity index 56%
rename from testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-intercept.html.ini
index 32c53005bbdbd..7ab40ce82c611 100644
--- a/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/currententrychange-event/navigation-reload-intercept.html.ini
@@ -1,3 +1,3 @@
-[navigation-reload-transitionWhile.html]
- [currententrychange fires for navigation.reload() intercepted by transitionWhile()]
+[navigation-reload-intercept.html]
+ [currententrychange fires for navigation.reload() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html.ini
new file mode 100644
index 0000000000000..882d05964bcb8
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-intercept.html.ini
@@ -0,0 +1,3 @@
+[change-focus-again-in-blur-during-intercept.html]
+ [change-focus-again-in-blur-during-intercept]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-transitionWhile.html.ini
deleted file mode 100644
index 93721b2441f65..0000000000000
--- a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-again-in-blur-during-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[change-focus-again-in-blur-during-transitionWhile.html]
- [change-focus-again-in-blur-during-transitionWhile]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html.ini
new file mode 100644
index 0000000000000..50bec98e36722
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-intercept.html.ini
@@ -0,0 +1,3 @@
+[change-focus-back-to-origial-during-intercept.html]
+ [change-focus-back-to-origial-during-intercept]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-transitionWhile.html.ini
deleted file mode 100644
index 7b98a76c997a9..0000000000000
--- a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-back-to-origial-during-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[change-focus-back-to-origial-during-transitionWhile.html]
- [change-focus-back-to-origial-during-transitionWhile]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-intercept.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-intercept.html.ini
new file mode 100644
index 0000000000000..6a37b9f30514c
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-intercept.html.ini
@@ -0,0 +1,3 @@
+[change-focus-during-intercept.html]
+ [change-focus-during-intercept]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-transitionWhile.html.ini
deleted file mode 100644
index 73771c99b9b2a..0000000000000
--- a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-during-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[change-focus-during-transitionWhile.html]
- [change-focus-during-transitionWhile]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html.ini
new file mode 100644
index 0000000000000..d4b2b720f991a
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-intercept.html.ini
@@ -0,0 +1,3 @@
+[change-focus-then-remove-during-intercept.html]
+ [change-focus-then-remove-during-intercept]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-transitionWhile.html.ini
deleted file mode 100644
index 859e5886c53a9..0000000000000
--- a/testing/web-platform/meta/navigation-api/focus-reset/change-focus-then-remove-during-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[change-focus-then-remove-during-transitionWhile.html]
- [change-focus-then-remove-during-transitionWhile]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/focus-reset/multiple-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/focus-reset/multiple-intercept.html.ini
similarity index 90%
rename from testing/web-platform/meta/navigation-api/focus-reset/multiple-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/focus-reset/multiple-intercept.html.ini
index 46b63b13b6c50..844abcc837ad5 100644
--- a/testing/web-platform/meta/navigation-api/focus-reset/multiple-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/focus-reset/multiple-intercept.html.ini
@@ -1,4 +1,4 @@
-[multiple-transitionWhile.html]
+[multiple-intercept.html]
[(not provided) + after-transition]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-after-dispatch.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-after-dispatch.html.ini
new file mode 100644
index 0000000000000..21e323f3e5fc2
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-after-dispatch.html.ini
@@ -0,0 +1,3 @@
+[intercept-after-dispatch.html]
+ [event.intercept() throws if used after the dispatch phase]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-and-navigate.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-and-navigate.html.ini
new file mode 100644
index 0000000000000..5e5dac75960b0
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-and-navigate.html.ini
@@ -0,0 +1,3 @@
+[intercept-and-navigate.html]
+ [Using intercept() then navigate() in the ensuing currententrychange should abort the finished promise (but not the committed promise)]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-canceled-event.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-canceled-event.html.ini
new file mode 100644
index 0000000000000..3984384d3f67f
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-canceled-event.html.ini
@@ -0,0 +1,3 @@
+[intercept-canceled-event.html]
+ [event.intercept() throws if used on a canceled event]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-document-same-origin.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-document-same-origin.html.ini
new file mode 100644
index 0000000000000..cb849c5d8d47f
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-document-same-origin.html.ini
@@ -0,0 +1,3 @@
+[intercept-cross-document-same-origin.html]
+ [event.intercept() intercepts a same-origin cross-document navigation]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-origin.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-origin.html.ini
new file mode 100644
index 0000000000000..592b1f7178b81
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-cross-origin.html.ini
@@ -0,0 +1,3 @@
+[intercept-cross-origin.html]
+ [event.intercept() should throw if called for a cross origin navigation]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach-multiple.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach-multiple.html.ini
new file mode 100644
index 0000000000000..a4522c2e25033
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach-multiple.html.ini
@@ -0,0 +1,3 @@
+[intercept-detach-multiple.html]
+ [event.intercept() throws if used on an event from a detached iframe]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach.html.ini
new file mode 100644
index 0000000000000..cb864ff57e453
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-detach.html.ini
@@ -0,0 +1,3 @@
+[intercept-detach.html]
+ [event.intercept() throws if used on an event from a detached iframe]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-null-or-undefined.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-null-or-undefined.html.ini
new file mode 100644
index 0000000000000..cb6da89d1d891
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-null-or-undefined.html.ini
@@ -0,0 +1,6 @@
+[intercept-handler-null-or-undefined.html]
+ [event.intercept() should throw if the handler is null]
+ expected: FAIL
+
+ [event.intercept() should not throw if the handler is explicit undefined]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-returns-non-promise.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-returns-non-promise.html.ini
new file mode 100644
index 0000000000000..10f12a250682c
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-returns-non-promise.html.ini
@@ -0,0 +1,3 @@
+[intercept-handler-returns-non-promise.html]
+ [event.intercept() should resolve immediately if the handler doesn't return a promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-throws.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-throws.html.ini
new file mode 100644
index 0000000000000..ad1b134041f27
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-handler-throws.html.ini
@@ -0,0 +1,3 @@
+[intercept-handler-throws.html]
+ [event.intercept() should abort if the handler throws]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-pushState.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-pushState.html.ini
new file mode 100644
index 0000000000000..93f884dedf1ca
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-pushState.html.ini
@@ -0,0 +1,3 @@
+[intercept-history-pushState.html]
+ [event.intercept() should proceed if the given promise resolves]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-replaceState.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-replaceState.html.ini
new file mode 100644
index 0000000000000..d1d5d859b53cd
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-history-replaceState.html.ini
@@ -0,0 +1,3 @@
+[intercept-history-replaceState.html]
+ [event.intercept() should proceed if the given promise resolves]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times-reject.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times-reject.html.ini
new file mode 100644
index 0000000000000..0069cf69c5967
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times-reject.html.ini
@@ -0,0 +1,3 @@
+[intercept-multiple-times-reject.html]
+ [event.intercept() is called multiple times and one of the promises rejects]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times.html.ini
new file mode 100644
index 0000000000000..f982cf7ae01f0
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-multiple-times.html.ini
@@ -0,0 +1,3 @@
+[intercept-multiple-times.html]
+ [navigation.navigate() returns a finished promise that awaits all promises if event.intercept() is called multiple times]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-navigation-back.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-navigation-back.html.ini
new file mode 100644
index 0000000000000..80585c0d44f22
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-navigation-back.html.ini
@@ -0,0 +1,3 @@
+[intercept-navigation-back.html]
+ [event.intercept() can intercept navigation.back()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-on-synthetic-event.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-on-synthetic-event.html.ini
new file mode 100644
index 0000000000000..1cb170a206d2d
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-on-synthetic-event.html.ini
@@ -0,0 +1,3 @@
+[intercept-on-synthetic-event.html]
+ [event.intercept() throws if invoked on a synthetic event]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-popstate.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-popstate.html.ini
new file mode 100644
index 0000000000000..ef54e784505f9
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-popstate.html.ini
@@ -0,0 +1,3 @@
+[intercept-popstate.html]
+ [event.intercept() should provide popstate with a valid state object]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-reject.html.ini
new file mode 100644
index 0000000000000..9fdaa5f6ac569
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-reject.html.ini
@@ -0,0 +1,3 @@
+[intercept-reject.html]
+ [event.intercept() should abort if the given promise rejects]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-resolve.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-resolve.html.ini
new file mode 100644
index 0000000000000..b3692dc6354e8
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-resolve.html.ini
@@ -0,0 +1,3 @@
+[intercept-resolve.html]
+ [event.intercept() should proceed if the given promise resolves]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/intercept-same-document-history-back.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/intercept-same-document-history-back.html.ini
new file mode 100644
index 0000000000000..f1c508edb00f0
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/intercept-same-document-history-back.html.ini
@@ -0,0 +1,3 @@
+[intercept-same-document-history-back.html]
+ [event.intercept() can intercept same-document history.back()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-intercept.html.ini
new file mode 100644
index 0000000000000..a3bd3cf76e65d
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-intercept.html.ini
@@ -0,0 +1,3 @@
+[signal-abort-intercept.html]
+ [event.intercept() does not signal event.signal]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-transitionWhile.html.ini
deleted file mode 100644
index 2dd4843b62241..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[signal-abort-transitionWhile.html]
- [event.transitionWhile() does not signal event.signal]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html.ini
new file mode 100644
index 0000000000000..b108e21d91ad1
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-intercept.html.ini
@@ -0,0 +1,3 @@
+[signal-abort-window-stop-after-intercept.html]
+ [window.stop() cancels the navigate event's intercept() and signals event.signal]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html.ini
deleted file mode 100644
index 3ba8739c7d5e7..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[signal-abort-window-stop-after-transitionWhile.html]
- [window.stop() cancels the navigate event's transitionWhile() and signals event.signal]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-after-dispatch.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-after-dispatch.html.ini
deleted file mode 100644
index 2a2502e7e21d5..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-after-dispatch.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-after-dispatch.html]
- [event.transitionWhile() throws if used after the dispatch phase]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-and-navigate.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-and-navigate.html.ini
deleted file mode 100644
index e41a02f8c9db6..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-and-navigate.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[transitionWhile-and-navigate.html]
- [Using transitionWhile() then navigate() in the ensuing currententrychange should abort the finished promise (but not the committed promise)]
- expected: FAIL
-
- [Using transitionWhile() then navigate() in the ensuing currententrychange should abort the finished promise (but not the committed promise)]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-canceled-event.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-canceled-event.html.ini
deleted file mode 100644
index 054d590c35db2..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-canceled-event.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-canceled-event.html]
- [event.transitionWhile() throws if used on a canceled event]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html.ini
deleted file mode 100644
index cc88294ba0251..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-cross-document-same-origin.html]
- [event.transitionWhile() intercepts a same-origin cross-document navigation]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-origin.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-origin.html.ini
deleted file mode 100644
index 6d24913664661..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-cross-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-cross-origin.html]
- [event.transitionWhile() should throw if called for a cross origin navigation]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-detach.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-detach.html.ini
deleted file mode 100644
index 854d710ffb72f..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-detach.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-detach.html]
- [event.transitionWhile() throws if used on an event from a detached iframe]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-pushState.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-pushState.html.ini
deleted file mode 100644
index 86a25c25587d2..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-pushState.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-history-pushState.html]
- [event.transitionWhile() should proceed if the given promise resolves]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-replaceState.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-replaceState.html.ini
deleted file mode 100644
index 7727574185290..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-history-replaceState.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-history-replaceState.html]
- [event.transitionWhile() should proceed if the given promise resolves]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html.ini
deleted file mode 100644
index 237c8d0f5b65b..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-multiple-times-reject.html]
- [event.transitionWhile() is called multiple times and one of the promises rejects]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times.html.ini
deleted file mode 100644
index d69dd4becf7a9..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-multiple-times.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-multiple-times.html]
- [navigation.navigate() returns a finished promise that awaits all promises if event.transitionWhile() is called multiple times]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-navigation-back.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-navigation-back.html.ini
deleted file mode 100644
index c7ed0c7e72d25..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-navigation-back.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-navigation-back.html]
- [event.transitionWhile() can intercept navigation.back()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html.ini
deleted file mode 100644
index 541757cf124ee..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-on-synthetic-event.html]
- [event.transitionWhile() throws if invoked on a synthetic event]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-popstate.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-popstate.html.ini
deleted file mode 100644
index f724c843ea275..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-popstate.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-popstate.html]
- [event.transitionWhile() should provide popstate with a valid state object]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-reject.html.ini
deleted file mode 100644
index 041095f291565..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-reject.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-reject.html]
- [event.transitionWhile() should abort if the given promise rejects]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-resolve.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-resolve.html.ini
deleted file mode 100644
index c4b7e934bf639..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-resolve.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-resolve.html]
- [event.transitionWhile() should proceed if the given promise resolves]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-same-document-history-back.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-same-document-history-back.html.ini
deleted file mode 100644
index 36fa06ca4431e..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigate-event/transitionWhile-same-document-history-back.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transitionWhile-same-document-history-back.html]
- [event.transitionWhile() can intercept same-document history.back()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html.ini
similarity index 51%
rename from testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html.ini
index 8f27f2ab8ee46..402b71bc8aab9 100644
--- a/testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/navigation-history-entry/key-id-location-reload-intercept.html.ini
@@ -1,3 +1,3 @@
-[key-id-location-reload-transitionWhile.html]
- [NavigationHistoryEntry's key and id after location.reload() intercepted by transitionWhile()]
+[key-id-location-reload-intercept.html]
+ [NavigationHistoryEntry's key and id after location.reload() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/navigate-intercept-history-state.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/navigate-intercept-history-state.html.ini
new file mode 100644
index 0000000000000..7756dbe6c151a
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/navigate-intercept-history-state.html.ini
@@ -0,0 +1,3 @@
+[navigate-intercept-history-state.html]
+ [history.story should be nulled by navigate() handled by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/navigate-transitionWhile-history-state.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/navigate-transitionWhile-history-state.html.ini
deleted file mode 100644
index d56fc917ca3a2..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/navigate-transitionWhile-history-state.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigate-transitionWhile-history-state.html]
- [history.story should be nulled by navigate() handled by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept-rejected.html.ini
new file mode 100644
index 0000000000000..1831eebf2e375
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept-rejected.html.ini
@@ -0,0 +1,3 @@
+[back-intercept-rejected.html]
+ [back() promise rejection with rejected intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept.html.ini
new file mode 100644
index 0000000000000..67bb7e143092e
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-intercept.html.ini
@@ -0,0 +1,3 @@
+[back-intercept.html]
+ [back() and intercept() with a fulfilled promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile-rejected.html.ini
deleted file mode 100644
index 69c8785e9abf5..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile-rejected.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[back-transitionWhile-rejected.html]
- [back() promise rejection with rejected transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile.html.ini
deleted file mode 100644
index 41cd1afec6f8c..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/back-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[back-transitionWhile.html]
- [back() and transitionWhile() with a fulfilled promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html.ini
new file mode 100644
index 0000000000000..d3171b1d608b0
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html.ini
@@ -0,0 +1,3 @@
+[forward-intercept-rejected.html]
+ [forward() promise rejection with rejected intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept.html.ini
new file mode 100644
index 0000000000000..b10cd0966a012
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-intercept.html.ini
@@ -0,0 +1,3 @@
+[forward-intercept.html]
+ [forward() and intercept() with a fulfilled promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile-rejected.html.ini
deleted file mode 100644
index dbf6f12fadbc9..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile-rejected.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[forward-transitionWhile-rejected.html]
- [forward() promise rejection with rejected transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile.html.ini
deleted file mode 100644
index 2b3d5075b73a7..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/forward-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[forward-transitionWhile.html]
- [forward() and transitionWhile() with a fulfilled promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html.ini
new file mode 100644
index 0000000000000..0be3840a6375f
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html.ini
@@ -0,0 +1,3 @@
+[navigate-intercept-interrupted.html]
+ [interrupted navigate() promises with intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html.ini
new file mode 100644
index 0000000000000..1160bd9839a49
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept-rejected.html.ini
@@ -0,0 +1,3 @@
+[navigate-intercept-rejected.html]
+ [navigate() and intercept() with a rejected promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept.html.ini
new file mode 100644
index 0000000000000..1a51b3ddd0fae
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-intercept.html.ini
@@ -0,0 +1,3 @@
+[navigate-intercept.html]
+ [navigate() and intercept() with a fulfilled promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-interrupted.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-interrupted.html.ini
deleted file mode 100644
index c0161c753f00c..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-interrupted.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigate-transitionWhile-interrupted.html]
- [interrupted navigate() promises with transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-rejected.html.ini
deleted file mode 100644
index a3f376613d3a9..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile-rejected.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigate-transitionWhile-rejected.html]
- [navigate() and transitionWhile() with a rejected promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile.html.ini
deleted file mode 100644
index c4948a371732c..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/navigate-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigate-transitionWhile.html]
- [navigate() and transitionWhile() with a fulfilled promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html.ini
new file mode 100644
index 0000000000000..2b4f9302609e1
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept-rejected.html.ini
@@ -0,0 +1,3 @@
+[reload-intercept-rejected.html]
+ [reload() and intercept() with a rejected promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept.html.ini
new file mode 100644
index 0000000000000..e458b9fb52fc9
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-intercept.html.ini
@@ -0,0 +1,3 @@
+[reload-intercept.html]
+ [reload() and intercept() with a fulfilled promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile-rejected.html.ini
deleted file mode 100644
index dd438cbbaf704..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile-rejected.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[reload-transitionWhile-rejected.html]
- [reload() and transitionWhile() with a rejected promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile.html.ini
deleted file mode 100644
index 0f2447561d629..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[reload-transitionWhile.html]
- [reload() and transitionWhile() with a fulfilled promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload.html.ini
index 607b11eac0c49..b7d366c526cbf 100644
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload.html.ini
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/reload.html.ini
@@ -1,3 +1,6 @@
[reload.html]
[reload() promises never settle (without transitionWhile())]
expected: FAIL
+
+ [reload() promises never settle (without intercept())]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html.ini
new file mode 100644
index 0000000000000..fb7b67a6287f7
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html.ini
@@ -0,0 +1,3 @@
+[traverseTo-intercept-rejected.html]
+ [traverseTo() promise rejection with rejected intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept.html.ini
new file mode 100644
index 0000000000000..66319b410e874
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-intercept.html.ini
@@ -0,0 +1,3 @@
+[traverseTo-intercept.html]
+ [traverseTo() and intercept() with a fulfilled promise]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile-rejected.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile-rejected.html.ini
deleted file mode 100644
index bf471f2b3c208..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile-rejected.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverseTo-transitionWhile-rejected.html]
- [traverseTo() promise rejection with rejected transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile.html.ini
deleted file mode 100644
index 5a1f1ec15b5c9..0000000000000
--- a/testing/web-platform/meta/navigation-api/navigation-methods/return-value/traverseTo-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[traverseTo-transitionWhile.html]
- [traverseTo() and transitionWhile() with a fulfilled promise]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html.ini
new file mode 100644
index 0000000000000..b5053b7ca43ea
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept-reject.html.ini
@@ -0,0 +1,8 @@
+[anchor-download-intercept-reject.html]
+ [event and promise ordering for intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
+
+
+[anchor-download-intercept-reject.html?currententrychange]
+ [event and promise ordering for intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept.html.ini
new file mode 100644
index 0000000000000..c5ae1be5aeac1
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-intercept.html.ini
@@ -0,0 +1,8 @@
+[anchor-download-intercept.html?currententrychange]
+ [event and promise ordering for intercepted by intercept()]
+ expected: FAIL
+
+
+[anchor-download-intercept.html]
+ [event and promise ordering for intercepted by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile-reject.html.ini
deleted file mode 100644
index aeeffbeb81890..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile-reject.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[anchor-download-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[anchor-download-transitionWhile-reject.html]
- [event and promise ordering for intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile.html.ini
deleted file mode 100644
index 258141f6cf244..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download-transitionWhile.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[anchor-download-transitionWhile.html?currententrychange]
- [event and promise ordering for intercepted by transitionWhile()]
- expected: FAIL
-
-
-[anchor-download-transitionWhile.html]
- [event and promise ordering for intercepted by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download.html.ini
index a9e767ead7b56..07b33ceac3310 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/anchor-download.html.ini
@@ -1,3 +1,6 @@
[anchor-download.html]
[ fires navigate, but not navigatesuccess or navigateerror when not intercepted by transitionWhile()]
expected: FAIL
+
+ [ fires navigate, but not navigatesuccess or navigateerror when not intercepted by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html.ini
new file mode 100644
index 0000000000000..f57ffca0f4723
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept-reject.html.ini
@@ -0,0 +1,8 @@
+[back-same-document-intercept-reject.html?currententrychange]
+ [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
+
+
+[back-same-document-intercept-reject.html]
+ [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept.html.ini
new file mode 100644
index 0000000000000..e2a98589a4eff
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-intercept.html.ini
@@ -0,0 +1,8 @@
+[back-same-document-intercept.html]
+ [event and promise ordering for same-document navigation.back() intercepted by intercept()]
+ expected: FAIL
+
+
+[back-same-document-intercept.html?currententrychange]
+ [event and promise ordering for same-document navigation.back() intercepted by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html.ini
deleted file mode 100644
index b08583c468ce4..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[back-same-document-transitionWhile-reject.html]
- [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[back-same-document-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
- [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[back-same-document-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for same-document navigation.back() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html.ini
deleted file mode 100644
index 6f5cf634905ff..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[back-same-document-transitionWhile.html]
- [event and promise ordering for same-document navigation.back() intercepted by transitionWhile()]
- expected: FAIL
-
-
-[back-same-document-transitionWhile.html?currententrychange]
- [event and promise ordering for same-document navigation.back() intercepted by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html.ini
similarity index 65%
rename from testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html.ini
index 8b85f50b62cbc..32d4103fd75c9 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/currententrychange-before-popstate-intercept.html.ini
@@ -1,3 +1,3 @@
-[currententrychange-before-popstate-transitionWhile.html]
+[currententrychange-before-popstate-intercept.html]
[currententrychange fires before popstate for navigation.back() and navigation.forward()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/intercept-async.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/intercept-async.html.ini
new file mode 100644
index 0000000000000..238cada2c4967
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/intercept-async.html.ini
@@ -0,0 +1,8 @@
+[intercept-async.html?currententrychange]
+ [ordering when intercept() handler has sync and async blocks]
+ expected: FAIL
+
+
+[intercept-async.html]
+ [ordering when intercept() handler has sync and async blocks]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-intercept.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-intercept.html.ini
new file mode 100644
index 0000000000000..7583c712c42fc
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-intercept.html.ini
@@ -0,0 +1,8 @@
+[location-href-double-intercept.html?currententrychange]
+ [event and promise ordering when location.href is set repeatedly and handled by intercept()]
+ expected: FAIL
+
+
+[location-href-double-intercept.html]
+ [event and promise ordering when location.href is set repeatedly and handled by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html.ini
deleted file mode 100644
index cb46f77e553cd..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[location-href-double-transitionWhile.html?currententrychange]
- [event and promise ordering when location.href is set repeatedly and handled by transitionWhile()]
- expected: FAIL
-
-
-[location-href-double-transitionWhile.html]
- [event and promise ordering when location.href is set repeatedly and handled by transitionWhile()]
- expected: FAIL
-
-
-[location-href-double-transitionWhile.html?currententrychange]
- [event and promise ordering when location.href is set repeatedly and handled by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html.ini
new file mode 100644
index 0000000000000..75a8fe6e67af9
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reentrant.html.ini
@@ -0,0 +1,8 @@
+[location-href-intercept-reentrant.html]
+ [event and promise ordering for the location.href setter intercepted by intercept() where we set location.href again inside the navigate handler]
+ expected: FAIL
+
+
+[location-href-intercept-reentrant.html?currententrychange]
+ [event and promise ordering for the location.href setter intercepted by intercept() where we set location.href again inside the navigate handler]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reject.html.ini
new file mode 100644
index 0000000000000..d915b7e37b362
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept-reject.html.ini
@@ -0,0 +1,8 @@
+[location-href-intercept-reject.html?currententrychange]
+ [event and promise ordering for location.href setter intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
+
+
+[location-href-intercept-reject.html]
+ [event and promise ordering for location.href setter intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept.html.ini
new file mode 100644
index 0000000000000..5a36a44763612
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-intercept.html.ini
@@ -0,0 +1,8 @@
+[location-href-intercept.html?currententrychange]
+ [event and promise ordering for location.href setter intercepted by intercept()]
+ expected: FAIL
+
+
+[location-href-intercept.html]
+ [event and promise ordering for location.href setter intercepted by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html.ini
deleted file mode 100644
index 5036ba824ea73..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[location-href-transitionWhile-reentrant.html?currententrychange]
- [event and promise ordering for the location.href setter intercepted by transitionWhile() where we set location.href again inside the navigate handler]
- expected: FAIL
-
-
-[location-href-transitionWhile-reentrant.html]
- [event and promise ordering for the location.href setter intercepted by transitionWhile() where we set location.href again inside the navigate handler]
- expected: FAIL
-
-
-[location-href-transitionWhile-reentrant.html?currententrychange]
- [event and promise ordering for the location.href setter intercepted by transitionWhile() where we set location.href again inside the navigate handler]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html.ini
deleted file mode 100644
index 9f0aa859beeba..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[location-href-transitionWhile-reject.html]
- [event and promise ordering for location.href setter intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[location-href-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for location.href setter intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[location-href-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for location.href setter intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile.html.ini
deleted file mode 100644
index 2a551af199761..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/location-href-transitionWhile.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[location-href-transitionWhile.html]
- [event and promise ordering for location.href setter intercepted by transitionWhile()]
- expected: FAIL
-
-
-[location-href-transitionWhile.html?currententrychange]
- [event and promise ordering for location.href setter intercepted by transitionWhile()]
- expected: FAIL
-
-
-[location-href-transitionWhile.html?currententrychange]
- [event and promise ordering for location.href setter intercepted by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-intercept.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-intercept.html.ini
new file mode 100644
index 0000000000000..b3b09ce2c502f
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-intercept.html.ini
@@ -0,0 +1,8 @@
+[navigate-double-intercept.html?currententrychange]
+ [event and promise ordering when navigate() is called repeatedly and handled by intercept()]
+ expected: FAIL
+
+
+[navigate-double-intercept.html]
+ [event and promise ordering when navigate() is called repeatedly and handled by intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html.ini
deleted file mode 100644
index bd67f947e265f..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[navigate-double-transitionWhile.html?currententrychange]
- [event and promise ordering when navigate() is called repeatedly and handled by transitionWhile()]
- expected: FAIL
-
-
-[navigate-double-transitionWhile.html]
- [event and promise ordering when navigate() is called repeatedly and handled by transitionWhile()]
- expected: FAIL
-
-
-[navigate-double-transitionWhile.html?currententrychange]
- [event and promise ordering when navigate() is called repeatedly and handled by transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept-stop.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept-stop.html.ini
new file mode 100644
index 0000000000000..63f62d9af5033
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept-stop.html.ini
@@ -0,0 +1,8 @@
+[navigate-intercept-stop.html?currententrychange]
+ [event and promise ordering for navigation.navigate() intercepted by intercept() but then stopped using window.stop()]
+ expected: FAIL
+
+
+[navigate-intercept-stop.html]
+ [event and promise ordering for navigation.navigate() intercepted by intercept() but then stopped using window.stop()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept.html.ini
similarity index 50%
rename from testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept.html.ini
index c05f617b0eab8..0f00911eb0dc1 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-intercept.html.ini
@@ -1,8 +1,8 @@
-[navigate-transitionWhile.html]
- [event and promise ordering for same-document navigation.navigate() intercepted by transitionWhile()]
+[navigate-intercept.html?currententrychange]
+ [event and promise ordering for same-document navigation.navigate() intercepted by intercept()]
expected: FAIL
-[navigate-transitionWhile.html?currententrychange]
- [event and promise ordering for same-document navigation.navigate() intercepted by transitionWhile()]
+[navigate-intercept.html]
+ [event and promise ordering for same-document navigation.navigate() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html.ini
similarity index 64%
rename from testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html.ini
rename to testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html.ini
index 90478aa9489d1..d1967085e4c01 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reentrant.html.ini
@@ -1,8 +1,8 @@
-[navigate-same-document-transitionWhile-reentrant.html]
+[navigate-same-document-intercept-reentrant.html?currententrychange]
[event and promise ordering for same-document navigation.navigate() inside the navigate handler]
expected: FAIL
-[navigate-same-document-transitionWhile-reentrant.html?currententrychange]
+[navigate-same-document-intercept-reentrant.html]
[event and promise ordering for same-document navigation.navigate() inside the navigate handler]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html.ini
new file mode 100644
index 0000000000000..00ec0e58cb8ed
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html.ini
@@ -0,0 +1,8 @@
+[navigate-same-document-intercept-reject.html]
+ [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
+
+
+[navigate-same-document-intercept-reject.html?currententrychange]
+ [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html.ini
deleted file mode 100644
index 9ac88761dc812..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[navigate-same-document-transitionWhile-reject.html]
- [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
- [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[navigate-same-document-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
-
-
-[navigate-same-document-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html.ini
deleted file mode 100644
index 09a4d270d98c4..0000000000000
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[navigate-transitionWhile-stop.html?currententrychange]
- [event and promise ordering for navigation.navigate() intercepted by transitionWhile() but then stopped using window.stop()]
- expected: FAIL
-
-
-[navigate-transitionWhile-stop.html]
- [event and promise ordering for navigation.navigate() intercepted by transitionWhile() but then stopped using window.stop()]
- expected: FAIL
-
- [event and promise ordering for navigation.navigate() intercepted by transitionWhile() but then stopped using window.stop()]
- expected: FAIL
-
-
-[navigate-transitionWhile-stop.html?currententrychange]
- [event and promise ordering for navigation.navigate() intercepted by transitionWhile() but then stopped using window.stop()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept-reject.html.ini
similarity index 56%
rename from testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept-reject.html.ini
index f1cffb8f9de31..4508f75090790 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept-reject.html.ini
@@ -1,8 +1,8 @@
-[reload-transitionWhile.html?currententrychange]
- [event and promise ordering for navigation.reload() intercepted by transitionWhile()]
+[reload-intercept-reject.html?currententrychange]
+ [event and promise ordering for navigation.reload() intercepted by intercept()]
expected: FAIL
-[reload-transitionWhile.html]
- [event and promise ordering for navigation.reload() intercepted by transitionWhile()]
+[reload-intercept-reject.html]
+ [event and promise ordering for navigation.reload() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept.html.ini
similarity index 54%
rename from testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html.ini
rename to testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept.html.ini
index b4da9b86f6674..2b25e075246dc 100644
--- a/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html.ini
+++ b/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept.html.ini
@@ -1,8 +1,8 @@
-[reload-transitionWhile-reject.html]
- [event and promise ordering for navigation.reload() intercepted by transitionWhile()]
+[reload-intercept.html?currententrychange]
+ [event and promise ordering for navigation.reload() intercepted by intercept()]
expected: FAIL
-[reload-transitionWhile-reject.html?currententrychange]
- [event and promise ordering for navigation.reload() intercepted by transitionWhile()]
+[reload-intercept.html]
+ [event and promise ordering for navigation.reload() intercepted by intercept()]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-intercept.html.ini
similarity index 64%
rename from testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-transitionWhile.html.ini
rename to testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-intercept.html.ini
index bfe16b1c4b00a..9f1b6e1ce46e6 100644
--- a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-transitionWhile.html.ini
+++ b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-intercept.html.ini
@@ -1,3 +1,3 @@
-[dispose-same-document-transitionWhile.html]
+[dispose-same-document-intercept.html]
[dispose events when forward-pruning same-document entries]
expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html.ini b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html.ini
new file mode 100644
index 0000000000000..3a262735ad72a
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-intercept.html.ini
@@ -0,0 +1,3 @@
+[dispose-same-document-reload-with-intercept.html]
+ [dispose events are not fired when doing a same-document reload using navigation.reload() and intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-transitionWhile.html.ini
deleted file mode 100644
index 4a02368c0f42e..0000000000000
--- a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-reload-with-transitionWhile.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[dispose-same-document-reload-with-transitionWhile.html]
- [dispose events are not fired when doing a same-document reload using navigation.reload() and transitionWhile()]
- expected: FAIL
-
- [dispose events are not fired when doing a same-document reload using navigation.reload() and transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html.ini b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html.ini
new file mode 100644
index 0000000000000..2cc394d211173
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-intercept.html.ini
@@ -0,0 +1,3 @@
+[dispose-same-document-replace-with-intercept.html]
+ [dispose events when doing a same-document replace using navigation.navigate() and intercept()]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-transitionWhile.html.ini b/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-transitionWhile.html.ini
deleted file mode 100644
index 059daf68d38ea..0000000000000
--- a/testing/web-platform/meta/navigation-api/per-entry-events/dispose-same-document-replace-with-transitionWhile.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[dispose-same-document-replace-with-transitionWhile.html]
- [dispose events when doing a same-document replace using navigation.navigate() and transitionWhile()]
- expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-intercept-handler-modifies.html.ini b/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-intercept-handler-modifies.html.ini
new file mode 100644
index 0000000000000..210a618b65c46
--- /dev/null
+++ b/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-intercept-handler-modifies.html.ini
@@ -0,0 +1,3 @@
+[after-transition-intercept-handler-modifies.html]
+ [scrollRestoration: state should be saved before intercept handlers run]
+ expected: FAIL
diff --git a/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-reject.html.ini b/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-reject.html.ini
index 8fa673c06de8c..8519cd9d75062 100644
--- a/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-reject.html.ini
+++ b/testing/web-platform/meta/navigation-api/scroll-restoration/after-transition-reject.html.ini
@@ -1,3 +1,6 @@
[after-transition-reject.html]
[scrollRestoration: after-transition should not scroll when the transitionWhile promise rejects]
expected: FAIL
+
+ [scrollRestoration: after-transition should not scroll when the intercept() handler rejects]
+ expected: FAIL