From a9024f593319b18680ec320a8190150cadb1aa5d Mon Sep 17 00:00:00 2001
From: Domenic Denicola <domenic@chromium.org>
Date: Thu, 24 Mar 2022 11:59:17 +0000
Subject: [PATCH] Bug 1760217 [wpt PR 33184] - App history API to navigation
 API rename (3/n), a=testonly

Automatic update from web-platform-tests
App history API to navigation API rename (3/n)

See https://github.com/WICG/navigation-api/issues/83 and https://github.com/WICG/navigation-api/pull/203 for context.

This CL is scoped mostly to the third_party/blink/renderer/core/app_history directory. That directory itself has been renamed from app_history to navigation_api. Its contents also follow the new naming. Notably, this includes changing all the IDL interface names and their backing classes, which has minor web-exposed implications.

Code outside of that directory is mostly updated due to the change from blink::AppHistory to blink::NavigationApi. References to app history still exist in Blink outside of that directory, as well as within Chromium at large; those will be tackled in a future CL.

This also finishes the process of updating the web platform tests, by both updating the actual test code for the interface renames, and updating various test descriptions and comments.

Bug: 1300246
Change-Id: I244e5fbb5d7977e8d61edae1e59d7bbfb6bdc75c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3522964
Reviewed-by: Nate Chapin <japhet@chromium.org>
Commit-Queue: Domenic Denicola <domenic@chromium.org>
Cr-Commit-Position: refs/heads/main@{#981804}

--

wpt-commits: 3f00a909b6e15e281fe3dbbac376542465cc5232
wpt-pr: 33184
---
 .../web-platform/tests/navigation-api/README.md  | 11 -----------
 .../currententrychange-event/anchor-click.html   |  2 +-
 .../currententrychange-event/constructor.html    |  8 ++++----
 .../history-back-same-doc.html                   |  2 +-
 .../history-pushState.html                       |  2 +-
 .../history-replaceState.html                    |  2 +-
 .../currententrychange-event/location-api.html   |  2 +-
 ...-from-initial-about-blank-same-doc-popup.html |  2 +-
 ...vigate-from-initial-about-blank-same-doc.html |  2 +-
 .../navigate-from-initial-about-blank.html       |  2 +-
 .../navigation-back-forward-cross-doc.html       |  2 +-
 .../navigation-back-forward-same-doc.html        |  2 +-
 .../navigation-navigate-cross-doc.html           |  2 +-
 .../navigation-navigate-preventDefault.html      |  2 +-
 .../navigation-navigate-replace-cross-doc.html   |  2 +-
 .../navigation-navigate-replace-same-doc.html    |  2 +-
 ...igation-navigate-replace-transitionWhile.html |  2 +-
 .../navigation-navigate-same-doc.html            |  2 +-
 .../navigation-navigate-transitionWhile.html     |  2 +-
 .../navigation-reload-cross-doc.html             |  2 +-
 .../navigation-reload-transitionWhile.html       |  2 +-
 .../navigation-updateCurrentEntry.html           |  2 +-
 .../currententrychange-event/properties.html     |  4 ++--
 .../navigate-event/event-constructor.html        | 16 ++++++++--------
 .../signal-abort-detach-in-onnavigate.html       |  2 +-
 .../signal-abort-preventDefault.html             |  2 +-
 .../signal-abort-transitionWhile.html            |  2 +-
 ...-abort-window-stop-after-transitionWhile.html |  2 +-
 .../signal-abort-window-stop-in-onnavigate.html  |  2 +-
 .../navigate-event/signal-abort-window-stop.html |  2 +-
 .../transitionWhile-after-dispatch.html          |  2 +-
 .../transitionWhile-canceled-event.html          |  2 +-
 ...ansitionWhile-cross-document-same-origin.html |  2 +-
 .../transitionWhile-cross-origin.html            |  2 +-
 .../navigate-event/transitionWhile-detach.html   |  2 +-
 .../transitionWhile-history-pushState.html       |  2 +-
 .../transitionWhile-history-replaceState.html    |  2 +-
 .../transitionWhile-multiple-times-reject.html   |  2 +-
 .../transitionWhile-multiple-times.html          |  2 +-
 .../transitionWhile-navigation-back.html         |  2 +-
 .../transitionWhile-on-synthetic-event.html      |  6 +++---
 .../navigate-event/transitionWhile-reject.html   |  2 +-
 .../navigate-event/transitionWhile-resolve.html  |  2 +-
 ...ansitionWhile-same-document-history-back.html |  2 +-
 .../entries-after-bfcache.html                   |  2 +-
 .../entries-after-blank-navigation.html          |  2 +-
 .../entries-after-blob-navigation.html           |  2 +-
 .../entries-after-javascript-url-navigation.html |  2 +-
 .../entries-after-srcdoc-navigation.html         |  2 +-
 .../entries-in-new-javascript-url-iframe.html    |  2 +-
 .../entries-in-new-srcdoc-iframe.html            |  2 +-
 .../entry-after-detach.html                      |  2 +-
 .../index-not-in-entries.html                    |  2 +-
 .../key-id-back-cross-document.html              |  2 +-
 .../key-id-back-same-document.html               |  2 +-
 .../key-id-location-reload-transitionWhile.html  |  2 +-
 .../key-id-location-reload.html                  |  2 +-
 .../key-id-location-replace-cross-origin.html    |  2 +-
 .../key-id-location-replace.html                 |  2 +-
 .../no-referrer-from-meta-url-censored.html      |  2 +-
 .../no-referrer-url-censored.html                |  2 +-
 .../opaque-origin-data-url.html                  |  2 +-
 .../sameDocument-after-fragment-navigate.html    |  2 +-
 .../sameDocument-after-navigate.html             |  2 +-
 .../navigation-methods/reload-base-url.html      |  2 +-
 .../reload-state-and-info.html                   |  2 +-
 .../return-value/resources/helpers.js            |  8 ++++----
 ...ach-between-navigate-and-navigatesuccess.html |  4 ++--
 ...ack-same-document-transitionWhile-reject.html |  2 +-
 .../back-same-document-transitionWhile.html      |  2 +-
 .../back-same-document.html                      |  2 +-
 ...rychange-before-popstate-transitionWhile.html |  2 +-
 .../currententrychange-dispose-ordering.html     |  2 +-
 .../location-href-canceled.html                  |  2 +-
 .../location-href-double-transitionWhile.html    |  2 +-
 .../location-href-transitionWhile-reentrant.html |  2 +-
 .../location-href-transitionWhile-reject.html    |  2 +-
 .../location-href-transitionWhile.html           |  2 +-
 .../navigate-canceled.html                       |  2 +-
 .../navigate-double-transitionWhile.html         |  2 +-
 .../navigate-in-transition-finished.html         |  2 +-
 ...-same-document-transitionWhile-reentrant.html |  2 +-
 ...ate-same-document-transitionWhile-reject.html |  2 +-
 .../navigate-same-document.html                  |  2 +-
 .../navigate-transitionWhile-stop.html           |  2 +-
 .../navigate-transitionWhile.html                |  2 +-
 .../ordering-and-transition/reload-canceled.html |  2 +-
 .../reload-transitionWhile-reject.html           |  2 +-
 .../reload-transitionWhile.html                  |  2 +-
 .../resources/helpers.mjs                        |  2 +-
 .../transition-realms-and-identity.html          |  2 +-
 .../state/cross-document-away-and-back.html      |  2 +-
 .../state/cross-document-location-api.html       |  2 +-
 .../navigation-api/state/history-pushState.html  |  2 +-
 .../state/history-replaceState.html              |  2 +-
 .../navigation-api/state/location-reload.html    |  2 +-
 ...same-document-away-and-back-location-api.html |  2 +-
 ...me-document-away-and-back-navigation-api.html |  2 +-
 .../cross-document-away-and-back.html            |  2 +-
 .../cross-document-location-api.html             |  2 +-
 .../history-pushState.html                       |  2 +-
 .../history-replaceState.html                    |  2 +-
 .../location-reload.html                         |  2 +-
 ...same-document-away-and-back-location-api.html |  2 +-
 104 files changed, 120 insertions(+), 131 deletions(-)
 delete mode 100644 testing/web-platform/tests/navigation-api/README.md

diff --git a/testing/web-platform/tests/navigation-api/README.md b/testing/web-platform/tests/navigation-api/README.md
deleted file mode 100644
index 068ae5b711474..0000000000000
--- a/testing/web-platform/tests/navigation-api/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Navigation API tests
-
-This directory contains tests for the
-[navigation API](https://wicg.github.io/navigation-api/),
-[formerly known as](https://github.com/WICG/navigation-api/issues/83) the app
-history API.
-
-The tests are currently being updated for the rename, and so are likely to have
-filenames, descriptions, etc. which don't match the spec, or mismatch the
-contents of the test. The rename is being done in stages and tracked at
-<https://crbug.com/1300246>.
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/anchor-click.html b/testing/web-platform/tests/navigation-api/currententrychange-event/anchor-click.html
index 55e45561351ff..e0bf91166aa23 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/anchor-click.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/anchor-click.html
@@ -14,5 +14,5 @@
   });
   a.click();
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for link click");
+}, "currententrychange fires for link click");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/constructor.html b/testing/web-platform/tests/navigation-api/currententrychange-event/constructor.html
index 64ea8cf37ebd5..b09e68e1c71e0 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/constructor.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/constructor.html
@@ -4,20 +4,20 @@
 <script>
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryCurrentChangeEvent("currententrychange");
+    new NavigationCurrentEntryChangeEvent("currententrychange");
   });
 }, "can't bypass required members by omitting the dictionary entirely");
 
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryCurrentChangeEvent("currententrychange", {
+    new NavigationCurrentEntryChangeEvent("currententrychange", {
       navigationType: "push"
     });
   });
 }, "from is required");
 
 test(() => {
-  const event = new AppHistoryCurrentChangeEvent("currententrychange", {
+  const event = new NavigationCurrentEntryChangeEvent("currententrychange", {
     navigationType: "replace",
     from: navigation.currentEntry
   });
@@ -26,7 +26,7 @@
 }, "all properties are reflected back");
 
 test(t => {
-  const event = new AppHistoryCurrentChangeEvent("currententrychange", { from: navigation.currentEntry });
+  const event = new NavigationCurrentEntryChangeEvent("currententrychange", { from: navigation.currentEntry });
   assert_equals(event.navigationType, null);
 }, "defaults are as expected");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/history-back-same-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/history-back-same-doc.html
index bee3649395a8b..768805b7526fc 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/history-back-same-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/history-back-same-doc.html
@@ -20,5 +20,5 @@
   assert_false(oncurrententrychange_called);
   await new Promise(resolve => window.onpopstate = resolve);
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.back()");
+}, "currententrychange fires for history.back()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/history-pushState.html b/testing/web-platform/tests/navigation-api/currententrychange-event/history-pushState.html
index c0e2d9a783cbe..1a17a7cec0cad 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/history-pushState.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/history-pushState.html
@@ -12,5 +12,5 @@
   });
   history.pushState(1, "", "#1");
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.pushState()");
+}, "currententrychange fires for history.pushState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/history-replaceState.html b/testing/web-platform/tests/navigation-api/currententrychange-event/history-replaceState.html
index da5505a6c14a2..e8ae8ee57a2c7 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/history-replaceState.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/history-replaceState.html
@@ -14,5 +14,5 @@
   });
   history.replaceState(1, "", "#1");
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for history.replaceState()");
+}, "currententrychange fires for history.replaceState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/location-api.html b/testing/web-platform/tests/navigation-api/currententrychange-event/location-api.html
index f06dc8ec61594..88ebd985a1e98 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/location-api.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/location-api.html
@@ -14,5 +14,5 @@
   });
   location.hash = "#foo";
   assert_true(oncurrententrychange_called);
