...

65 files changed, 355 insertions, 355 deletions

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 43d1dedb..d53b9740 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(CRU_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/common)
 add_library(cru_base STATIC 
-    logger.cpp
+	Logger.cpp
 )
 target_sources(cru_base PUBLIC
-	${CRU_BASE_INCLUDE_DIR}/base.hpp
-	${CRU_BASE_INCLUDE_DIR}/bitmask.hpp
-	${CRU_BASE_INCLUDE_DIR}/event.hpp
-	${CRU_BASE_INCLUDE_DIR}/logger.hpp
-	${CRU_BASE_INCLUDE_DIR}/pre_config.hpp
-	${CRU_BASE_INCLUDE_DIR}/self_resolvable.hpp
+	${CRU_BASE_INCLUDE_DIR}/Base.hpp
+	${CRU_BASE_INCLUDE_DIR}/Bitmask.hpp
+	${CRU_BASE_INCLUDE_DIR}/Event.hpp
+	${CRU_BASE_INCLUDE_DIR}/Logger.hpp
+	${CRU_BASE_INCLUDE_DIR}/PreConfig.hpp
+	${CRU_BASE_INCLUDE_DIR}/SelfResolvable.hpp
 )
 target_include_directories(cru_base PUBLIC ${CRU_INCLUDE_DIR})
 target_compile_definitions(cru_base PUBLIC $<$<CONFIG:Debug>:CRU_DEBUG>)
diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index 97599b0a..ed9f9e64 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/logger.hpp"
+#include "cru/common/Logger.hpp"
 
 #include <array>
 #include <cstdlib>
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index 01952106..51253b56 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(CRU_PLATFORM_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform)
 add_library(cru_platform_base INTERFACE)
 target_sources(cru_platform_base INTERFACE
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/check.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/exception.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/graph_base.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/heap_debug.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/matrix.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/resource.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/Check.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/Exception.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/GraphBase.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/HeapDebug.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/Matrix.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/Resource.hpp
 )
 target_link_libraries(cru_platform_base INTERFACE cru_base)
 
diff --git a/src/platform/graph/CMakeLists.txt b/src/platform/graph/CMakeLists.txt
index dac28370..3bf11e8d 100644
--- a/src/platform/graph/CMakeLists.txt
+++ b/src/platform/graph/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(CRU_PLATFORM_GRAPH_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/graph)
 add_library(cru_platform_graph INTERFACE)
 target_sources(cru_platform_graph INTERFACE
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/base.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/brush.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/font.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/geometry.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/factory.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/resource.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/painter.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/text_layout.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/painter.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Base.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Brush.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Font.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Geometry.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Factory.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Resource.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Painter.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/TextLayout.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/Painter.hpp
 )
 target_link_libraries(cru_platform_graph INTERFACE cru_platform_base)
diff --git a/src/platform/native/CMakeLists.txt b/src/platform/native/CMakeLists.txt
index 688f2890..c68a0958 100644
--- a/src/platform/native/CMakeLists.txt
+++ b/src/platform/native/CMakeLists.txt
@@ -1,13 +1,13 @@
 set(CRU_PLATFORM_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/native)
 add_library(cru_platform_native STATIC
-	ui_application.cpp
+	UiApplication.cpp
 )
 target_sources(cru_platform_native PUBLIC
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/base.hpp
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/cursor.hpp
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/input_method.hpp
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/keyboard.hpp
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/window.hpp
-	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/ui_application.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Base.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Cursor.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/InputMethod.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Keyboard.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Window.hpp
+	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/UiApplication.hpp
 )
 target_link_libraries(cru_platform_native PUBLIC cru_platform_graph)
