5 files changed, 10 insertions, 10 deletions
diff --git a/src/base/StringUtil.cpp b/src/base/StringUtil.cpp
index a5cc3122..eaa3f58e 100644
--- a/src/base/StringUtil.cpp
+++ b/src/base/StringUtil.cpp
@@ -404,7 +404,7 @@ Index Utf16IndexCodePointToCodeUnit(const Utf16CodeUnit* ptr, Index size,
 }
 
 #ifdef _WIN32
-std::wstring ToUtf16(std::string_view str) {
+std::wstring ToUtf16WString(std::string_view str) {
   Utf8CodePointIterator iter(str.data(),str.size());
   std::wstring result;
   for (auto c : iter) {
@@ -413,7 +413,7 @@ std::wstring ToUtf16(std::string_view str) {
   return result;
 }
 
-std::string ToUtf8(std::wstring_view str) {
+std::string ToUtf8String(std::wstring_view str) {
   Utf16CodePointIterator iter(reinterpret_cast<const char16_t*>( str.data()),str.size());
   std::string result;
   for (auto c : iter) {
diff --git a/src/base/log/StdioLogTarget.cpp b/src/base/log/StdioLogTarget.cpp
index bdcdd783..4b77f755 100644
--- a/src/base/log/StdioLogTarget.cpp
+++ b/src/base/log/StdioLogTarget.cpp
@@ -10,7 +10,7 @@ StdioLogTarget::~StdioLogTarget() {}
 
 void StdioLogTarget::Write(log::LogLevel level, std::string message) {
 #ifdef _WIN32
-  auto s = string::ToUtf16(message);
+  auto s = string::ToUtf16WString(message);
   if (level == log::LogLevel::Error) {
     std::wcerr << s << std::endl;
   } else {
diff --git a/src/base/platform/win/DebugLogTarget.cpp b/src/base/platform/win/DebugLogTarget.cpp
index 3b73b332..d6dc1d95 100644
--- a/src/base/platform/win/DebugLogTarget.cpp
+++ b/src/base/platform/win/DebugLogTarget.cpp
@@ -6,7 +6,7 @@ namespace cru::platform::win {
 void WinDebugLogTarget::Write(::cru::log::LogLevel level, std::string s) {
   CRU_UNUSED(level)
 
-  std::wstring m = string::ToUtf16(s);
+  std::wstring m = string::ToUtf16WString(s);
   ::OutputDebugStringW(reinterpret_cast<const wchar_t*>(m.c_str()));
 }
 }  // namespace cru::platform::win
diff --git a/src/base/platform/win/Stream.cpp b/src/base/platform/win/Stream.cpp
index d4b24d64..72466905 100644
--- a/src/base/platform/win/Stream.cpp
+++ b/src/base/platform/win/Stream.cpp
@@ -43,7 +43,7 @@ HANDLE OpenHandle(std::string_view path, OpenFileFlag flags) {
   IStream* stream;
 
   auto handle =
-      ::CreateFileW(cru::string::ToUtf16(path).c_str(), access, 0, nullptr,
+      ::CreateFileW(cru::string::ToUtf16WString(path).c_str(), access, 0, nullptr,
                     creation_disposition, FILE_ATTRIBUTE_NORMAL, nullptr);
 
   if (handle == INVALID_HANDLE_VALUE) {
@@ -163,7 +163,7 @@ IStream* OpenComStream(std::string_view path, OpenFileFlag flags) {
   IStream* stream;
 
   CheckHResult(SHCreateStreamOnFileEx(
-      cru::string::ToUtf16(path).c_str(), grfMode, FILE_ATTRIBUTE_NORMAL,
+      cru::string::ToUtf16WString(path).c_str(), grfMode, FILE_ATTRIBUTE_NORMAL,
       flags & io::OpenFileFlags::Create ? TRUE : FALSE, NULL, &stream));
 
   return stream;
diff --git a/src/base/platform/win/Win32SubProcess.cpp b/src/base/platform/win/Win32SubProcess.cpp
index c97f3d66..aed3937c 100644
--- a/src/base/platform/win/Win32SubProcess.cpp
+++ b/src/base/platform/win/Win32SubProcess.cpp
@@ -8,7 +8,7 @@
 #include <string_view>
 
 namespace cru::platform::win {
-using cru::string::ToUtf16;
+using cru::string::ToUtf16WString;
 
 Win32SubProcessImpl::Win32SubProcessImpl() : exit_code_(0) {}
 
@@ -23,14 +23,14 @@ void Win32SubProcessImpl::PlatformCreateProcess(
                                            std::move(inner));
   };
 
-  auto app = ToUtf16(start_info.program);
+  auto app = ToUtf16WString(start_info.program);
   // TODO: Space and quoting problem.
   auto command_line =
-      app + L" " + ToUtf16(cru::string::Join(" ", start_info.arguments));
+      app + L" " + ToUtf16WString(cru::string::Join(" ", start_info.arguments));
 
   std::wstring env_str;
   for (const auto& [key, value] : start_info.environments) {
-    env_str += ToUtf16(key) + L"=" + ToUtf16(value) + L"\0";
+    env_str += ToUtf16WString(key) + L"=" + ToUtf16WString(value) + L"\0";
   }
   env_str += L"\0";