-}, "AppHistoryCurrentChangeEvent fires for location API navigations");
+}, "currententrychange fires for location API navigations");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html
index a8aa2a25fb51c..2399fb2ef9cc8 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc-popup.html
@@ -11,5 +11,5 @@
   assert_equals(w.location.href, "about:blank#2");
 
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank (popup window)");
+}, "currententrychange does not fire when navigating away from the initial about:blank (popup window)");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html
index e2c56743588e0..f0fa9cdf57b70 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank-same-doc.html
@@ -8,5 +8,5 @@
   i.contentWindow.location.href = "about:blank#1";
   i.contentWindow.location.href = "about:blank#2";
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank");
+}, "currententrychange does not fire when navigating away from the initial about:blank");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html
index 7b406c733c4a1..56eaa1af265b4 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigate-from-initial-about-blank.html
@@ -7,5 +7,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire");
   i.contentWindow.navigation.navigate("/common/blank.html");
   await new Promise(resolve => t.step_timeout(resolve, 10));
-}, "AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank");
+}, "currententrychange does not fire when navigating away from the initial about:blank");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html
index df230bd9acb5d..7416caa94b1f6 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-cross-doc.html
@@ -16,5 +16,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.forward();
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.back() and navigation.forward()");
+}, "currententrychange does not fire for cross-document navigation.back() and navigation.forward()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html
index 41cc4afd446e6..8182673aa59dc 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-back-forward-same-doc.html
@@ -36,5 +36,5 @@
   assert_false(oncurrententrychange_forward_called);
   await forward_result.committed.then(() => forward_committed = true);
   assert_true(oncurrententrychange_forward_called);
