2 files changed, 15 insertions, 15 deletions
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index fcd44143..a4da2414 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -4,7 +4,7 @@
 #include "cru/platform/GraphicsBase.h"
 #include "cru/ui/DebugFlags.h"
 #include "cru/ui/controls/Control.h"
-#include "cru/ui/host/WindowHost.h"
+#include "cru/ui/controls/Window.h"
 
 namespace cru::ui::render {
 const BoxConstraint BoxConstraint::kNotLimit{Size::kMax, Size::kZero};
@@ -265,22 +265,22 @@ Rect RenderObject::GetContentRect() const {
   return rect;
 }
 
-host::WindowHost* RenderObject::GetWindowHost() {
+controls::Window* RenderObject::GetWindow() {
   if (control_) {
-    return control_->GetWindowHost();
+    return control_->GetWindow();
   }
   return nullptr;
 }
 
 void RenderObject::InvalidateLayout() {
-  if (auto window_host = GetWindowHost()) {
-    window_host->InvalidateLayout();
+  if (auto window = GetWindow()) {
+    window->InvalidateLayout();
   }
 }
 
 void RenderObject::InvalidatePaint() {
-  if (auto window_host = GetWindowHost()) {
-    window_host->InvalidatePaint();
+  if (auto window = GetWindow()) {
+    window->InvalidatePaint();
   }
 }
 
diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp
index 804395e4..3834fffb 100644
--- a/src/ui/render/ScrollBar.cpp
+++ b/src/ui/render/ScrollBar.cpp
@@ -8,7 +8,7 @@
 #include "cru/platform/gui/Cursor.h"
 #include "cru/ui/Base.h"
 #include "cru/ui/ThemeManager.h"
-#include "cru/ui/host/WindowHost.h"
+#include "cru/ui/controls/Window.h"
 #include "cru/ui/render/ScrollRenderObject.h"
 
 #include <algorithm>
@@ -317,23 +317,23 @@ void ScrollBar::OnDraw(platform::graphics::IPainter* painter,
 
 void ScrollBar::SetCursor() {
   if (const auto control = render_object_->GetAttachedControl()) {
-    if (const auto window_host = control->GetWindowHost()) {
-      window_host->SetOverrideCursor(
+    if (const auto window = control->GetWindow()) {
+      window->SetOverrideCursor(
           GetUiApplication()->GetCursorManager()->GetSystemCursor(
               platform::gui::SystemCursorType::Arrow));
-      cursor_overrided_ = true;
+      cursor_overridden_ = true;
     }
   }
 }
 
 void ScrollBar::RestoreCursor() {
-  if (cursor_overrided_) {
+  if (cursor_overridden_) {
     if (const auto control = render_object_->GetAttachedControl()) {
-      if (const auto window_host = control->GetWindowHost()) {
-        window_host->SetOverrideCursor(nullptr);
+      if (const auto window = control->GetWindow()) {
+        window->SetOverrideCursor(nullptr);
       }
     }
-    cursor_overrided_ = false;
+    cursor_overridden_ = false;
   }
 }