diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt
index 054491ba38d..0c01464ed43 100644
--- a/Libraries/LibWeb/CMakeLists.txt
+++ b/Libraries/LibWeb/CMakeLists.txt
@@ -624,7 +624,7 @@ set(SOURCES
     Painting/LabelablePaintable.cpp
     Painting/MarkerPaintable.cpp
     Painting/MediaPaintable.cpp
-    Painting/NestedBrowsingContextPaintable.cpp
+    Painting/NavigableContainerViewportPaintable.cpp
     Painting/PaintContext.cpp
     Painting/Paintable.cpp
     Painting/PaintableBox.cpp
diff --git a/Libraries/LibWeb/HTML/HTMLObjectElement.cpp b/Libraries/LibWeb/HTML/HTMLObjectElement.cpp
index 8229eaf20e6..4e21ad89642 100644
--- a/Libraries/LibWeb/HTML/HTMLObjectElement.cpp
+++ b/Libraries/LibWeb/HTML/HTMLObjectElement.cpp
@@ -143,7 +143,7 @@ GC::Ptr<Layout::Node> HTMLObjectElement::create_layout_node(CSS::StyleProperties
     case Representation::Children:
         return NavigableContainer::create_layout_node(move(style));
     case Representation::NestedBrowsingContext:
-        // FIXME: Actually paint the nested browsing context's document, similar to how iframes are painted with NavigableContainerViewport and NestedBrowsingContextPaintable.
+        // FIXME: Actually paint the nested browsing context's document, similar to how iframes are painted with NavigableContainerViewport and NavigableContainerViewportPaintable.
         return nullptr;
     case Representation::Image:
         if (image_data())
diff --git a/Libraries/LibWeb/Layout/NavigableContainerViewport.cpp b/Libraries/LibWeb/Layout/NavigableContainerViewport.cpp
index bd93b896bfa..925eb6da639 100644
--- a/Libraries/LibWeb/Layout/NavigableContainerViewport.cpp
+++ b/Libraries/LibWeb/Layout/NavigableContainerViewport.cpp
@@ -7,7 +7,7 @@
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/Layout/NavigableContainerViewport.h>
 #include <LibWeb/Layout/Viewport.h>
-#include <LibWeb/Painting/NestedBrowsingContextPaintable.h>
+#include <LibWeb/Painting/NavigableContainerViewportPaintable.h>
 
 namespace Web::Layout {
 
@@ -37,7 +37,7 @@ void NavigableContainerViewport::did_set_content_size()
 
 GC::Ptr<Painting::Paintable> NavigableContainerViewport::create_paintable() const
 {
-    return Painting::NestedBrowsingContextPaintable::create(*this);
+    return Painting::NavigableContainerViewportPaintable::create(*this);
 }
 
 }
diff --git a/Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.cpp b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp
similarity index 76%
rename from Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.cpp
rename to Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp
index cfc42b60ae6..b11bf888df3 100644
--- a/Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.cpp
+++ b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp
@@ -9,29 +9,29 @@
 #include <LibWeb/Layout/NavigableContainerViewport.h>
 #include <LibWeb/Layout/Viewport.h>
 #include <LibWeb/Painting/BorderRadiusCornerClipper.h>
-#include <LibWeb/Painting/NestedBrowsingContextPaintable.h>
+#include <LibWeb/Painting/NavigableContainerViewportPaintable.h>
 #include <LibWeb/Painting/ViewportPaintable.h>
 
 namespace Web::Painting {
 
-GC_DEFINE_ALLOCATOR(NestedBrowsingContextPaintable);
+GC_DEFINE_ALLOCATOR(NavigableContainerViewportPaintable);
 
-GC::Ref<NestedBrowsingContextPaintable> NestedBrowsingContextPaintable::create(Layout::NavigableContainerViewport const& layout_box)
+GC::Ref<NavigableContainerViewportPaintable> NavigableContainerViewportPaintable::create(Layout::NavigableContainerViewport const& layout_box)
 {
-    return layout_box.heap().allocate<NestedBrowsingContextPaintable>(layout_box);
+    return layout_box.heap().allocate<NavigableContainerViewportPaintable>(layout_box);
 }
 
-NestedBrowsingContextPaintable::NestedBrowsingContextPaintable(Layout::NavigableContainerViewport const& layout_box)
+NavigableContainerViewportPaintable::NavigableContainerViewportPaintable(Layout::NavigableContainerViewport const& layout_box)
     : PaintableBox(layout_box)
 {
 }
 
-Layout::NavigableContainerViewport const& NestedBrowsingContextPaintable::layout_box() const
+Layout::NavigableContainerViewport const& NavigableContainerViewportPaintable::layout_box() const
 {
     return static_cast<Layout::NavigableContainerViewport const&>(layout_node());
 }
 
-void NestedBrowsingContextPaintable::paint(PaintContext& context, PaintPhase phase) const
+void NavigableContainerViewportPaintable::paint(PaintContext& context, PaintPhase phase) const
 {
     if (!is_visible())
         return;
diff --git a/Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.h b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h
similarity index 51%
rename from Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.h
rename to Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h
index af5eb981c83..ec129d15c5f 100644
--- a/Libraries/LibWeb/Painting/NestedBrowsingContextPaintable.h
+++ b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h
@@ -11,19 +11,19 @@
 
 namespace Web::Painting {
 
-class NestedBrowsingContextPaintable final : public PaintableBox {
-    GC_CELL(NestedBrowsingContextPaintable, PaintableBox);
-    GC_DECLARE_ALLOCATOR(NestedBrowsingContextPaintable);
+class NavigableContainerViewportPaintable final : public PaintableBox {
+    GC_CELL(NavigableContainerViewportPaintable, PaintableBox);
+    GC_DECLARE_ALLOCATOR(NavigableContainerViewportPaintable);
 
 public:
-    static GC::Ref<NestedBrowsingContextPaintable> create(Layout::NavigableContainerViewport const&);
+    static GC::Ref<NavigableContainerViewportPaintable> create(Layout::NavigableContainerViewport const&);
 
     virtual void paint(PaintContext&, PaintPhase) const override;
 
     Layout::NavigableContainerViewport const& layout_box() const;
 
 private:
-    NestedBrowsingContextPaintable(Layout::NavigableContainerViewport const&);
+    NavigableContainerViewportPaintable(Layout::NavigableContainerViewport const&);
 };
 
 }
diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn
index 3b593a505f4..774d711e131 100644
--- a/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn
+++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/Painting/BUILD.gn
@@ -26,7 +26,7 @@ source_set("Painting") {
     "LabelablePaintable.cpp",
     "MarkerPaintable.cpp",
     "MediaPaintable.cpp",
-    "NestedBrowsingContextPaintable.cpp",
+    "NavigableContainerViewportPaintable.cpp",
     "PaintContext.cpp",
     "PaintStyle.cpp",
     "Paintable.cpp",
diff --git a/Tests/LibWeb/Layout/expected/misc/create-iframes-using-innerhtml.txt b/Tests/LibWeb/Layout/expected/misc/create-iframes-using-innerhtml.txt
index 5a81f552805..df1a8b45737 100644
--- a/Tests/LibWeb/Layout/expected/misc/create-iframes-using-innerhtml.txt
+++ b/Tests/LibWeb/Layout/expected/misc/create-iframes-using-innerhtml.txt
@@ -29,13 +29,13 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>#container) [8,8 784x0]
         PaintableWithLines (BlockContainer<DIV>) [8,8 1x1] overflow: [8,8 20x290]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,13 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,43 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,73 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,103 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,133 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,163 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,193 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,223 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,253 20x20]
-          NestedBrowsingContextPaintable (NavigableContainerViewport<IFRAME>) [13,283 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,13 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,43 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,73 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,103 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,133 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,163 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,193 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,223 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,253 20x20]
+          NavigableContainerViewportPaintable (NavigableContainerViewport<IFRAME>) [13,283 20x20]