-}, "AppHistoryCurrentChangeEvent fires for navigation.back() and navigation.forward()");
+}, "currententrychange fires for same-document navigation.back() and navigation.forward()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html
index 2f804a307f6cb..81a4e239baeef 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-cross-doc.html
@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.navigate("/common/blank.html?1");
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.navigate()");
+}, "currententrychange does not fire for cross-document navigation.navigate()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html
index 997fb559492c7..34b98353ba374 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-preventDefault.html
@@ -6,5 +6,5 @@
   navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire");
   navigation.onnavigate = e => e.preventDefault();
   await promise_rejects_dom(t, "AbortError", navigation.navigate("#foo").committed);
-}, "AppHistoryCurrentChangeEvent does not fire when onnavigate preventDefault() is called");
+}, "currententrychange does not fire when onnavigate preventDefault() is called");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html
index 52478f22799b0..d37ba34d62bc9 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-cross-doc.html
@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.navigate("/common/blank.html?1", { replace: true });
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.navigate() with replace");
+}, "currententrychange does not fire for cross-document navigation.navigate() with replace");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html
index a402770968794..1c0f985b9854f 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-same-doc.html
@@ -19,5 +19,5 @@
   let result = navigation.navigate("#foo", { replace: true });
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() with replace");
+}, "currententrychange fires for navigation.navigate() with replace");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html
index 55b314a554d25..a8babf298dc2b 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-replace-transitionWhile.html
@@ -19,5 +19,5 @@
   let result = i.contentWindow.navigation.navigate("/common/blank.html?1", { replace: true });
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() with replace intercepted by transitionWhile");
+}, "currententrychange fires for navigation.navigate() with replace intercepted by transitionWhile()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html
index 96de3de6d3d62..87fc28d174a6c 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-same-doc.html
@@ -17,5 +17,5 @@
   let result = navigation.navigate("#foo");
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate()");
+}, "currententrychange fires for navigation.navigate()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html
index 2132016404dd1..e5855cf63e815 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-navigate-transitionWhile.html
@@ -17,5 +17,5 @@
   let result = i.contentWindow.navigation.navigate("/common/blank.html?1");
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.navigate() intercepted by transitionWhile");
+}, "currententrychange fires for navigation.navigate() intercepted by transitionWhile()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html
index cb4279cfe53f4..e590cab3828e3 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-cross-doc.html
@@ -8,5 +8,5 @@
   i.contentWindow.navigation.oncurrententrychange = t.unreached_func("currententrychange should not fire for cross-document navigations");
   i.contentWindow.navigation.reload();
   await new Promise(resolve => i.onload = resolve);
-}, "AppHistoryCurrentChangeEvent does not fire for cross-document navigation.reload()");
+}, "currententrychange does not fire for cross-document navigation.reload()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html
index cfa6258dc578d..c732de941f7ed 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-reload-transitionWhile.html
@@ -17,5 +17,5 @@
   let result = i.contentWindow.navigation.reload();
   assert_true(oncurrententrychange_called);
   await result.committed;
-}, "AppHistoryCurrentChangeEvent fires for navigation.reload() intercepted by transitionWhile");
+}, "currententrychange fires for navigation.reload() intercepted by transitionWhile()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html
index 8d548706be938..4423b2bc90e1c 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/navigation-updateCurrentEntry.html
@@ -16,5 +16,5 @@
   // "Updating" the state to the current state should still fire currententrychange.
   navigation.updateCurrentEntry({ state: navigation.currentEntry.getState() });
   assert_equals(oncurrententrychange_count, 2);
-}, "AppHistoryCurrentChangeEvent fires for navigation.updateCurrentEntry()");
+}, "currententrychange fires for navigation.updateCurrentEntry()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/currententrychange-event/properties.html b/testing/web-platform/tests/navigation-api/currententrychange-event/properties.html
index 7048034e4f051..e862543bcc1ec 100644
--- a/testing/web-platform/tests/navigation-api/currententrychange-event/properties.html
+++ b/testing/web-platform/tests/navigation-api/currententrychange-event/properties.html
@@ -4,11 +4,11 @@
 <script>
 async_test(t => {
   navigation.oncurrententrychange = t.step_func_done(e => {
-    assert_equals(e.constructor, AppHistoryCurrentChangeEvent);
+    assert_equals(e.constructor, NavigationCurrentEntryChangeEvent);
     assert_false(e.bubbles);
     assert_false(e.cancelable);
     assert_true(e.isTrusted);
   });
   location.href = "#1";
-}, "AppHistoryCurrentChangeEvent's properties");
+}, "NavigationCurrentEntryChangeEvent's properties");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/event-constructor.html b/testing/web-platform/tests/navigation-api/navigate-event/event-constructor.html
index 501857feba447..6ef5cdfc91195 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/event-constructor.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/event-constructor.html
@@ -4,13 +4,13 @@
 <script>
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryNavigateEvent("navigate");
+    new NavigateEvent("navigate");
   });
 }, "can't bypass required members by omitting the dictionary entirely");
 
 test(() => {
   assert_throws_js(TypeError, () => {
-    new AppHistoryNavigateEvent("navigate", {
+    new NavigateEvent("navigate", {
       navigationType: "push",
       canTransition: false,
       userInitiated: false,
@@ -23,10 +23,10 @@
 }, "destination is required");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
     assert_throws_js(TypeError, () => {
-      new AppHistoryNavigateEvent("navigate", {
+      new NavigateEvent("navigate", {
         navigationType: "push",
         destination: e.destination,
         canTransition: false,
@@ -41,13 +41,13 @@
 }, "signal is required");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
     const info = { some: "object with identity" };
     const formData = new FormData();
     const signal = (new AbortController()).signal;
 
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       navigationType: "replace",
       destination: e.destination,
       canTransition: true,
@@ -71,9 +71,9 @@
 }, "all properties are reflected back");
 
 async_test(t => {
-  // We need to grab an AppHistoryDestination.
+  // We need to grab an NavigationDestination.
   navigation.onnavigate = t.step_func_done(e => {
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       destination: e.destination,
       signal: (new AbortController()).signal
     });
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html
index adef895565b9b..467ea88899323 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-detach-in-onnavigate.html
@@ -17,5 +17,5 @@
   await promise_rejects_dom(t, 'AbortError', iframe_constructor, i.contentWindow.navigation.navigate("#1").committed);
   assert_true(abort_signal.aborted);
   assert_true(onabort_called);
-}, "window detach inside AppHistoryNavigateEvent signals AppHistoryNavigateEvent.signal");
+}, "window detach inside a navigate event signals event.signal");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-preventDefault.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-preventDefault.html
index f281617866c0c..60fed90ce6c36 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-preventDefault.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-preventDefault.html
@@ -15,5 +15,5 @@
   await promise_rejects_dom(t, 'AbortError', navigation.navigate("?1").committed);
   assert_true(abort_signal.aborted);
   assert_array_equals(events, ["onabort", "onnavigateerror"]);
-}, "AppHistoryNavigateEvent.preventDefault signals AppHistoryNavigateEvent.signal");
+}, "event.preventDefault() signals event.signal");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-transitionWhile.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-transitionWhile.html
index d90ee5b0837c4..ce195cf677229 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-transitionWhile.html
@@ -14,5 +14,5 @@
   await navigation.navigate("?1").finished;
   assert_false(abort_signal.aborted);
   assert_false(onabort_called);
-}, "AppHistoryNavigateEvent's transitionWhile() does not signal AppHistoryNavigateEvent's signal");
+}, "event.transitionWhile() does not signal event.signal");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html
index aad3be34d7e80..bc44a07b20e83 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-after-transitionWhile.html
@@ -36,5 +36,5 @@
       t.step_timeout(t.step_func_done(() => {}), 5);
     });
   });
