diff --git a/WATCHLISTS b/WATCHLISTS
index cd6b005874f95a..2b0f4573e04078 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -257,7 +257,7 @@
                   'device/battery/',
     },
     'bfcache': {
-      'filepath': 'content/browser/frame_host/back_forward_cache.*|'\
+      'filepath': 'content/browser/renderer_host/back_forward_cache.*|'\
                   'content/browser/back_forward_cache_browsertest.cc|'\
                   'content/test/data/back_forward_cache/|'\
                   'content/public/browser/back_forward_cache.*|'\
@@ -1326,7 +1326,7 @@
       'filepath': '^native_client_sdk/',
     },
     'navigation': {
-      'filepath': 'content/browser/frame_host|'\
+      'filepath': 'content/browser/renderer_host|'\
                   'content/browser/renderer_host/render_process_host.*|'\
                   'content/browser/renderer_host/render_view_host.*|'\
                   'content/browser/web_contents/web_contents_impl.*|'\
diff --git a/content/browser/DEPS b/content/browser/DEPS
index bbd8af74223fcf..afeee5b471b80d 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -160,8 +160,11 @@ specific_include_rules = {
   # SiteInstance and BrowsingInstance should not depend on the types of things
   # that rely on them, like RenderFrameHostImpl or WebContentsImpl.
   "(site_instance_impl|browsing_instance)\.(cc|h)": [
-    "-content/browser/frame_host",
+    "-content/browser/renderer_host",
     "-content/browser/web_contents",
+    # These files do not cycle back to SiteInstance or BrowsingInstance.
+    "+content/browser/renderer_host/render_process_host_impl.h",
+    "+content/browser/renderer_host/agent_scheduling_group_host.h",
   ],
   "storage_partition_impl_unittest\.cc": [
     "+services/network/cookie_manager.h",
diff --git a/content/browser/dom_storage/README.md b/content/browser/dom_storage/README.md
index 803f4757cf98e5..d16805d8dd1125 100644
--- a/content/browser/dom_storage/README.md
+++ b/content/browser/dom_storage/README.md
@@ -18,7 +18,7 @@ when it's destructed.
 
 
 This object is primarily held by both the [`NavigationControllerImpl`](
-https://cs.chromium.org/chromium/src/content/browser/frame_host/navigation_controller_impl.h?dr=CSs&l=426)
+https://cs.chromium.org/chromium/src/content/browser/renderer_host/navigation_controller_impl.h?dr=CSs&l=426)
 and in the [`ContentPlatformSpecificTabData`](
 https://cs.chromium.org/chromium/src/components/sessions/content/content_platform_specific_tab_data.h?dr=C&l=35)
 which is used to restore tabs. The services stores recent tab
@@ -80,7 +80,7 @@ The `session_namespace_id` for a frame's session storage is stored in the
 `CreateNewWindowParams` object in [frame.mojom](https://cs.chromium.org/chromium/src/content/common/frame.mojom).
 
 If the frame wasn't created from a previous frame, the SessionStorage namespace
-object is created [here](https://cs.chromium.org/chromium/src/content/browser/frame_host/navigation_controller_impl.cc?type=cs&l=1904)
+object is created [here](https://cs.chromium.org/chromium/src/content/browser/renderer_host/navigation_controller_impl.cc?type=cs&l=1904)
 and the id is accessed [here](https://cs.chromium.org/chromium/src/content/browser/renderer_host/render_view_host_impl.cc?type=cs&l=321).
 
 ## Renderer Connection to Session Storage
diff --git a/docs/accessibility/overview.md b/docs/accessibility/overview.md
index ca77b707cbe428..de6e3823d8deb5 100644
--- a/docs/accessibility/overview.md
+++ b/docs/accessibility/overview.md
@@ -531,7 +531,7 @@ is defined by [automation.idl], which must be kept synchronized with
 [Node]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/core/dom/node.h
 [RenderAccessibilityImpl]: https://cs.chromium.org/chromium/src/content/renderer/accessibility/render_accessibility_impl.h
 [RenderAccessibilityManager]: https://source.chromium.org/chromium/chromium/src/+/master:content/renderer/accessibility/render_accessibility_manager.h
-[RenderFrameHostImpl]: https://cs.chromium.org/chromium/src/content/browser/frame_host/render_frame_host_impl.h
+[RenderFrameHostImpl]: https://cs.chromium.org/chromium/src/content/browser/renderer_host/render_frame_host_impl.h
 [ui::AXNodeData]: https://cs.chromium.org/chromium/src/ui/accessibility/ax_node_data.h
 [WebAXObject]: https://cs.chromium.org/chromium/src/third_party/blink/public/web/web_ax_object.h
 [automation API]: https://cs.chromium.org/chromium/src/chrome/renderer/resources/extensions/automation
diff --git a/docs/navigation-request-navigation-state.gv b/docs/navigation-request-navigation-state.gv
index 30f4097547707f..2affcd001ccfe9 100644
--- a/docs/navigation-request-navigation-state.gv
+++ b/docs/navigation-request-navigation-state.gv
@@ -1,5 +1,5 @@
 // Generated with https://crrev.com/c/2220116 and:
-//   python3 tools/state_transitions/state_graph.py content/browser/frame_host/navigation_request.cc NavigationState
+//   python3 tools/state_transitions/state_graph.py content/browser/renderer_host/navigation_request.cc NavigationState
 //
 // See tools/state_transitions/README.md
 digraph createflow {
diff --git a/docs/render-frame-host-lifecycle-state.gv b/docs/render-frame-host-lifecycle-state.gv
index fffc7b5bee4a78..37d8a9513dd860 100644
--- a/docs/render-frame-host-lifecycle-state.gv
+++ b/docs/render-frame-host-lifecycle-state.gv
@@ -1,5 +1,5 @@
 // Generated with https://crrev.com/c/2220116 and:
-//   python3 tools/state_transitions/state_graph.py content/browser/frame_host/render_frame_host_impl.cc LifecycleState
+//   python3 tools/state_transitions/state_graph.py content/browser/renderer_host/render_frame_host_impl.cc LifecycleState
 //
 // See tools/state_transitions/README.md
 digraph createflow {
diff --git a/services/network/public/cpp/content_security_policy/csp_context.h b/services/network/public/cpp/content_security_policy/csp_context.h
index 971752cf460252..968b39daeb316d 100644
--- a/services/network/public/cpp/content_security_policy/csp_context.h
+++ b/services/network/public/cpp/content_security_policy/csp_context.h
@@ -18,7 +18,7 @@ namespace network {
 // A CSPContext represents the Document where the Content-Security-Policy are
 // checked. One must define via its virtual methods how to report violations
 // and what is the set of scheme that bypass the CSP. Its main implementation
-// is in content/browser/frame_host/render_frame_host_impl.h
+// is in content/browser/renderer_host/render_frame_host_impl.h
 class COMPONENT_EXPORT(NETWORK_CPP) CSPContext {
  public:
   // This enum represents what set of policies should be checked by
diff --git a/services/network/public/mojom/web_sandbox_flags.mojom b/services/network/public/mojom/web_sandbox_flags.mojom
index 04d3d5be2ae25e..f4927ca7dff9a3 100644
--- a/services/network/public/mojom/web_sandbox_flags.mojom
+++ b/services/network/public/mojom/web_sandbox_flags.mojom
@@ -6,7 +6,7 @@ module network.mojom;
 // Enum types for the sandbox attributes of the main resource.
 // TODO(https://crbug.com/1041376): Parse the flags in the network service.
 //
-// See content/browser/frame_host/sandbox_flags.md for more details about how
+// See content/browser/renderer_host/sandbox_flags.md for more details about how
 // the web-layer components (i.e. //content and Blink) consume and apply these
 // flags.