diff --git a/src/platform/native/ui_application.cpp b/src/platform/native/UiApplication.cpp
index 212d9104..200b10e0 100644
--- a/src/platform/native/ui_application.cpp
+++ b/src/platform/native/UiApplication.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/native/ui_application.hpp"
+#include "cru/platform/native/UiApplication.hpp"
 
 namespace cru::platform::native {
 IUiApplication* IUiApplication::instance = nullptr;
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 777e4fbc..f37982e9 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,63 +1,63 @@
 set(CRU_UI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/ui)
 
 add_library(cru_ui STATIC
-	helper.hpp
-	routed_event_dispatch.hpp
+	Helper.hpp
+	RoutedEventDispatch.hpp
 
-	click_detector.cpp
-    content_control.cpp
-	control.cpp
-	helper.cpp
-    layout_control.cpp
-	no_child_control.cpp
-	ui_host.cpp
-    ui_manager.cpp
-    window.cpp
-    controls/button.cpp
-    controls/container.cpp
-    controls/flex_layout.cpp
-    controls/stack_layout.cpp
-    controls/text_block.cpp
-    controls/text_box.cpp
-	controls/text_control_service.hpp
-    render/border_render_object.cpp
-    render/canvas_render_object.cpp
-    render/flex_layout_render_object.cpp
-    render/layout_utility.cpp
-    render/render_object.cpp
-    render/scroll_render_object.cpp
-    render/stack_layout_render_object.cpp
-    render/text_render_object.cpp
-    render/window_render_object.cpp
+	ClickDetector.cpp
+	ContentControl.cpp
+	Control.cpp
+	Helper.cpp
+	LayoutControl.cpp
+	NoChildControl.cpp
+	UiHost.cpp
+	UiManager.cpp
+	Window.cpp
+	controls/Button.cpp
+	controls/Container.cpp
+	controls/FlexLayout.cpp
+	controls/StackLayout.cpp
+	controls/TextBlock.cpp
+	controls/TextBox.cpp
+	controls/TextControlService.hpp
+	render/BorderRenderObject.cpp
+	render/CanvasRenderObject.cpp
+	render/FlexLayoutRenderObject.cpp
+	render/LayoutUtility.cpp
+	render/RenderObject.cpp
+	render/ScrollRenderObject.cpp
+	render/StackLayoutRenderObject.cpp
+	render/TextRenderObject.cpp
+	render/WindowRenderObject.cpp
 )
 target_sources(cru_ui PUBLIC
-	${CRU_UI_INCLUDE_DIR}/base.hpp
-	${CRU_UI_INCLUDE_DIR}/click_detector.hpp
-	${CRU_UI_INCLUDE_DIR}/content_control.hpp
-	${CRU_UI_INCLUDE_DIR}/control.hpp
-	${CRU_UI_INCLUDE_DIR}/layout_control.hpp
-	${CRU_UI_INCLUDE_DIR}/no_child_control.hpp
-	${CRU_UI_INCLUDE_DIR}/ui_event.hpp
-	${CRU_UI_INCLUDE_DIR}/ui_host.hpp
-	${CRU_UI_INCLUDE_DIR}/ui_manager.hpp
-	${CRU_UI_INCLUDE_DIR}/window.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/base.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/button.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/container.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/flex_layout.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/stack_layout.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/text_box.hpp
-	${CRU_UI_INCLUDE_DIR}/controls/text_block.hpp
-	${CRU_UI_INCLUDE_DIR}/render/base.hpp
-	${CRU_UI_INCLUDE_DIR}/render/border_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/canvas_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/flex_layout_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/layout_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/layout_utility.hpp
-	${CRU_UI_INCLUDE_DIR}/render/render_object.hpp
-    ${CRU_UI_INCLUDE_DIR}/render/scroll_render_object.hpp
-    ${CRU_UI_INCLUDE_DIR}/render/stack_layout_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/text_render_object.hpp
-	${CRU_UI_INCLUDE_DIR}/render/window_render_object.hpp
+	${CRU_UI_INCLUDE_DIR}/Base.hpp
+	${CRU_UI_INCLUDE_DIR}/ClickDetector.hpp
+	${CRU_UI_INCLUDE_DIR}/ContentControl.hpp
+	${CRU_UI_INCLUDE_DIR}/Control.hpp
+	${CRU_UI_INCLUDE_DIR}/LayoutControl.hpp
+	${CRU_UI_INCLUDE_DIR}/NoChildControl.hpp
+	${CRU_UI_INCLUDE_DIR}/UiEvent.hpp
+	${CRU_UI_INCLUDE_DIR}/UiHost.hpp
+	${CRU_UI_INCLUDE_DIR}/UiManager.hpp
+	${CRU_UI_INCLUDE_DIR}/Window.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/Base.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/Button.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/Container.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/FlexLayout.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/StackLayout.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/TextBox.hpp
+	${CRU_UI_INCLUDE_DIR}/controls/TextBlock.hpp
+	${CRU_UI_INCLUDE_DIR}/render/Base.hpp
+	${CRU_UI_INCLUDE_DIR}/render/BorderRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/CanvasRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/FlexLayoutRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/LayoutRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/LayoutUtility.hpp
+	${CRU_UI_INCLUDE_DIR}/render/RenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/ScrollRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/StackLayoutRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/TextRenderObject.hpp
+	${CRU_UI_INCLUDE_DIR}/render/WindowRenderObject.hpp
 )
 target_link_libraries(cru_ui PUBLIC cru_platform_native)
diff --git a/src/ui/click_detector.cpp b/src/ui/ClickDetector.cpp
index 3f342a31..e873efd4 100644
--- a/src/ui/click_detector.cpp
+++ b/src/ui/ClickDetector.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/click_detector.hpp"
+#include "cru/ui/ClickDetector.hpp"
 
-#include "cru/common/logger.hpp"
+#include "cru/common/Logger.hpp"
 
 #include <optional>
 
diff --git a/src/ui/content_control.cpp b/src/ui/ContentControl.cpp
index eb13f4cb..8d1a17d2 100644
--- a/src/ui/content_control.cpp
+++ b/src/ui/ContentControl.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/content_control.hpp"
+#include "cru/ui/ContentControl.hpp"
 
-#include "cru/ui/window.hpp"
+#include "cru/ui/Window.hpp"
 
 namespace cru::ui {
 ContentControl::ContentControl()
diff --git a/src/ui/layout_control.cpp b/src/ui/LayoutControl.cpp
index 1d5d1ede..4813566b 100644
--- a/src/ui/layout_control.cpp
+++ b/src/ui/LayoutControl.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/layout_control.hpp"
+#include "cru/ui/LayoutControl.hpp"
 
-#include "cru/ui/window.hpp"
+#include "cru/ui/Window.hpp"
 
 namespace cru::ui {
 LayoutControl::~LayoutControl() {
diff --git a/src/ui/no_child_control.cpp b/src/ui/NoChildControl.cpp
index 81299411..86861049 100644
--- a/src/ui/no_child_control.cpp
+++ b/src/ui/NoChildControl.cpp
@@ -1,4 +1,4 @@
-#include "cru/ui/no_child_control.hpp"
+#include "cru/ui/NoChildControl.hpp"
 
 namespace cru::ui {
 const std::vector<Control*> NoChildControl::empty_control_vector{};
diff --git a/src/ui/routed_event_dispatch.hpp b/src/ui/RoutedEventDispatch.hpp
index dd55ce17..5ff21a74 100644
--- a/src/ui/routed_event_dispatch.hpp
+++ b/src/ui/RoutedEventDispatch.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/ui/control.hpp"
+#include "cru/ui/Control.hpp"
 
-#include "cru/common/logger.hpp"
+#include "cru/common/Logger.hpp"
 
 #include <list>
 
diff --git a/src/ui/ui_host.cpp b/src/ui/UiHost.cpp
index 8b85ad30..069e68de 100644
--- a/src/ui/ui_host.cpp
+++ b/src/ui/UiHost.cpp
@@ -1,12 +1,12 @@
-#include "cru/ui/ui_host.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/graph/painter.hpp"
-#include "cru/platform/native/ui_application.hpp"
-#include "cru/platform/native/window.hpp"
-#include "cru/ui/render/window_render_object.hpp"
-#include "cru/ui/window.hpp"
-#include "routed_event_dispatch.hpp"
+#include "cru/ui/UiHost.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/graph/Painter.hpp"
+#include "cru/platform/native/UiApplication.hpp"
+#include "cru/platform/native/Window.hpp"
+#include "cru/ui/render/WindowRenderObject.hpp"
+#include "cru/ui/Window.hpp"
+#include "RoutedEventDispatch.hpp"
 
 namespace cru::ui {
 using platform::native::INativeWindow;
diff --git a/src/ui/ui_manager.cpp b/src/ui/UiManager.cpp
index 905d29ad..b8effdfd 100644
--- a/src/ui/ui_manager.cpp
+++ b/src/ui/UiManager.cpp
@@ -1,10 +1,10 @@
-#include "cru/ui/ui_manager.hpp"
+#include "cru/ui/UiManager.hpp"
 
-#include "cru/platform/graph/brush.hpp"
-#include "cru/platform/graph/factory.hpp"
-#include "cru/platform/graph/font.hpp"
-#include "cru/platform/native/ui_application.hpp"
-#include "helper.hpp"
+#include "cru/platform/graph/Brush.hpp"
+#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/graph/Font.hpp"
+#include "cru/platform/native/UiApplication.hpp"
+#include "Helper.hpp"
 
 namespace cru::ui {
 using namespace cru::platform::graph;
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 5417f4ce..cd1367fe 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -1,10 +1,10 @@
-#include "cru/ui/control.hpp"
+#include "cru/ui/Control.hpp"
 
-#include "cru/platform/native/cursor.hpp"
-#include "cru/platform/native/ui_application.hpp"
-#include "cru/ui/base.hpp"
-#include "cru/ui/ui_host.hpp"
-#include "routed_event_dispatch.hpp"
+#include "cru/platform/native/Cursor.hpp"
+#include "cru/platform/native/UiApplication.hpp"
+#include "cru/ui/Base.hpp"
+#include "cru/ui/UiHost.hpp"
+#include "RoutedEventDispatch.hpp"
 
 #include <memory>
 
diff --git a/src/ui/controls/flex_layout.cpp b/src/ui/controls/FlexLayout.cpp
index 5412164a..25f30558 100644
--- a/src/ui/controls/flex_layout.cpp
+++ b/src/ui/controls/FlexLayout.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/controls/flex_layout.hpp"
+#include "cru/ui/controls/FlexLayout.hpp"
 
-#include "cru/ui/render/flex_layout_render_object.hpp"
+#include "cru/ui/render/FlexLayoutRenderObject.hpp"
 
 namespace cru::ui::controls {
 using render::FlexLayoutRenderObject;
diff --git a/src/ui/controls/stack_layout.cpp b/src/ui/controls/StackLayout.cpp
index 47511f33..ce500b79 100644
--- a/src/ui/controls/stack_layout.cpp
+++ b/src/ui/controls/StackLayout.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/controls/stack_layout.hpp"
+#include "cru/ui/controls/StackLayout.hpp"
 
-#include "cru/ui/render/stack_layout_render_object.hpp"
+#include "cru/ui/render/StackLayoutRenderObject.hpp"
 
 namespace cru::ui::controls {
 using render::StackLayoutRenderObject;
diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/TextBlock.cpp
index a3ec9f54..f77e279b 100644
--- a/src/ui/controls/text_block.cpp
+++ b/src/ui/controls/TextBlock.cpp
@@ -1,10 +1,10 @@
-#include "cru/ui/controls/text_block.hpp"
+#include "cru/ui/controls/TextBlock.hpp"
 
-#include "cru/ui/render/canvas_render_object.hpp"
-#include "cru/ui/render/stack_layout_render_object.hpp"
-#include "cru/ui/render/text_render_object.hpp"
-#include "cru/ui/ui_manager.hpp"
-#include "text_control_service.hpp"
+#include "cru/ui/render/CanvasRenderObject.hpp"
+#include "cru/ui/render/StackLayoutRenderObject.hpp"
+#include "cru/ui/render/TextRenderObject.hpp"
+#include "cru/ui/UiManager.hpp"
+#include "TextControlService.hpp"
 
 namespace cru::ui::controls {
 using render::CanvasRenderObject;
diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/TextBox.cpp
index 8b7dc692..64fd4c60 100644
--- a/src/ui/controls/text_box.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -1,11 +1,11 @@
-#include "cru/ui/controls/text_box.hpp"
-
-#include "cru/ui/render/border_render_object.hpp"
-#include "cru/ui/render/canvas_render_object.hpp"
-#include "cru/ui/render/stack_layout_render_object.hpp"
-#include "cru/ui/render/text_render_object.hpp"
-#include "cru/ui/ui_manager.hpp"
-#include "text_control_service.hpp"
+#include "cru/ui/controls/TextBox.hpp"
+
+#include "cru/ui/render/BorderRenderObject.hpp"
+#include "cru/ui/render/CanvasRenderObject.hpp"
+#include "cru/ui/render/StackLayoutRenderObject.hpp"
+#include "cru/ui/render/TextRenderObject.hpp"
+#include "cru/ui/UiManager.hpp"
+#include "TextControlService.hpp"
 
 namespace cru::ui::controls {
 using render::BorderRenderObject;
diff --git a/src/ui/controls/text_control_service.hpp b/src/ui/controls/TextControlService.hpp
index 626423bf..ad0db343 100644
--- a/src/ui/controls/text_control_service.hpp
+++ b/src/ui/controls/TextControlService.hpp
@@ -1,13 +1,13 @@
 #pragma once
-#include "../helper.hpp"
-#include "cru/common/logger.hpp"
-#include "cru/platform/graph/font.hpp"
-#include "cru/platform/graph/painter.hpp"
-#include "cru/platform/native/ui_application.hpp"
-#include "cru/ui/control.hpp"
-#include "cru/ui/render/canvas_render_object.hpp"
-#include "cru/ui/render/text_render_object.hpp"
-#include "cru/ui/ui_event.hpp"
+#include "../Helper.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/platform/graph/Font.hpp"
+#include "cru/platform/graph/Painter.hpp"
+#include "cru/platform/native/UiApplication.hpp"
+#include "cru/ui/Control.hpp"
+#include "cru/ui/render/CanvasRenderObject.hpp"
+#include "cru/ui/render/TextRenderObject.hpp"
+#include "cru/ui/UiEvent.hpp"
 
 namespace cru::ui::controls {
 constexpr int k_default_caret_blink_duration = 500;
diff --git a/src/ui/controls/button.cpp b/src/ui/controls/button.cpp
index 7dd087ba..6f6af878 100644
--- a/src/ui/controls/button.cpp
+++ b/src/ui/controls/button.cpp
@@ -1,13 +1,13 @@
-#include "cru/ui/controls/button.hpp"
+#include "cru/ui/controls/Button.hpp"
 #include <memory>
 
-#include "../helper.hpp"
-#include "cru/platform/graph/brush.hpp"
-#include "cru/platform/native/cursor.hpp"
-#include "cru/platform/native/ui_application.hpp"
-#include "cru/ui/render/border_render_object.hpp"
-#include "cru/ui/ui_manager.hpp"
-#include "cru/ui/window.hpp"
+#include "../Helper.hpp"
+#include "cru/platform/graph/Brush.hpp"
+#include "cru/platform/native/Cursor.hpp"
+#include "cru/platform/native/UiApplication.hpp"
+#include "cru/ui/render/BorderRenderObject.hpp"
+#include "cru/ui/UiManager.hpp"
+#include "cru/ui/Window.hpp"
 
 namespace cru::ui::controls {
 using cru::platform::native::SystemCursorType;
diff --git a/src/ui/controls/container.cpp b/src/ui/controls/container.cpp
index 84582d80..de58ee64 100644
--- a/src/ui/controls/container.cpp
+++ b/src/ui/controls/container.cpp
@@ -1,7 +1,7 @@
-#include "cru/ui/controls/container.hpp"
+#include "cru/ui/controls/Container.hpp"
 
-#include "cru/platform/graph/factory.hpp"
-#include "cru/ui/render/border_render_object.hpp"
+#include "cru/platform/graph/Factory.hpp"
+#include "cru/ui/render/BorderRenderObject.hpp"
 
 namespace cru::ui::controls {
 Container::Container() {
diff --git a/src/ui/helper.cpp b/src/ui/helper.cpp
index 4d5d8665..6f67e701 100644
--- a/src/ui/helper.cpp
+++ b/src/ui/helper.cpp
@@ -1,7 +1,7 @@
-#include "helper.hpp"
+#include "Helper.hpp"
 
-#include "cru/platform/graph/factory.hpp"
-#include "cru/platform/native/ui_application.hpp"
+#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/native/UiApplication.hpp"
 
 namespace cru::ui {
 using cru::platform::graph::IGraphFactory;
diff --git a/src/ui/helper.hpp b/src/ui/helper.hpp
index 4fd14aa6..6923852f 100644
--- a/src/ui/helper.hpp
+++ b/src/ui/helper.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/ui/base.hpp"
+#include "cru/ui/Base.hpp"
 
 namespace cru::platform {
 namespace graph {
diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/BorderRenderObject.cpp
index 7c96a3b6..a656cb99 100644
--- a/src/ui/render/border_render_object.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -1,10 +1,10 @@
-#include "cru/ui/render/border_render_object.hpp"
+#include "cru/ui/render/BorderRenderObject.hpp"
 
-#include "../helper.hpp"
-#include "cru/common/logger.hpp"
-#include "cru/platform/graph/factory.hpp"
-#include "cru/platform/graph/geometry.hpp"
-#include "cru/platform/graph/util/painter.hpp"
+#include "../Helper.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/graph/Geometry.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
 
 #include <algorithm>
 
diff --git a/src/ui/render/canvas_render_object.cpp b/src/ui/render/CanvasRenderObject.cpp
index 0508e276..16ac9239 100644
--- a/src/ui/render/canvas_render_object.cpp
+++ b/src/ui/render/CanvasRenderObject.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/render/canvas_render_object.hpp"
+#include "cru/ui/render/CanvasRenderObject.hpp"
 
-#include "cru/ui/render/layout_utility.hpp"
+#include "cru/ui/render/LayoutUtility.hpp"
 
 namespace cru::ui::render {
 CanvasRenderObject::CanvasRenderObject() : RenderObject(ChildMode::None) {}
diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index f40a9b3e..b609fd97 100644
--- a/src/ui/render/flex_layout_render_object.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -1,6 +1,6 @@
-#include "cru/ui/render/flex_layout_render_object.hpp"
+#include "cru/ui/render/FlexLayoutRenderObject.hpp"
 
-#include "cru/platform/graph/util/painter.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
 
 #include <algorithm>
 #include <functional>
diff --git a/src/ui/render/layout_utility.cpp b/src/ui/render/LayoutUtility.cpp
index aae62d35..03252f1c 100644
--- a/src/ui/render/layout_utility.cpp
+++ b/src/ui/render/LayoutUtility.cpp
@@ -1,4 +1,4 @@
-#include "cru/ui/render/layout_utility.hpp"
+#include "cru/ui/render/LayoutUtility.hpp"
 
 #include <algorithm>
 
diff --git a/src/ui/render/render_object.cpp b/src/ui/render/RenderObject.cpp
index 4a1bedf3..83e306a8 100644
--- a/src/ui/render/render_object.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -1,7 +1,7 @@
-#include "cru/ui/render/render_object.hpp"
+#include "cru/ui/render/RenderObject.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/ui/ui_host.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/ui/UiHost.hpp"
 
 #include <algorithm>
 
diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp
new file mode 100644
index 00000000..33e9e407
--- /dev/null
+++ b/src/ui/render/ScrollRenderObject.cpp
@@ -0,0 +1 @@
+#include "cru/ui/render/ScrollRenderObject.hpp"
diff --git a/src/ui/render/stack_layout_render_object.cpp b/src/ui/render/StackLayoutRenderObject.cpp
index 1cb31252..d08e136d 100644
--- a/src/ui/render/stack_layout_render_object.cpp
+++ b/src/ui/render/StackLayoutRenderObject.cpp
@@ -1,4 +1,4 @@
-#include "cru/ui/render/stack_layout_render_object.hpp"
+#include "cru/ui/render/StackLayoutRenderObject.hpp"
 
 #include <algorithm>
 
diff --git a/src/ui/render/text_render_object.cpp b/src/ui/render/TextRenderObject.cpp
index cd670db1..05acd086 100644
--- a/src/ui/render/text_render_object.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -1,9 +1,9 @@
-#include "cru/ui/render/text_render_object.hpp"
+#include "cru/ui/render/TextRenderObject.hpp"
 
-#include "../helper.hpp"
-#include "cru/platform/graph/factory.hpp"
-#include "cru/platform/graph/text_layout.hpp"
-#include "cru/platform/graph/util/painter.hpp"
+#include "../Helper.hpp"
+#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/graph/TextLayout.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
 
 #include <algorithm>
 
diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/WindowRenderObject.cpp
index abed6fa4..cd1f806f 100644
--- a/src/ui/render/window_render_object.cpp
+++ b/src/ui/render/WindowRenderObject.cpp
@@ -1,8 +1,8 @@
-#include "cru/ui/render/window_render_object.hpp"
+#include "cru/ui/render/WindowRenderObject.hpp"
 
-#include "../helper.hpp"
-#include "cru/platform/graph/util/painter.hpp"
-#include "cru/ui/ui_host.hpp"
+#include "../Helper.hpp"
+#include "cru/platform/graph/util/Painter.hpp"
+#include "cru/ui/UiHost.hpp"
 
 namespace cru::ui::render {
 WindowRenderObject::WindowRenderObject(UiHost* host) {
diff --git a/src/ui/render/scroll_render_object.cpp b/src/ui/render/scroll_render_object.cpp
deleted file mode 100644
index f77ee636..00000000
--- a/src/ui/render/scroll_render_object.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/ui/render/scroll_render_object.hpp"
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 7c0683af..de7044dd 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -1,7 +1,7 @@
-#include "cru/ui/window.hpp"
+#include "cru/ui/Window.hpp"
 
-#include "cru/ui/render/window_render_object.hpp"
-#include "cru/ui/ui_host.hpp"
+#include "cru/ui/render/WindowRenderObject.hpp"
+#include "cru/ui/UiHost.hpp"
 
 namespace cru::ui {
 Window* Window::CreateOverlapped() {
diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt
index 696ef200..f4062411 100644
--- a/src/win/CMakeLists.txt
+++ b/src/win/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(CRU_WIN_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/)
 
 add_library(cru_win_base STATIC
-	debug_logger.hpp
+	DebugLogger.hpp
 
-	exception.cpp
-	heap_debug.cpp
-	string.cpp
+	Exception.cpp
+	HeapDebug.cpp
+	String.cpp
 )
 target_sources(cru_win_base PUBLIC
-	${CRU_WIN_BASE_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_BASE_INCLUDE_DIR}/string.hpp
-	${CRU_WIN_BASE_INCLUDE_DIR}/win_pre_config.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/String.hpp
+	${CRU_WIN_BASE_INCLUDE_DIR}/WinPreConfig.hpp
 )
 target_compile_definitions(cru_win_base PUBLIC UNICODE _UNICODE) # use unicode
 target_link_libraries(cru_win_base PUBLIC cru_base)
diff --git a/src/win/debug_logger.hpp b/src/win/DebugLogger.hpp
index b6694279..381803bc 100644
--- a/src/win/debug_logger.hpp
+++ b/src/win/DebugLogger.hpp
@@ -1,7 +1,7 @@
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/string.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/String.hpp"
 
 namespace cru::platform::win {
 
diff --git a/src/win/heap_debug.cpp b/src/win/HeapDebug.cpp
index 33ebae7c..6ec1ffcc 100644
--- a/src/win/heap_debug.cpp
+++ b/src/win/HeapDebug.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/platform/heap_debug.hpp"
+#include "cru/platform/HeapDebug.hpp"
 
 #include <crtdbg.h>
 
diff --git a/src/win/exception.cpp b/src/win/exception.cpp
index fde3ec6f..9f9fb03d 100644
--- a/src/win/exception.cpp
+++ b/src/win/exception.cpp
@@ -1,4 +1,4 @@
-#include "cru/win/exception.hpp"
+#include "cru/win/Exception.hpp"
 
 #include <fmt/format.h>
 #include <optional>
diff --git a/src/win/graph/direct/CMakeLists.txt b/src/win/graph/direct/CMakeLists.txt
index 492f6749..5505b0b5 100644
--- a/src/win/graph/direct/CMakeLists.txt
+++ b/src/win/graph/direct/CMakeLists.txt
@@ -1,25 +1,25 @@
 set(CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/graph/direct)
 
 add_library(cru_win_graph_direct STATIC
-	brush.cpp
-	font.cpp
-	geometry.cpp
-	factory.cpp
-	painter.cpp
-	resource.cpp
-	text_layout.cpp
+	Brush.cpp
+	Font.cpp
+	Geometry.cpp
+	Factory.cpp
+	Painter.cpp
+	Resource.cpp
+	TextLayout.cpp
 )
 target_sources(cru_win_graph_direct PUBLIC
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/brush.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/com_resource.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/convert_util.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/font.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/geometry.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/factory.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/painter.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/resource.hpp
-	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/text_layout.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Brush.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/ComResource.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/ConvertUtil.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Font.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Geometry.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Factory.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Painter.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/Resource.hpp
+	${CRU_WIN_GRAPH_DIRECT_INCLUDE_DIR}/TextLayout.hpp
 )
 target_link_libraries(cru_win_graph_direct PUBLIC D3D11 D2d1 DWrite)
 target_link_libraries(cru_win_graph_direct PUBLIC cru_win_base cru_platform_graph)
diff --git a/src/win/graph/direct/text_layout.cpp b/src/win/graph/direct/TextLayout.cpp
index 7b8d2ab0..16db77f0 100644
--- a/src/win/graph/direct/text_layout.cpp
+++ b/src/win/graph/direct/TextLayout.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/text_layout.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/graph/direct/font.hpp"
-#include "cru/win/string.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/graph/direct/Font.hpp"
+#include "cru/win/String.hpp"
 
 #include <utility>
 
diff --git a/src/win/graph/direct/brush.cpp b/src/win/graph/direct/brush.cpp
index 329ce509..2b9d4ac3 100644
--- a/src/win/graph/direct/brush.cpp
+++ b/src/win/graph/direct/brush.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/brush.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
 
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphFactory* factory)
diff --git a/src/win/graph/direct/factory.cpp b/src/win/graph/direct/factory.cpp
index 0f4739ee..d9213994 100644
--- a/src/win/graph/direct/factory.cpp
+++ b/src/win/graph/direct/factory.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/factory.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/win/graph/direct/brush.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/font.hpp"
-#include "cru/win/graph/direct/geometry.hpp"
-#include "cru/win/graph/direct/text_layout.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Font.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
 
 #include <cstdlib>
 #include <utility>
diff --git a/src/win/graph/direct/font.cpp b/src/win/graph/direct/font.cpp
index 6d50fafe..edbbc59d 100644
--- a/src/win/graph/direct/font.cpp
+++ b/src/win/graph/direct/font.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/font.hpp"
+#include "cru/win/graph/direct/Font.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/string.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/String.hpp"
 
 #include <array>
 #include <utility>
diff --git a/src/win/graph/direct/geometry.cpp b/src/win/graph/direct/geometry.cpp
index 57b7f237..e77b4749 100644
--- a/src/win/graph/direct/geometry.cpp
+++ b/src/win/graph/direct/geometry.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/graph/direct/geometry.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
 
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphFactory* factory)
diff --git a/src/win/graph/direct/painter.cpp b/src/win/graph/direct/painter.cpp
index df0075e0..3ffb5208 100644
--- a/src/win/graph/direct/painter.cpp
+++ b/src/win/graph/direct/painter.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/graph/direct/painter.hpp"
-
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/brush.hpp"
-#include "cru/win/graph/direct/convert_util.hpp"
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/geometry.hpp"
-#include "cru/win/graph/direct/text_layout.hpp"
+#include "cru/win/graph/direct/Painter.hpp"
+
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Brush.hpp"
+#include "cru/win/graph/direct/ConvertUtil.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Geometry.hpp"
+#include "cru/win/graph/direct/TextLayout.hpp"
 
 #include <type_traits>
 
diff --git a/src/win/graph/direct/resource.cpp b/src/win/graph/direct/resource.cpp
index c2be27ed..772bb74b 100644
--- a/src/win/graph/direct/resource.cpp
+++ b/src/win/graph/direct/resource.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/graph/direct/resource.hpp"
+#include "cru/win/graph/direct/Resource.hpp"
 
-#include "cru/win/graph/direct/factory.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
 
 namespace cru::platform::graph::win::direct {
 DirectGraphResource::DirectGraphResource(DirectGraphFactory* factory)
diff --git a/src/win/native/CMakeLists.txt b/src/win/native/CMakeLists.txt
index ba4b3387..f1b167d2 100644
--- a/src/win/native/CMakeLists.txt
+++ b/src/win/native/CMakeLists.txt
@@ -1,37 +1,37 @@
 set(CRU_WIN_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/native)
 
 add_library(cru_win_native STATIC
-	dpi_util.hpp
-	god_window_message.hpp
-	timer.hpp
-	window_d2d_painter.hpp
-	window_manager.hpp
+	DpiUtil.hpp
+	GodWindowMessage.hpp
+	Timer.hpp
+	WindowD2DPainter.hpp
+	WindowManager.hpp
 
-	cursor.cpp
-	god_window.cpp
-	input_method.cpp
-	keyboard.cpp
-	timer.cpp
-	ui_application.cpp
-	window.cpp
-	window_class.cpp
-	window_d2d_painter.cpp
-	window_manager.cpp
-	window_render_target.cpp
+	Cursor.cpp
+	GodWindow.cpp
+	InputMethod.cpp
+	Keyboard.cpp
+	Timer.cpp
+	UiApplication.cpp
+	Window.cpp
+	WindowClass.cpp
+	WindowD2DPainter.cpp
+	WindowManager.cpp
+	WindowRenderTarget.cpp
 )
 target_sources(cru_win_native PUBLIC
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/cursor.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/exception.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/base.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/god_window.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/input_method.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/keyboard.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/resource.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/ui_application.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_class.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_native_message_event_args.hpp
-	${CRU_WIN_NATIVE_INCLUDE_DIR}/window_render_target.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Cursor.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Exception.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Base.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/GodWindow.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/InputMethod.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Keyboard.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Resource.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/UiApplication.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/Window.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowClass.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowNativeMessageEventArgs.hpp
+	${CRU_WIN_NATIVE_INCLUDE_DIR}/WindowRenderTarget.hpp
 )
 target_link_libraries(cru_win_native PUBLIC imm32)
 target_link_libraries(cru_win_native PUBLIC cru_win_graph_direct cru_platform_native)
diff --git a/src/win/native/dpi_util.hpp b/src/win/native/DpiUtil.hpp
index 07b89a95..16ffda25 100644
--- a/src/win/native/dpi_util.hpp
+++ b/src/win/native/DpiUtil.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/platform/native/base.hpp"
+#include "cru/platform/native/Base.hpp"
 
 // The dpi awareness needs to be implemented in the future. Currently we use 96
 // as default.
diff --git a/src/win/native/god_window.cpp b/src/win/native/GodWindow.cpp
index 00577002..076954d4 100644
--- a/src/win/native/god_window.cpp
+++ b/src/win/native/GodWindow.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/native/god_window.hpp"
+#include "cru/win/native/GodWindow.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window_class.hpp"
-#include "god_window_message.hpp"
-#include "timer.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/WindowClass.hpp"
+#include "GodWindowMessage.hpp"
+#include "Timer.hpp"
 
 namespace cru::platform::native::win {
 constexpr auto god_window_class_name = L"GodWindowClass";
diff --git a/src/win/native/god_window_message.hpp b/src/win/native/GodWindowMessage.hpp
index 591270d9..9063cb4d 100644
--- a/src/win/native/god_window_message.hpp
+++ b/src/win/native/GodWindowMessage.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
 namespace cru::platform::native::win {
 constexpr int invoke_later_message_id = WM_USER + 2000;
diff --git a/src/win/native/input_method.cpp b/src/win/native/InputMethod.cpp
index dba2b1eb..2e31108e 100644
--- a/src/win/native/input_method.cpp
+++ b/src/win/native/InputMethod.cpp
@@ -1,11 +1,11 @@
-#include "cru/win/native/input_method.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/exception.hpp"
-#include "cru/win/native/window.hpp"
-#include "cru/win/string.hpp"
-#include "dpi_util.hpp"
+#include "cru/win/native/InputMethod.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/Exception.hpp"
+#include "cru/win/native/Window.hpp"
+#include "cru/win/String.hpp"
+#include "DpiUtil.hpp"
 
 #include <vector>
 
diff --git a/src/win/native/ui_application.cpp b/src/win/native/UiApplication.cpp
index 599ecadc..dbf52e05 100644
--- a/src/win/native/ui_application.cpp
+++ b/src/win/native/UiApplication.cpp
@@ -1,17 +1,17 @@
-#include "cru/win/native/ui_application.hpp"
-
-#include "../debug_logger.hpp"
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/native/cursor.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/god_window.hpp"
-#include "cru/win/native/input_method.hpp"
-#include "cru/win/native/window.hpp"
-#include "god_window_message.hpp"
-#include "timer.hpp"
-#include "window_manager.hpp"
+#include "cru/win/native/UiApplication.hpp"
+
+#include "../DebugLogger.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/native/Cursor.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/GodWindow.hpp"
+#include "cru/win/native/InputMethod.hpp"
+#include "cru/win/native/Window.hpp"
+#include "GodWindowMessage.hpp"
+#include "Timer.hpp"
+#include "WindowManager.hpp"
 
 namespace cru::platform::native {
 std::unique_ptr<IUiApplication> CreateUiApplication() {
diff --git a/src/win/native/window_class.cpp b/src/win/native/WindowClass.cpp
index 11dc86aa..2e74606e 100644
--- a/src/win/native/window_class.cpp
+++ b/src/win/native/WindowClass.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/native/window_class.hpp"
+#include "cru/win/native/WindowClass.hpp"
 
-#include "cru/win/native/exception.hpp"
+#include "cru/win/native/Exception.hpp"
 
 namespace cru::platform::native::win {
 WindowClass::WindowClass(std::wstring name, WNDPROC window_proc,
diff --git a/src/win/native/window_d2d_painter.cpp b/src/win/native/WindowD2DPainter.cpp
index 54343fbf..7a97480b 100644
--- a/src/win/native/window_d2d_painter.cpp
+++ b/src/win/native/WindowD2DPainter.cpp
@@ -1,8 +1,8 @@
-#include "window_d2d_painter.hpp"
+#include "WindowD2DPainter.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
diff --git a/src/win/native/window_d2d_painter.hpp b/src/win/native/WindowD2DPainter.hpp
index 40a5dee6..a638b77a 100644
--- a/src/win/native/window_d2d_painter.hpp
+++ b/src/win/native/WindowD2DPainter.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/win/graph/direct/painter.hpp"
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/graph/direct/Painter.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
 namespace cru::platform::native::win {
 class WindowD2DPainter : public graph::win::direct::D2DPainter {
diff --git a/src/win/native/window_manager.cpp b/src/win/native/WindowManager.cpp
index 205a139c..56cc8981 100644
--- a/src/win/native/window_manager.cpp
+++ b/src/win/native/WindowManager.cpp
@@ -1,8 +1,8 @@
-#include "window_manager.hpp"
+#include "WindowManager.hpp"
 
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window.hpp"
-#include "cru/win/native/window_class.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/Window.hpp"
+#include "cru/win/native/WindowClass.hpp"
 
 namespace cru::platform::native::win {
 LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam,
diff --git a/src/win/native/window_manager.hpp b/src/win/native/WindowManager.hpp
index 677719aa..3f6387f7 100644
--- a/src/win/native/window_manager.hpp
+++ b/src/win/native/WindowManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/base.hpp"
+#include "cru/common/Base.hpp"
 
 #include <map>
 #include <memory>
diff --git a/src/win/native/window_render_target.cpp b/src/win/native/WindowRenderTarget.cpp
index eb6673c6..4a114ebf 100644
--- a/src/win/native/window_render_target.cpp
+++ b/src/win/native/WindowRenderTarget.cpp
@@ -1,8 +1,8 @@
-#include "cru/win/native/window_render_target.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
 
-#include "cru/win/graph/direct/exception.hpp"
-#include "cru/win/graph/direct/factory.hpp"
-#include "dpi_util.hpp"
+#include "cru/win/graph/direct/Exception.hpp"
+#include "cru/win/graph/direct/Factory.hpp"
+#include "DpiUtil.hpp"
 
 namespace cru::platform::native::win {
 using namespace cru::platform::graph::win::direct;
diff --git a/src/win/native/cursor.cpp b/src/win/native/cursor.cpp
index 096f3fdf..ca8bb1cd 100644
--- a/src/win/native/cursor.cpp
+++ b/src/win/native/cursor.cpp
@@ -1,7 +1,7 @@
-#include "cru/win/native/cursor.hpp"
+#include "cru/win/native/Cursor.hpp"
 
-#include "cru/common/logger.hpp"
-#include "cru/win/native/exception.hpp"
+#include "cru/common/Logger.hpp"
+#include "cru/win/native/Exception.hpp"
 
 #include <stdexcept>
 
diff --git a/src/win/native/keyboard.cpp b/src/win/native/keyboard.cpp
index 98a95778..aa22e4a4 100644
--- a/src/win/native/keyboard.cpp
+++ b/src/win/native/keyboard.cpp
@@ -1,4 +1,4 @@
-#include "cru/win/native/keyboard.hpp"
+#include "cru/win/native/Keyboard.hpp"
 
 namespace cru::platform::native::win {
 KeyCode VirtualKeyToKeyCode(int virtual_key) {
diff --git a/src/win/native/timer.cpp b/src/win/native/timer.cpp
index 66743963..662067fb 100644
--- a/src/win/native/timer.cpp
+++ b/src/win/native/timer.cpp
@@ -1,4 +1,4 @@
-#include "timer.hpp"
+#include "Timer.hpp"
 
 namespace cru::platform::native::win {
 TimerManager::TimerManager(GodWindow* god_window) { god_window_ = god_window; }
diff --git a/src/win/native/timer.hpp b/src/win/native/timer.hpp
index 6c4871dd..95f186a1 100644
--- a/src/win/native/timer.hpp
+++ b/src/win/native/timer.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/win/win_pre_config.hpp"
+#include "cru/win/WinPreConfig.hpp"
 
-#include "cru/common/base.hpp"
-#include "cru/win/native/god_window.hpp"
+#include "cru/common/Base.hpp"
+#include "cru/win/native/GodWindow.hpp"
 
 #include <chrono>
 #include <functional>
diff --git a/src/win/native/window.cpp b/src/win/native/window.cpp
index bed9a264..9dde1af3 100644
--- a/src/win/native/window.cpp
+++ b/src/win/native/window.cpp
@@ -1,17 +1,17 @@
-#include "cru/win/native/window.hpp"
-
-#include "cru/common/logger.hpp"
-#include "cru/platform/check.hpp"
-#include "cru/win/native/cursor.hpp"
-#include "cru/win/native/exception.hpp"
-#include "cru/win/native/keyboard.hpp"
-#include "cru/win/native/ui_application.hpp"
-#include "cru/win/native/window_class.hpp"
-#include "cru/win/native/window_render_target.hpp"
-#include "cru/win/string.hpp"
-#include "dpi_util.hpp"
-#include "window_d2d_painter.hpp"
-#include "window_manager.hpp"
+#include "cru/win/native/Window.hpp"
+
+#include "cru/common/Logger.hpp"
+#include "cru/platform/Check.hpp"
+#include "cru/win/native/Cursor.hpp"
+#include "cru/win/native/Exception.hpp"
+#include "cru/win/native/Keyboard.hpp"
+#include "cru/win/native/UiApplication.hpp"
+#include "cru/win/native/WindowClass.hpp"
+#include "cru/win/native/WindowRenderTarget.hpp"
+#include "cru/win/String.hpp"
+#include "DpiUtil.hpp"
+#include "WindowD2DPainter.hpp"
+#include "WindowManager.hpp"
 
 #include <imm.h>
 #include <windowsx.h>
diff --git a/src/win/string.cpp b/src/win/string.cpp
index 5518e6af..65a280f2 100644
--- a/src/win/string.cpp
+++ b/src/win/string.cpp
@@ -1,6 +1,6 @@
-#include "cru/win/string.hpp"
+#include "cru/win/String.hpp"
 
-#include "cru/win/exception.hpp"
+#include "cru/win/Exception.hpp"
 
 #include <type_traits>