-}, "window.stop() cancels AppHistoryNavigateEvent's transitionWhile() and signals AppHistoryNavigateEvent's signal");
+}, "window.stop() cancels the navigate event's transitionWhile() and signals event.signal");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html
index dde666c933861..1b406c42d367f 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop-in-onnavigate.html
@@ -20,5 +20,5 @@
     assert_true(onabort_called);
     assert_true(canceled_in_second_handler);
   });
-}, "window.stop() signals AppHistoryNavigateEvent.signal inside a navigate event handler");
+}, "window.stop() signals event.signal inside a navigate event handler");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop.html b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop.html
index 49399fb663777..43e005e8b4118 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/signal-abort-window-stop.html
@@ -19,5 +19,5 @@
     // didn't fire on a microtask.
     t.step_timeout(t.step_func_done(() => {}), 0);
   });
-}, "window.stop() signals AppHistoryNavigateEvent.signal");
+}, "window.stop() signals event.signal");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-after-dispatch.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-after-dispatch.html
index 7f4a25cef528a..910665cb3deb5 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-after-dispatch.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-after-dispatch.html
@@ -12,5 +12,5 @@
   });
 
   location.href = "#1";
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used after the dispatch phase");
+}, "event.transitionWhile() throws if used after the dispatch phase");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-canceled-event.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-canceled-event.html
index ed6dbdc85cfe0..f1fe3ece38bf2 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-canceled-event.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-canceled-event.html
@@ -13,5 +13,5 @@
 
   location.href = "#1";
   assert_true(assertionHappened);
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used on a canceled event");
+}, "event.transitionWhile() throws if used on a canceled event");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html
index 79e03f1c397c5..9e55958c53378 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-document-same-origin.html
@@ -15,5 +15,5 @@
   });
 
   window.onload = t.step_func(() => location.href = target_url);
-}, "AppHistoryNavigateEvent's transitionWhile() intercepts a same-origin cross-document navigation");
+}, "event.transitionWhile() intercepts a same-origin cross-document navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-origin.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-origin.html
index ece79d2635718..e53371a96a2ce 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-origin.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-cross-origin.html
@@ -14,5 +14,5 @@
   });
 
   window.onload = t.step_func(() => location.href = get_host_info().HTTPS_REMOTE_ORIGIN);
-}, "AppHistoryNavigateEvent's transitionWhile() should throw if called for a cross origin navigation");
+}, "event.transitionWhile() should throw if called for a cross origin navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-detach.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-detach.html
index d6a7d536276b6..25159850803d8 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-detach.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-detach.html
@@ -13,5 +13,5 @@
 
     i.contentWindow.location.href = "#1";
   });
-}, "AppHistoryNavigateEvent's transitionWhile() throws if used on an event from a detached iframe");
+}, "event.transitionWhile() throws if used on an event from a detached iframe");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-pushState.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-pushState.html
index fb6152fc2289f..a08e4ea282376 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-pushState.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-pushState.html
@@ -19,5 +19,5 @@
   assert_equals(location.hash, "#1");
   assert_equals(history.state, "update");
   assert_equals(history.length, start_length + 1);
-}, "AppHistoryNavigateEvent's transitionWhile() should proceed if the given promise resolves");
+}, "event.transitionWhile() should proceed if the given promise resolves");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-replaceState.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-replaceState.html
index 00f85dcc0fcc9..e575876de245b 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-replaceState.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-history-replaceState.html
@@ -19,5 +19,5 @@
   assert_equals(location.hash, "#1");
   assert_equals(history.state, "update");
   assert_equals(history.length, start_length);
-}, "AppHistoryNavigateEvent's transitionWhile() should proceed if the given promise resolves");
+}, "event.transitionWhile() should proceed if the given promise resolves");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html
index c325829001572..0532d755fd343 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times-reject.html
@@ -31,5 +31,5 @@
   }));
   assert_true(onnavigateerror_called);
   assert_true(caught_rejection);
-}, "AppHistoryNavigateEvent's transitionWhile() is called multiple times and one of the promises rejects");
+}, "event.transitionWhile() is called multiple times and one of the promises rejects");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times.html
index 0f6caf16f1411..d5661a54eba39 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-multiple-times.html
@@ -37,5 +37,5 @@
   assert_true(p1_resolved);
   assert_true(p2_resolved);
   assert_true(p3_resolved);
-}, "navigation.navigate() returns a finished promise that awaits all promises if AppHistoryNavigateEvent's transitionWhile() is called multiple times");
+}, "navigation.navigate() returns a finished promise that awaits all promises if event.transitionWhile() is called multiple times");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-navigation-back.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-navigation-back.html
index a0bc453d36e30..3a4629005be58 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-navigation-back.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-navigation-back.html
@@ -15,5 +15,5 @@
       }));
     });
   }, 0);
-}, "AppHistoryNavigateEvent's transitionWhile() can intercept navigation.back()");
+}, "event.transitionWhile() can intercept navigation.back()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html
index 21a32e7b4c939..3acf41745811a 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-on-synthetic-event.html
@@ -3,9 +3,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
-  // We need to grab an AppHistoryDestination to construct the event.
+  // We need to grab an NavigationDestination to construct the event.
   navigation.onnavigate = t.step_func_done(e => {
-    const event = new AppHistoryNavigateEvent("navigate", {
+    const event = new NavigateEvent("navigate", {
       destination: e.destination,
       signal: (new AbortController()).signal
     });
@@ -13,5 +13,5 @@
     assert_throws_dom("SecurityError", () => event.transitionWhile(Promise.resolve()));
   });
   history.pushState(1, null, "#1");
-}, "AppHistoryNavigateEvent's transitionWhile() throws if invoked on a synthetic event");
+}, "event.transitionWhile() throws if invoked on a synthetic event");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-reject.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-reject.html
index 2cdea05072911..28864b38a5186 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-reject.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-reject.html
@@ -22,5 +22,5 @@
 
   location.href = "#1";
   assert_equals(location.hash, "#1");
