2 files changed, 6 insertions, 7 deletions
diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h
index 98042841..0729d176 100644
--- a/src/ui/host/RoutedEventDispatch.h
+++ b/src/ui/host/RoutedEventDispatch.h
@@ -23,7 +23,7 @@ namespace cru::ui::host {
 // as the rest arguments.
 template <typename EventArgs, typename... Args>
 void DispatchEvent(
-    const String& event_name, controls::Control* const original_sender,
+    const std::string& event_name, controls::Control* const original_sender,
     events::RoutedEvent<EventArgs>* (controls::Control::*event_ptr)(),
     controls::Control* const last_receiver, Args&&... args) {
   constexpr auto kLogTag = "DispatchEvent";
@@ -37,7 +37,7 @@ void DispatchEvent(
       CRU_LOG_TAG_DEBUG(
           "Routed event {} no need to dispatch (original_sender == "
           "last_receiver). Original sender is {}.",
-          event_name.ToUtf8(), original_sender->GetControlType().ToUtf8());
+          event_name, original_sender->GetControlType());
     return;
   }
 
@@ -55,15 +55,15 @@ void DispatchEvent(
 
   if constexpr (debug_flags::routed_event) {
     std::string log = "Dispatch routed event ";
-    log += event_name.ToUtf8();
+    log += event_name;
     log += ". Path (parent first): ";
     auto i = receive_list.crbegin();
     const auto end = --receive_list.crend();
     for (; i != end; ++i) {
-      log += i->Resolve()->GetControlType().ToUtf8();
+      log += i->Resolve()->GetControlType();
       log += " -> ";
     }
-    log += i->Resolve()->GetControlType().ToUtf8();
+    log += i->Resolve()->GetControlType();
     CRU_LOG_TAG_DEBUG("{}", log);
   }
 
diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp
index 88e8cc87..4c707772 100644
--- a/src/ui/host/WindowHost.cpp
+++ b/src/ui/host/WindowHost.cpp
@@ -21,8 +21,7 @@ using platform::gui::INativeWindow;
 using platform::gui::IUiApplication;
 
 namespace event_names {
-#define CRU_DEFINE_EVENT_NAME(name) \
-  constexpr const char16_t* name = CRU_MAKE_UNICODE_LITERAL(name);
+#define CRU_DEFINE_EVENT_NAME(name) constexpr const char* name = #name;
 
 CRU_DEFINE_EVENT_NAME(LoseFocus)
 CRU_DEFINE_EVENT_NAME(GainFocus)