diff --git a/blink/public/mojom/loader/same_document_navigation_type.mojom b/blink/public/mojom/loader/same_document_navigation_type.mojom
index 3f3d72eefbf..82527021f6b 100644
--- a/blink/public/mojom/loader/same_document_navigation_type.mojom
+++ b/blink/public/mojom/loader/same_document_navigation_type.mojom
@@ -11,6 +11,6 @@ enum SameDocumentNavigationType {
   kFragment = 0,
   // Navigating with window.history
   kHistoryApi = 1,
-  // Navigating with AppHistoryNavigateEvent's transitionWhile()
-  kAppHistoryTransitionWhile = 2,
+  // Navigating with the navigation API NavigateEvent's transitionWhile()
+  kNavigationApiTransitionWhile = 2,
 };
diff --git a/blink/renderer/core/loader/document_loader.cc b/blink/renderer/core/loader/document_loader.cc
index 4e9296a9bb1..35d0d465e0a 100644
--- a/blink/renderer/core/loader/document_loader.cc
+++ b/blink/renderer/core/loader/document_loader.cc
@@ -700,8 +700,9 @@ static SinglePageAppNavigationType CategorizeSinglePageAppNavigation(
       // WebFrameLoadType::kBackForward.
       DCHECK(frame_load_type != WebFrameLoadType::kBackForward);
       return kSPANavTypeHistoryPushStateOrReplaceState;
-    case mojom::blink::SameDocumentNavigationType::kAppHistoryTransitionWhile:
-      return kSPANavTypeAppHistoryTransitionWhile;
+    case mojom::blink::SameDocumentNavigationType::
+        kNavigationApiTransitionWhile:
+      return kSPANavTypeNavigationApiTransitionWhile;
   }
   NOTREACHED();
   return kSPANavTypeSameDocumentBackwardOrForward;
@@ -818,9 +819,9 @@ void DocumentLoader::UpdateForSameDocumentNavigation(
   // NavigateEvent, the navigation will finish asynchronously, so
   // don't immediately call DidStopLoading() in that case.
   bool should_send_stop_notification =
-      !was_loading &&
-      same_document_navigation_type !=
-          mojom::blink::SameDocumentNavigationType::kAppHistoryTransitionWhile;
+      !was_loading && same_document_navigation_type !=
+                          mojom::blink::SameDocumentNavigationType::
+                              kNavigationApiTransitionWhile;
   if (should_send_stop_notification)
     GetFrameLoader().Progress().ProgressCompleted();
 
diff --git a/blink/renderer/core/loader/frame_loader_types.h b/blink/renderer/core/loader/frame_loader_types.h
index 0f62d75c3c9..0f05ecec588 100644
--- a/blink/renderer/core/loader/frame_loader_types.h
+++ b/blink/renderer/core/loader/frame_loader_types.h
@@ -53,7 +53,7 @@ enum SinglePageAppNavigationType {
   kSPANavTypeHistoryPushStateOrReplaceState = 0,
   kSPANavTypeSameDocumentBackwardOrForward = 1,
   kSPANavTypeOtherFragmentNavigation = 2,
-  kSPANavTypeAppHistoryTransitionWhile = 3,
+  kSPANavTypeNavigationApiTransitionWhile = 3,
   kSPANavTypeCount
 };
 
diff --git a/blink/renderer/core/navigation_api/navigation_api.cc b/blink/renderer/core/navigation_api/navigation_api.cc
index f00b50995a6..d6050caea17 100644
--- a/blink/renderer/core/navigation_api/navigation_api.cc
+++ b/blink/renderer/core/navigation_api/navigation_api.cc
@@ -470,7 +470,7 @@ NavigationResult* NavigationApi::navigate(ScriptState* script_state,
     if (options->hasState()) {
       ExceptionState exception_state(
           script_state->GetIsolate(),
-          ExceptionContext::Context::kOperationInvoke, "AppHistory",
+          ExceptionContext::Context::kOperationInvoke, "Navigation",
           "navigate");
       serialized_state = SerializeState(options->state(), exception_state);
       if (exception_state.HadException()) {
@@ -501,7 +501,7 @@ NavigationResult* NavigationApi::reload(ScriptState* script_state,
     if (options->hasState()) {
       ExceptionState exception_state(
           script_state->GetIsolate(),
-          ExceptionContext::Context::kOperationInvoke, "AppHistory", "reload");
+          ExceptionContext::Context::kOperationInvoke, "Navigation", "reload");
       serialized_state = SerializeState(options->state(), exception_state);
       if (exception_state.HadException()) {
         NavigationResult* result =
@@ -559,7 +559,7 @@ NavigationResult* NavigationApi::traverseTo(ScriptState* script_state,
                                             const String& key,
                                             NavigationOptions* options) {
   if (DOMException* maybe_ex =
-          PerformSharedNavigationChecks("goTo()/back()/forward()")) {
+          PerformSharedNavigationChecks("traverseTo()/back()/forward()")) {
     return EarlyErrorResult(script_state, maybe_ex);
   }
 
@@ -778,7 +778,7 @@ NavigationApi::DispatchResult NavigationApi::DispatchNavigateEvent(
     // steps. Instead it does stuff like the loading spinner and use counters.
     GetSupplementable()->document()->Loader()->RunURLAndHistoryUpdateSteps(
         url, destination_item,
-        mojom::blink::SameDocumentNavigationType::kAppHistoryTransitionWhile,
+        mojom::blink::SameDocumentNavigationType::kNavigationApiTransitionWhile,
         state_object, type, is_browser_initiated, is_synchronously_committed);
   }