-}, "AppHistoryNavigateEvent's transitionWhile() should abort if the given promise rejects");
+}, "event.transitionWhile() should abort if the given promise rejects");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-resolve.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-resolve.html
index 2ee4fb39713cf..b49c66399daee 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-resolve.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-resolve.html
@@ -16,5 +16,5 @@
 
   location.href = "#1";
   assert_equals(location.hash, "#1");
-}, "AppHistoryNavigateEvent's transitionWhile() should proceed if the given promise resolves");
+}, "event.transitionWhile() should proceed if the given promise resolves");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-same-document-history-back.html b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-same-document-history-back.html
index 5e8ac39ef20ec..4c404386fe216 100644
--- a/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-same-document-history-back.html
+++ b/testing/web-platform/tests/navigation-api/navigate-event/transitionWhile-same-document-history-back.html
@@ -36,5 +36,5 @@
         history.back();
       }));
   }, 0);
-}, "AppHistoryNavigateEvent's transitionWhile() can intercept same-document history.back()");
+}, "event.transitionWhile() can intercept same-document history.back()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html
index 11bd7df931d56..ef93d1e27e76c 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-bfcache.html
@@ -32,7 +32,7 @@
     assert_equals(entryData.length, 2);
 
     // Ensure that [1] has the proper url, and otherwise is initialized as
-    // a cross-document AppHistoryEntry ought to be.
+    // a cross-document NavigationHistoryEntry ought to be.
     assert_equals(entryData[0].url, pageA.url);
     assert_equals(entryData[1].url, pageB.url);
 
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html
index 6f6dbcc20df9b..f54ae06e148d8 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blank-navigation.html
@@ -21,5 +21,5 @@
     });
     i.src = "about:blank";
   });
-}, "AppHistory behavior after navigation to about:blank");
+}, "entries() after navigation to about:blank");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html
index 77c25174da2f8..67611f4d446cc 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-blob-navigation.html
@@ -21,5 +21,5 @@
     });
     i.src = URL.createObjectURL(new Blob(["<body></body>"]));
   });
-}, "AppHistory behavior after navigation to a blob: url");
+}, "entries() after navigation to a blob: URL");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html
index 27a07c9e55d37..c5ef7f33e425a 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-javascript-url-navigation.html
@@ -34,5 +34,5 @@
     });
     i.contentWindow.navigation.navigate("?1");
   });
-}, "AppHistory behavior after navigation to a javascript: url");
+}, "entries() after navigation to a javascript: URL");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html
index 434b376224c6b..b80e8aa0e2163 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-after-srcdoc-navigation.html
@@ -21,5 +21,5 @@
     });
     i.srcdoc = "new";
   });
-}, "AppHistory behavior after setting a srcdoc attribute");
+}, "entries() after setting a srcdoc attribute");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html
index cd4279a7f31fb..6f217f5e3c4f3 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-javascript-url-iframe.html
@@ -11,5 +11,5 @@
   assert_array_equals(i.contentWindow.navigation.entries(), [i.contentWindow.navigation.currentEntry]);
 
   assert_equals(i.contentWindow.navigation.currentEntry.url, "about:blank");
-}, "AppHistory entries() and currentEntry should be set in a new javascript: URL iframe");
+}, "entries() and currentEntry should be set in a new javascript: URL iframe");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html
index d261efd0778a7..a7e0f88d37a37 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entries-in-new-srcdoc-iframe.html
@@ -11,5 +11,5 @@
   assert_array_equals(i.contentWindow.navigation.entries(), [i.contentWindow.navigation.currentEntry]);
 
   assert_equals(i.contentWindow.navigation.currentEntry.url, "about:srcdoc");
-}, "AppHistory entries() and currentEntry should be set in a new srcdoc iframe");
+}, "entries() and currentEntry should be set in a new srcdoc iframe");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/entry-after-detach.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/entry-after-detach.html
index 83962d2a8e146..69c52d140983b 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/entry-after-detach.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/entry-after-detach.html
@@ -16,5 +16,5 @@
     assert_equals(i_entry.key, "");
     assert_equals(i_entry.id, "");
   });
-}, "AppHistoryEntry attributes after detach");
+}, "NavigationHistoryEntry properties after detach");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/index-not-in-entries.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/index-not-in-entries.html
index 37cccd39d829b..1c09a0f53ae4a 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/index-not-in-entries.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/index-not-in-entries.html
@@ -20,5 +20,5 @@
     assert_equals(iframe_entry.index, -1);
     t.done();
   }), 0);
-}, "AppHistoryEntry.index should return -1 when not in AppHistory.entries");
+}, "entry.index should return -1 when not in navigation.entries()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html
index f0dc182be41f2..2dd58c03e9d7c 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-cross-document.html
@@ -11,5 +11,5 @@
     // this window's navigation.
     assert_equals(navigation.entries().length, 1);
   });
-}, "AppHistoryEntry's key and id on cross-document back navigation");
+}, "NavigationHistoryEntry's key and id on cross-document back navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html
index b5137f3e51bfc..858b5fd2c8963 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-back-same-document.html
@@ -20,5 +20,5 @@
     assert_equals(navigation.currentEntry.index, 0);
   });
   history.back();
-}, "AppHistoryEntry's key and id on same-document back navigation");
+}, "NavigationHistoryEntry's key and id on same-document back navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html
index a06b645fa6f2f..e5924d243160c 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload-transitionWhile.html
@@ -19,5 +19,5 @@
   assert_equals(i.contentWindow.navigation.currentEntry, original);
   assert_equals(i.contentWindow.navigation.currentEntry.key, key);
   assert_equals(i.contentWindow.navigation.currentEntry.id, id);
-}, "AppHistoryEntry's key and id after location.reload() intercepted by transitionWhile()");
+}, "NavigationHistoryEntry's key and id after location.reload() intercepted by transitionWhile()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload.html
index 267906d2c38cc..f950e2f3a2172 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-reload.html
@@ -14,5 +14,5 @@
       assert_equals(navigation.entries().length, 1);
     });
   });
-}, "AppHistoryEntry's key and id after location.reload()");
+}, "NavigationHistoryEntry's key and id after location.reload()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html
index ee0f749a9edc3..65aff4a3abc31 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html
@@ -13,5 +13,5 @@
     cross_origin_url.hostname = get_host_info().REMOTE_HOST;
     i.contentWindow.location.replace(cross_origin_url.href);
   });
-}, "AppHistoryEntry's key and id after location.replace()");
+}, "NavigationHistoryEntry's key and id after location.replace()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace.html
index ec96371e5648b..a58772a7f479b 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/key-id-location-replace.html
@@ -14,5 +14,5 @@
       assert_equals(navigation.entries().length, 1);
     });
   });
