2 files changed, 30 insertions, 30 deletions

diff --git a/include/cru/ui/controls/Control.hpp b/include/cru/ui/controls/Control.hpp
index c6101370..29d48f21 100644
--- a/include/cru/ui/controls/Control.hpp
+++ b/include/cru/ui/controls/Control.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.hpp"
 
-#include "../events/UiEvent.hpp"
+#include "../events/UiEvents.hpp"
 #include "../render/Base.hpp"
 #include "cru/common/Event.hpp"
 
@@ -75,57 +75,57 @@ class Control : public Object {
   // the mouse, this event is raised as regular. But if mouse is captured by
   // another control, the control will not receive any mouse enter event. You
   // can use `IsMouseCaptured` to get more info.
-  event::RoutedEvent<event::MouseEventArgs>* MouseEnterEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseEnterEvent() {
     return &mouse_enter_event_;
   }
   // Raised when mouse is leave the control. Even when the control itself
   // captures the mouse, this event is raised as regular. But if mouse is
   // captured by another control, the control will not receive any mouse leave
   // event. You can use `IsMouseCaptured` to get more info.
-  event::RoutedEvent<event::MouseEventArgs>* MouseLeaveEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseLeaveEvent() {
     return &mouse_leave_event_;
   }
   // Raised when mouse is move in the control.
-  event::RoutedEvent<event::MouseEventArgs>* MouseMoveEvent() {
+  events::RoutedEvent<events::MouseEventArgs>* MouseMoveEvent() {
     return &mouse_move_event_;
   }
   // Raised when a mouse button is pressed in the control.
-  event::RoutedEvent<event::MouseButtonEventArgs>* MouseDownEvent() {
+  events::RoutedEvent<events::MouseButtonEventArgs>* MouseDownEvent() {
     return &mouse_down_event_;
   }
   // Raised when a mouse button is released in the control.
-  event::RoutedEvent<event::MouseButtonEventArgs>* MouseUpEvent() {
+  events::RoutedEvent<events::MouseButtonEventArgs>* MouseUpEvent() {
     return &mouse_up_event_;
   }
-  event::RoutedEvent<event::MouseWheelEventArgs>* MouseWheelEvent() {
+  events::RoutedEvent<events::MouseWheelEventArgs>* MouseWheelEvent() {
     return &mouse_wheel_event_;
   }
-  event::RoutedEvent<event::KeyEventArgs>* KeyDownEvent() {
+  events::RoutedEvent<events::KeyEventArgs>* KeyDownEvent() {
     return &key_down_event_;
   }
-  event::RoutedEvent<event::KeyEventArgs>* KeyUpEvent() {
+  events::RoutedEvent<events::KeyEventArgs>* KeyUpEvent() {
     return &key_up_event_;
   }
-  event::RoutedEvent<event::FocusChangeEventArgs>* GainFocusEvent() {
+  events::RoutedEvent<events::FocusChangeEventArgs>* GainFocusEvent() {
     return &gain_focus_event_;
   }
-  event::RoutedEvent<event::FocusChangeEventArgs>* LoseFocusEvent() {
+  events::RoutedEvent<events::FocusChangeEventArgs>* LoseFocusEvent() {
     return &lose_focus_event_;
   }
 
  private:
-  event::RoutedEvent<event::MouseEventArgs> mouse_enter_event_;
-  event::RoutedEvent<event::MouseEventArgs> mouse_leave_event_;
-  event::RoutedEvent<event::MouseEventArgs> mouse_move_event_;
-  event::RoutedEvent<event::MouseButtonEventArgs> mouse_down_event_;
-  event::RoutedEvent<event::MouseButtonEventArgs> mouse_up_event_;
-  event::RoutedEvent<event::MouseWheelEventArgs> mouse_wheel_event_;
-
-  event::RoutedEvent<event::KeyEventArgs> key_down_event_;
-  event::RoutedEvent<event::KeyEventArgs> key_up_event_;
-
-  event::RoutedEvent<event::FocusChangeEventArgs> gain_focus_event_;
-  event::RoutedEvent<event::FocusChangeEventArgs> lose_focus_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_enter_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_leave_event_;
+  events::RoutedEvent<events::MouseEventArgs> mouse_move_event_;
+  events::RoutedEvent<events::MouseButtonEventArgs> mouse_down_event_;
+  events::RoutedEvent<events::MouseButtonEventArgs> mouse_up_event_;
+  events::RoutedEvent<events::MouseWheelEventArgs> mouse_wheel_event_;
+
+  events::RoutedEvent<events::KeyEventArgs> key_down_event_;
+  events::RoutedEvent<events::KeyEventArgs> key_up_event_;
+
+  events::RoutedEvent<events::FocusChangeEventArgs> gain_focus_event_;
+  events::RoutedEvent<events::FocusChangeEventArgs> lose_focus_event_;
 
   //*************** region: tree ***************
  protected:
diff --git a/include/cru/ui/controls/TextHostControlService.hpp b/include/cru/ui/controls/TextHostControlService.hpp
index 93b74d09..1bdf0509 100644
--- a/include/cru/ui/controls/TextHostControlService.hpp
+++ b/include/cru/ui/controls/TextHostControlService.hpp
@@ -161,18 +161,18 @@ class TextHostControlService : public Object {
   void UpdateInputMethodPosition();
 
   template <typename TArgs>
-  void SetupOneHandler(event::RoutedEvent<TArgs>* (Control::*event)(),
+  void SetupOneHandler(events::RoutedEvent<TArgs>* (Control::*event)(),
                        void (TextHostControlService::*handler)(
-                           typename event::RoutedEvent<TArgs>::EventArgs)) {
+                           typename events::RoutedEvent<TArgs>::EventArgs)) {
     this->event_guard_ += (this->control_->*event)()->Bubble()->AddHandler(
         std::bind(handler, this, std::placeholders::_1));
   }
 
-  void MouseMoveHandler(event::MouseEventArgs& args);
-  void MouseDownHandler(event::MouseButtonEventArgs& args);
-  void MouseUpHandler(event::MouseButtonEventArgs& args);
-  void GainFocusHandler(event::FocusChangeEventArgs& args);
-  void LoseFocusHandler(event::FocusChangeEventArgs& args);
+  void MouseMoveHandler(events::MouseEventArgs& args);
+  void MouseDownHandler(events::MouseButtonEventArgs& args);
+  void MouseUpHandler(events::MouseButtonEventArgs& args);
+  void GainFocusHandler(events::FocusChangeEventArgs& args);
+  void LoseFocusHandler(events::FocusChangeEventArgs& args);
 
   void SetUpShortcuts();