28 files changed, 45 insertions, 45 deletions
diff --git a/include/cru/ui/click_detector.hpp b/include/cru/ui/ClickDetector.hpp
index 6c4761e7..f5fd3d8f 100644
--- a/include/cru/ui/click_detector.hpp
+++ b/include/cru/ui/ClickDetector.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "control.hpp"
+#include "Control.hpp"
 
 
 namespace cru::ui {
diff --git a/include/cru/ui/content_control.hpp b/include/cru/ui/ContentControl.hpp
index f88ec157..19f13a1d 100644
--- a/include/cru/ui/content_control.hpp
+++ b/include/cru/ui/ContentControl.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "control.hpp"
+#include "Control.hpp"
 
 namespace cru::ui {
 class ContentControl : public Control {
diff --git a/include/cru/ui/layout_control.hpp b/include/cru/ui/LayoutControl.hpp
index e1856403..7997b37e 100644
--- a/include/cru/ui/layout_control.hpp
+++ b/include/cru/ui/LayoutControl.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "control.hpp"
+#include "Control.hpp"
 
 namespace cru::ui {
 class LayoutControl : public Control {
diff --git a/include/cru/ui/no_child_control.hpp b/include/cru/ui/NoChildControl.hpp
index 62a9fa8d..1a31ae7e 100644
--- a/include/cru/ui/no_child_control.hpp
+++ b/include/cru/ui/NoChildControl.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "control.hpp"
+#include "Control.hpp"
 
 namespace cru::ui {
 class NoChildControl : public Control {
diff --git a/include/cru/ui/ui_event.hpp b/include/cru/ui/UiEvent.hpp
index a9d6028a..29292d75 100644
--- a/include/cru/ui/ui_event.hpp
+++ b/include/cru/ui/UiEvent.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
-#include "cru/common/event.hpp"
-#include "cru/platform/native/keyboard.hpp"
+#include "cru/common/Event.hpp"
+#include "cru/platform/native/Keyboard.hpp"
 
 #include <memory>
 #include <optional>
diff --git a/include/cru/ui/ui_host.hpp b/include/cru/ui/UiHost.hpp
index ca2b70a4..651dab81 100644
--- a/include/cru/ui/ui_host.hpp
+++ b/include/cru/ui/UiHost.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
-#include "cru/common/event.hpp"
-#include "cru/common/self_resolvable.hpp"
-#include "render/base.hpp"
+#include "cru/common/Event.hpp"
+#include "cru/common/SelfResolvable.hpp"
+#include "render/Base.hpp"
 
 namespace cru::ui {
 struct AfterLayoutEventArgs {};
diff --git a/include/cru/ui/ui_manager.hpp b/include/cru/ui/UiManager.hpp
index 9ad184c4..e6facdbd 100644
--- a/include/cru/ui/ui_manager.hpp
+++ b/include/cru/ui/UiManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
-#include "controls/base.hpp"
+#include "controls/Base.hpp"
 
 namespace cru::ui {
 struct ThemeResources {
diff --git a/include/cru/ui/base.hpp b/include/cru/ui/base.hpp
index a1335f90..97b0dbff 100644
--- a/include/cru/ui/base.hpp
+++ b/include/cru/ui/base.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/common/base.hpp"
-#include "cru/platform/graph/base.hpp"
-#include "cru/platform/native/base.hpp"
+#include "cru/common/Base.hpp"
+#include "cru/platform/graph/Base.hpp"
+#include "cru/platform/native/Base.hpp"
 
 #include <functional>
 #include <memory>
diff --git a/include/cru/ui/control.hpp b/include/cru/ui/control.hpp
index d66405e6..347163be 100644
--- a/include/cru/ui/control.hpp
+++ b/include/cru/ui/control.hpp
@@ -1,9 +1,9 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
-#include "cru/common/event.hpp"
-#include "render/base.hpp"
-#include "ui_event.hpp"
+#include "cru/common/Event.hpp"
+#include "render/Base.hpp"
+#include "UiEvent.hpp"
 
 #include <string_view>
 
diff --git a/include/cru/ui/controls/flex_layout.hpp b/include/cru/ui/controls/FlexLayout.hpp
index ab08a80b..beacd1f9 100644
--- a/include/cru/ui/controls/flex_layout.hpp
+++ b/include/cru/ui/controls/FlexLayout.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../layout_control.hpp"
+#include "../LayoutControl.hpp"
 
 namespace cru::ui::controls {
 class FlexLayout : public LayoutControl {
diff --git a/include/cru/ui/controls/stack_layout.hpp b/include/cru/ui/controls/StackLayout.hpp
index 20da0e82..d5998cc4 100644
--- a/include/cru/ui/controls/stack_layout.hpp
+++ b/include/cru/ui/controls/StackLayout.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../layout_control.hpp"
+#include "../LayoutControl.hpp"
 
 namespace cru::ui::controls {
 class StackLayout : public LayoutControl {
diff --git a/include/cru/ui/controls/text_block.hpp b/include/cru/ui/controls/TextBlock.hpp
index 61f568c4..dd8b40b4 100644
--- a/include/cru/ui/controls/text_block.hpp
+++ b/include/cru/ui/controls/TextBlock.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../no_child_control.hpp"
+#include "../NoChildControl.hpp"
 
 namespace cru::ui::controls {
 template <typename TControl>
diff --git a/include/cru/ui/controls/text_box.hpp b/include/cru/ui/controls/TextBox.hpp
index 15fcb734..2f7a12b6 100644
--- a/include/cru/ui/controls/text_box.hpp
+++ b/include/cru/ui/controls/TextBox.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "../no_child_control.hpp"
-#include "base.hpp"
+#include "../NoChildControl.hpp"
+#include "Base.hpp"
 
 #include <memory>
 
diff --git a/include/cru/ui/controls/base.hpp b/include/cru/ui/controls/base.hpp
index ebe9cdda..b550601b 100644
--- a/include/cru/ui/controls/base.hpp
+++ b/include/cru/ui/controls/base.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../base.hpp"
+#include "../Base.hpp"
 
 namespace cru::ui::controls {
 using ButtonStateStyle = BorderStyle;
diff --git a/include/cru/ui/controls/button.hpp b/include/cru/ui/controls/button.hpp
index fb636a33..8a11409c 100644
--- a/include/cru/ui/controls/button.hpp
+++ b/include/cru/ui/controls/button.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../content_control.hpp"
-#include "base.hpp"
+#include "../ContentControl.hpp"
+#include "Base.hpp"
 
-#include "../click_detector.hpp"
+#include "../ClickDetector.hpp"
 
 namespace cru::ui::controls {
 class Button : public ContentControl {
diff --git a/include/cru/ui/controls/container.hpp b/include/cru/ui/controls/container.hpp
index 7d4c0d23..e3d78365 100644
--- a/include/cru/ui/controls/container.hpp
+++ b/include/cru/ui/controls/container.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../content_control.hpp"
+#include "../ContentControl.hpp"
 
 namespace cru::ui::controls {
 class Container : public ContentControl {
diff --git a/include/cru/ui/render/border_render_object.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index 02672309..c3031f59 100644
--- a/include/cru/ui/render/border_render_object.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
 namespace cru::ui::render {
 class BorderRenderObject : public RenderObject {
diff --git a/include/cru/ui/render/canvas_render_object.hpp b/include/cru/ui/render/CanvasRenderObject.hpp
index cb3828b6..ba50a985 100644
--- a/include/cru/ui/render/canvas_render_object.hpp
+++ b/include/cru/ui/render/CanvasRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
 namespace cru::ui::render {
 // The measure logic for `CanvasRenderObject` is that you set a desired size by
diff --git a/include/cru/ui/render/flex_layout_render_object.hpp b/include/cru/ui/render/FlexLayoutRenderObject.hpp
index 849c1a0d..bc43141d 100644
--- a/include/cru/ui/render/flex_layout_render_object.hpp
+++ b/include/cru/ui/render/FlexLayoutRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "layout_render_object.hpp"
+#include "LayoutRenderObject.hpp"
 
 namespace cru::ui::render {
 class FlexLayoutRenderObject : public LayoutRenderObject<FlexChildLayoutData> {
diff --git a/include/cru/ui/render/layout_render_object.hpp b/include/cru/ui/render/LayoutRenderObject.hpp
index 5c4c9c5c..e6ca9dc0 100644
--- a/include/cru/ui/render/layout_render_object.hpp
+++ b/include/cru/ui/render/LayoutRenderObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
-#include "cru/platform/graph/util/painter.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
 
 namespace cru::ui::render {
 template <typename TChildLayoutData>
diff --git a/include/cru/ui/render/layout_utility.hpp b/include/cru/ui/render/LayoutUtility.hpp
index 16a15d87..63d13fd3 100644
--- a/include/cru/ui/render/layout_utility.hpp
+++ b/include/cru/ui/render/LayoutUtility.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
 namespace cru::ui::render {
 Size Min(const Size& left, const Size& right);
diff --git a/include/cru/ui/render/render_object.hpp b/include/cru/ui/render/RenderObject.hpp
index 6a8db52f..7cfa3883 100644
--- a/include/cru/ui/render/render_object.hpp
+++ b/include/cru/ui/render/RenderObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
-#include "cru/common/event.hpp"
+#include "cru/common/Event.hpp"
 
 namespace cru::ui::render {
 // Render object will not destroy its children when destroyed. Control must
diff --git a/include/cru/ui/render/scroll_render_object.hpp b/include/cru/ui/render/ScrollRenderObject.hpp
index 1527db6c..dcf6dae6 100644
--- a/include/cru/ui/render/scroll_render_object.hpp
+++ b/include/cru/ui/render/ScrollRenderObject.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
-#include "cru/platform/graph/util/painter.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
 
 namespace cru::ui::render {
 class ScrollRenderObject : public RenderObject {
diff --git a/include/cru/ui/render/stack_layout_render_object.hpp b/include/cru/ui/render/StackLayoutRenderObject.hpp
index c259b98d..a5bf9335 100644
--- a/include/cru/ui/render/stack_layout_render_object.hpp
+++ b/include/cru/ui/render/StackLayoutRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "layout_render_object.hpp"
+#include "LayoutRenderObject.hpp"
 
 namespace cru::ui::render {
 class StackLayoutRenderObject
diff --git a/include/cru/ui/render/text_render_object.hpp b/include/cru/ui/render/TextRenderObject.hpp
index 4b1e91e0..7a81ba51 100644
--- a/include/cru/ui/render/text_render_object.hpp
+++ b/include/cru/ui/render/TextRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
 #include <string>
 
diff --git a/include/cru/ui/render/window_render_object.hpp b/include/cru/ui/render/WindowRenderObject.hpp
index 76b17b82..00bce29b 100644
--- a/include/cru/ui/render/window_render_object.hpp
+++ b/include/cru/ui/render/WindowRenderObject.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "render_object.hpp"
+#include "RenderObject.hpp"
 
 namespace cru::ui::render {
 class WindowRenderObject : public RenderObject {
diff --git a/include/cru/ui/render/base.hpp b/include/cru/ui/render/base.hpp
index f9d936e0..c2af5e99 100644
--- a/include/cru/ui/render/base.hpp
+++ b/include/cru/ui/render/base.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../base.hpp"
+#include "../Base.hpp"
 
 namespace cru::ui::render {
 class RenderObject;
diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp
index 2f5df4da..eb2ecfbb 100644
--- a/include/cru/ui/window.hpp
+++ b/include/cru/ui/window.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "content_control.hpp"
+#include "ContentControl.hpp"
 
 namespace cru::ui {
 class Window final : public ContentControl {