-}, "AppHistoryEntry's key and id after location.replace()");
+}, "NavigationHistoryEntry's key and id after location.replace()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
index 51eed0800fb02..fc563f509e79c 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
@@ -28,5 +28,5 @@
                 "/navigation-api/navigation-history-entry/resources/no-referrer-meta.html");
   assert_equals(new URL(i.contentWindow.navigation.entries()[1].url).pathname,
                 "/navigation-api/navigation-history-entry/resources/no-referrer-meta.html");
-}, "The url of a document with no-referrer referrer meta tag is censored in AppHistoryEntry");
+}, "The url of a document with no-referrer referrer meta tag is censored in NavigationHistoryEntry");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
index 20397b8ef9c8a..e7eb1afc7d1d2 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
@@ -28,5 +28,5 @@
                 "/navigation-api/navigation-history-entry/resources/no-referrer.html");
   assert_equals(new URL(i.contentWindow.navigation.entries()[1].url).pathname,
                 "/navigation-api/navigation-history-entry/resources/no-referrer.html");
-}, "The url of a document with no-referrer referrer policy is censored in AppHistoryEntry");
+}, "The url of a document with no-referrer referrer policy is censored in NavigationHistoryEntry");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html
index 3275a30ef420f..65123fa60babb 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/opaque-origin-data-url.html
@@ -13,5 +13,5 @@
         "currentIsNull: navigation.currentEntry === null}, '*')</sc" +
         "ript>";
   });
-}, "AppHistory behavior after navigation to a data: URL (which has an opaque origin)");
+}, "entries() and currentEntry after navigation to a data: URL (which has an opaque origin)");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html
index acb67ee72c705..a197f825d8eda 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-fragment-navigate.html
@@ -26,5 +26,5 @@
     assert_equals(navigation.entries()[1], entry2);
     assert_equals(navigation.entries()[2], entry3);
   }), 0);
-}, "AppHistoryEntry.sameDocument after same-document navigations");
+}, "entry.sameDocument after same-document navigations");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html
index e1376a07f2550..bfcb7c6599729 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/sameDocument-after-navigate.html
@@ -10,5 +10,5 @@
     i.onload = t.step_func_done(() => assert_false(i_entry.sameDocument));
     i.contentWindow.location = "about:blank";
   });
-}, "AppHistoryEntry.sameDocument after cross-document navigation");
+}, "entry.sameDocument after cross-document navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-methods/reload-base-url.html b/testing/web-platform/tests/navigation-api/navigation-methods/reload-base-url.html
index 936ad75c832a1..1e8d3b90c3469 100644
--- a/testing/web-platform/tests/navigation-api/navigation-methods/reload-base-url.html
+++ b/testing/web-platform/tests/navigation-api/navigation-methods/reload-base-url.html
@@ -12,5 +12,5 @@
       assert_equals(iframeURL.pathname, startingURL.pathname);
     });
   });
-}, "reload() must ignore the AppHistory object's base URL");
+}, "reload() must ignore the Navigation object's base URL");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-methods/reload-state-and-info.html b/testing/web-platform/tests/navigation-api/navigation-methods/reload-state-and-info.html
index 3ee6a8b8fa021..a68dd2ab8be01 100644
--- a/testing/web-platform/tests/navigation-api/navigation-methods/reload-state-and-info.html
+++ b/testing/web-platform/tests/navigation-api/navigation-methods/reload-state-and-info.html
@@ -31,7 +31,7 @@
         assert_equals(i.contentWindow.location.href, start_url);
         assert_equals(i.contentWindow.navigation.currentEntry.key, start_key);
         assert_equals(i.contentWindow.navigation.currentEntry.id, start_id);
-        assert_equals(i.contentWindow.navigation.currentEntry.getState().key2, "value2", "current.getState() after teh reload");
+        assert_equals(i.contentWindow.navigation.currentEntry.getState().key2, "value2", "currentEntry.getState() after the reload");
         assert_not_equals(i.contentWindow.navigation.currentEntry.getState(), navState2);
       }));
     }));
diff --git a/testing/web-platform/tests/navigation-api/navigation-methods/return-value/resources/helpers.js b/testing/web-platform/tests/navigation-api/navigation-methods/return-value/resources/helpers.js
index bf711b18ade2c..5b147f4329094 100644
--- a/testing/web-platform/tests/navigation-api/navigation-methods/return-value/resources/helpers.js
+++ b/testing/web-platform/tests/navigation-api/navigation-methods/return-value/resources/helpers.js
@@ -33,7 +33,7 @@ window.assertBothFulfill = async (t, result, expected, w = window) => {
 
   assert_not_equals(committedValue, undefined, "committed must fulfill before finished");
   assert_equals(finishedValue, committedValue, "committed and finished must fulfill with the same value");
-  assert_true(finishedValue instanceof w.AppHistoryEntry, "fulfillment value must be an AppHistoryEntry");
+  assert_true(finishedValue instanceof w.NavigationHistoryEntry, "fulfillment value must be a NavigationHistoryEntry");
   assert_equals(finishedValue, expected);
 };
 
@@ -50,11 +50,11 @@ window.assertCommittedFulfillsFinishedRejectsExactly = async (t, result, expecte
   await promise_rejects_exactly(t, expectedRejection, result.finished);
 
   assert_not_equals(committedValue, undefined, "committed must fulfill before finished rejects");
-  assert_true(committedValue instanceof w.AppHistoryEntry, "fulfillment value must be an AppHistoryEntry");
+  assert_true(committedValue instanceof w.NavigationHistoryEntry, "fulfillment value must be a NavigationHistoryEntry");
   assert_equals(committedValue, expectedEntry);
 };
 
-window.assertCommittedFulfillsFinishedRejectsDOM = async (t, result, expectedEntry, expectedDOMExceptionCode, w = window, domExceptionConstructor = w.DOMException, appHistoryEntryConstuctor = w.AppHistoryEntry) => {
+window.assertCommittedFulfillsFinishedRejectsDOM = async (t, result, expectedEntry, expectedDOMExceptionCode, w = window, domExceptionConstructor = w.DOMException, navigationHistoryEntryConstuctor = w.NavigationHistoryEntry) => {
   assertReturnValue(result, w);
 
   // Don't use await here so that we can catch out-of-order settlements.
@@ -67,7 +67,7 @@ window.assertCommittedFulfillsFinishedRejectsDOM = async (t, result, expectedEnt
   await promise_rejects_dom(t, expectedDOMExceptionCode, domExceptionConstructor, result.finished);
 
   assert_not_equals(committedValue, undefined, "committed must fulfill before finished rejects");
-  assert_true(committedValue instanceof appHistoryEntryConstuctor, "fulfillment value must be an AppHistoryEntry");
+  assert_true(committedValue instanceof navigationHistoryEntryConstuctor, "fulfillment value must be an NavigationHistoryEntry");
   assert_equals(committedValue, expectedEntry);
 };
 
diff --git a/testing/web-platform/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html b/testing/web-platform/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html
index 9a9529578147b..25dd134649627 100644
--- a/testing/web-platform/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html
+++ b/testing/web-platform/tests/navigation-api/navigation-methods/traverseTo-detach-between-navigate-and-navigatesuccess.html
@@ -10,7 +10,7 @@
   window.onload = t.step_func(() => {
     const iWindow = i.contentWindow;
     const iDOMException = iWindow.DOMException;
-    const iAppHistoryEntry = iWindow.AppHistoryEntry;
+    const iNavigationHistoryEntry = iWindow.NavigationHistoryEntry;
 
     i.contentWindow.navigation.navigate("#1").finished.then(t.step_func(() => {
       assert_equals(i.contentWindow.navigation.entries().length, 2);
@@ -33,7 +33,7 @@
         assert_greater_than(e.lineno, 0);
         assert_greater_than(e.colno, 0);
 
-        assertCommittedFulfillsFinishedRejectsExactly(t, result, iWindow.navigation.currentEntry, e.error, iWindow, iDOMException, iAppHistoryEntry).then(
+        assertCommittedFulfillsFinishedRejectsExactly(t, result, iWindow.navigation.currentEntry, e.error, iWindow, iDOMException, iNavigationHistoryEntry).then(
           () => t.done(),
           t.step_func(err => { throw err; })
         );
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html
index 68cff8085d49f..05d86b4910213 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile-reject.html
@@ -21,7 +21,7 @@
     finalExpectedEvent: "transition.finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.reject(expectedError));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html
index 30d083c9e6dbb..d435aab37b4b1 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document-transitionWhile.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.resolve());
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document.html
index cc30375411948..76c3e99311ed3 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/back-same-document.html
@@ -18,7 +18,7 @@
     finalExpectedEvent: "finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   const result = navigation.back();
   recorder.setUpResultListeners(result);
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html
index f4c36fa0ab211..59f37e97125e6 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-before-popstate-transitionWhile.html
@@ -44,5 +44,5 @@
   await forward_result.finished;
   assert_true(oncurrententrychange_back_called);
   assert_true(onpopstate_forward_called);
-}, "AppHistoryCurrentChangeEvent fires for navigation.back() and navigation.forward()");
+}, "currententrychange fires before popstate for navigation.back() and navigation.forward()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html
index 396a46ff969b2..7cbed8b1bbc90 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/currententrychange-dispose-ordering.html
@@ -22,5 +22,5 @@
   navigation.navigate("#foo", { replace: true });
   assert_true(oncurrententrychange_called);
   assert_true(ondispose_called);
-}, "Ordering between AppHistoryCurrentChangeEvent and AppHistoryEntry dispose events");
+}, "Ordering between Navigation currententrychange and NavigationHistoryEntry dispose events");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-canceled.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-canceled.html
index f4247413d3aa2..eef10cd1730bb 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-canceled.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-canceled.html
@@ -14,7 +14,7 @@
     finalExpectedEvent: "promise microtask"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", t.step_func(e => {
     e.preventDefault();
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html
index 6e7c89502d608..5ec22b119fa67 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-double-transitionWhile.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(new Promise(r => t.step_timeout(r, 1)));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html
index 36b23554ddb95..4dedb58d5b042 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reentrant.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(new Promise(resolve => t.step_timeout(resolve, 2)));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html
index e3f65e81d44e0..dbef3928e30c9 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile-reject.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.reject(expectedError));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile.html
index 0ae41447213ba..0e1d22df7254f 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/location-href-transitionWhile.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.resolve());
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-canceled.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-canceled.html
index 851fa349937c2..2604a60e37bfc 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-canceled.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-canceled.html
@@ -14,7 +14,7 @@
     finalExpectedEvent: "finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", t.step_func(e => {
     e.preventDefault();
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html
index 4413ca4c35d93..556d1737a6e37 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-double-transitionWhile.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(new Promise(r => t.step_timeout(r, 1)));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
index f8ebd6927322e..8c74ba2f632f7 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-in-transition-finished.html
@@ -20,7 +20,7 @@
     finalExpectedEventCount: 2
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigatesuccess", t.step_func(() => {
     if (location.hash === "#1") {
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html
index 8cbb98e85819e..2ef4c4fe27294 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reentrant.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(new Promise(resolve => t.step_timeout(resolve, 2)));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html
index 45ce700057053..b3a10b422e944 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document-transitionWhile-reject.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.reject(expectedError));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document.html
index 07f7bdce5d6ea..589e1105e65a7 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-same-document.html
@@ -17,7 +17,7 @@
     finalExpectedEvent: "finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   const result = navigation.navigate("#1");
   recorder.setUpResultListeners(result);
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html
index 9d06ba17969fa..9a8c412b3333e 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile-stop.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.resolve());
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile.html
index d3125b0fc0998..b72bf49eae20f 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/navigate-transitionWhile.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.resolve());
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-canceled.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-canceled.html
index a7ae7913c6107..3e9e24e777112 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-canceled.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-canceled.html
@@ -14,7 +14,7 @@
     finalExpectedEvent: "finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", t.step_func(e => {
     e.preventDefault();
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html
index 0a70c6deed4fd..6939ee2df8208 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile-reject.html
@@ -20,7 +20,7 @@
     finalExpectedEvent: "transition.finished rejected"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.reject(expectedError));
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile.html
index 8cc237f2dddaf..31cd813f7419b 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/reload-transitionWhile.html
@@ -19,7 +19,7 @@
     finalExpectedEvent: "transition.finished fulfilled"
   });
 
-  recorder.setUpAppHistoryListeners();
+  recorder.setUpNavigationAPIListeners();
 
   navigation.addEventListener("navigate", e => {
     e.transitionWhile(Promise.resolve());
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/resources/helpers.mjs b/testing/web-platform/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
index b5a1e6b03186b..359774de4f72c 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/resources/helpers.mjs
@@ -23,7 +23,7 @@ export class Recorder {
     this.#finalExpectedEventCount = finalExpectedEventCount;
   }
 
-  setUpAppHistoryListeners() {
+  setUpNavigationAPIListeners() {
     navigation.addEventListener("navigate", e => {
       this.record("navigate");
 
diff --git a/testing/web-platform/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html b/testing/web-platform/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html
index 16fb8184545e7..c2c06fcca2604 100644
--- a/testing/web-platform/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html
+++ b/testing/web-platform/tests/navigation-api/ordering-and-transition/transition-realms-and-identity.html
@@ -17,7 +17,7 @@
   const transitionFinished1 = transition1.finished;
 
   assert_true(returnValueFinished1 instanceof i.contentWindow.Promise);
-  assert_true(transition1 instanceof i.contentWindow.AppHistoryTransition);
+  assert_true(transition1 instanceof i.contentWindow.NavigationTransition);
   assert_true(transitionFinished1 instanceof i.contentWindow.Promise);
 
   assert_not_equals(returnValueFinished1, transitionFinished1);
diff --git a/testing/web-platform/tests/navigation-api/state/cross-document-away-and-back.html b/testing/web-platform/tests/navigation-api/state/cross-document-away-and-back.html
index 25d0c1e79811c..60f70363d09c3 100644
--- a/testing/web-platform/tests/navigation-api/state/cross-document-away-and-back.html
+++ b/testing/web-platform/tests/navigation-api/state/cross-document-away-and-back.html
@@ -27,5 +27,5 @@
       }
     });
   });
-}, "appHistoryEntry.getState() behavior after navigating away and back");
+}, "entry.getState() behavior after navigating away and back");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/cross-document-location-api.html b/testing/web-platform/tests/navigation-api/state/cross-document-location-api.html
index 9c869ca1d276e..29e5a025d7c1f 100644
--- a/testing/web-platform/tests/navigation-api/state/cross-document-location-api.html
+++ b/testing/web-platform/tests/navigation-api/state/cross-document-location-api.html
@@ -16,5 +16,5 @@
       assert_equals(i.contentWindow.navigation.currentEntry.getState(), undefined);
     });
   });
-}, "appHistoryEntry.getState() behavior after cross-document location API navigation");
+}, "entry.getState() behavior after cross-document location API navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/history-pushState.html b/testing/web-platform/tests/navigation-api/state/history-pushState.html
index 1c8858c0af0c3..dad01fd8371d5 100644
--- a/testing/web-platform/tests/navigation-api/state/history-pushState.html
+++ b/testing/web-platform/tests/navigation-api/state/history-pushState.html
@@ -7,5 +7,5 @@
   assert_equals(navigation.currentEntry.getState().data, "value");
   history.pushState(1, "", "#push");
   assert_equals(navigation.currentEntry.getState(), undefined);
-}, "appHistoryEntry.getState() after history.pushState()");
+}, "entry.getState() after history.pushState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/history-replaceState.html b/testing/web-platform/tests/navigation-api/state/history-replaceState.html
index cc37949415eb8..14934d69f4520 100644
--- a/testing/web-platform/tests/navigation-api/state/history-replaceState.html
+++ b/testing/web-platform/tests/navigation-api/state/history-replaceState.html
@@ -7,5 +7,5 @@
   assert_equals(navigation.currentEntry.getState().data, "value");
   history.replaceState(1, "", "#replace");
   assert_equals(navigation.currentEntry.getState(), undefined);
-}, "appHistoryEntry.getState() after history.replaceState()");
+}, "entry.getState() after history.replaceState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/location-reload.html b/testing/web-platform/tests/navigation-api/state/location-reload.html
index 94d466434638e..ae483bf900eb6 100644
--- a/testing/web-platform/tests/navigation-api/state/location-reload.html
+++ b/testing/web-platform/tests/navigation-api/state/location-reload.html
@@ -15,5 +15,5 @@
       assert_equals(i.contentWindow.navigation.currentEntry.getState().data, "value");
     });
   });
-}, "appHistoryEntry.getState() after location.reload()");
+}, "entry.getState() after location.reload()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-location-api.html b/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-location-api.html
index 9cb6215089fdb..d161df8b5295f 100644
--- a/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-location-api.html
+++ b/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-location-api.html
@@ -43,5 +43,5 @@
       assert_equals(back_state.statevar, "state");
     });
   }, 0);
-}, "appHistoryEntry.getState() behavior after navigating away using a fragment change, then back");
+}, "entry.getState() behavior after navigating away using a fragment change, then back");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-navigation-api.html b/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-navigation-api.html
index eed296d583afc..0ece14d4b7d3b 100644
--- a/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-navigation-api.html
+++ b/testing/web-platform/tests/navigation-api/state/same-document-away-and-back-navigation-api.html
@@ -49,5 +49,5 @@
       });
     })();
   }, 0);
-}, "appHistoryEntry.getState() behavior after navigating away using the navigation API, then back");
+}, "entry.getState() behavior after navigating away using the navigation API, then back");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html
index a192314050df0..c37d5e979a069 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-away-and-back.html
@@ -27,5 +27,5 @@
       }
     });
   });
-}, "appHistoryEntry.getState() behavior after navigating away and back");
+}, "entry.getState() behavior after navigating away and back");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html
index 3b4ec68bae006..26191fb8761b6 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/cross-document-location-api.html
@@ -16,5 +16,5 @@
       assert_equals(i.contentWindow.navigation.currentEntry.getState(), undefined);
     });
   });
-}, "appHistoryEntry.getState() behavior after cross-document location API navigation");
+}, "entry.getState() behavior after cross-document location API navigation");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-pushState.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-pushState.html
index 73fb89f2a0f8d..852294c64f4e8 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-pushState.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-pushState.html
@@ -7,5 +7,5 @@
   assert_equals(navigation.currentEntry.getState().data, "value");
   history.pushState(1, "", "#push");
   assert_equals(navigation.currentEntry.getState(), undefined);
-}, "appHistoryEntry.getState() after history.pushState()");
+}, "entry.getState() after history.pushState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html
index 15472db2e777d..3eb91a9a80cef 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/history-replaceState.html
@@ -7,5 +7,5 @@
   assert_equals(navigation.currentEntry.getState().data, "value");
   history.replaceState(1, "", "#replace");
   assert_equals(navigation.currentEntry.getState(), undefined);
-}, "appHistoryEntry.getState() after history.replaceState()");
+}, "entry.getState() after history.replaceState()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/location-reload.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/location-reload.html
index 664ff1b23a5c2..8589eeb694e73 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/location-reload.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/location-reload.html
@@ -15,5 +15,5 @@
       assert_equals(i.contentWindow.navigation.currentEntry.getState().data, "value");
     });
   });
-}, "appHistoryEntry.getState() after location.reload()");
+}, "entry.getState() after location.reload()");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html
index a1f54f5b7c21f..47b1904f4f46f 100644
--- a/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html
+++ b/testing/web-platform/tests/navigation-api/updateCurrentEntry-method/same-document-away-and-back-location-api.html
@@ -36,5 +36,5 @@
       assert_equals(back_state.statevar, "state");
     });
   }, 0);
-}, "appHistoryEntry.getState() behavior after navigating away using the location API, then back");
+}, "entry.getState() behavior after navigating away using the location API, then back");
 </script>