diff --git a/src/Win/CodePage.cpp b/src/Win/CodePage.cpp
index 9d28aec..d0f746a 100644
--- a/src/Win/CodePage.cpp
+++ b/src/Win/CodePage.cpp
@@ -88,7 +88,7 @@ namespace hgl
         return(result);
     }
     
-    AnsiString ToAnsiString(const CharSet &cs,const UTF16String &str)
+    AnsiString ToAnsiString(const CharSet &cs,const U16String &str)
     {
         int len;
         char *ansi_str;
diff --git a/src/Win/EnumVolume.cpp b/src/Win/EnumVolume.cpp
index 7d19386..fb488d3 100644
--- a/src/Win/EnumVolume.cpp
+++ b/src/Win/EnumVolume.cpp
@@ -63,7 +63,7 @@ namespace hgl
                 }
                 else
                 {
-                    LOG_PROBLEM(U16_TEXT("Get <")+UTF16String(path_name)+U16_TEXT("> info failed！Windows error code: ")+UTF16String::numberOf((uint)GetLastError()));
+                    LOG_PROBLEM(U16_TEXT("Get <")+U16String(path_name)+U16_TEXT("> info failed！Windows error code: ")+U16String::numberOf((uint)GetLastError()));
                 }
 
                 if(GetDiskFreeSpaceExW(path_name,
@@ -75,7 +75,7 @@ namespace hgl
                 }
                 else
                 {
-                    LOG_PROBLEM(U16_TEXT("Get disk free space <")+UTF16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+UTF16String::numberOf((uint)GetLastError()));
+                    LOG_PROBLEM(U16_TEXT("Get disk free space <")+U16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+U16String::numberOf((uint)GetLastError()));
                 }
 
                 count++;
diff --git a/src/Win/ExternalModule.cpp b/src/Win/ExternalModule.cpp
index 7e3720d..6300ee5 100644
--- a/src/Win/ExternalModule.cpp
+++ b/src/Win/ExternalModule.cpp
@@ -43,7 +43,7 @@ namespace hgl
             FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,nullptr,dw,
                             MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),str,0,nullptr);
 
-            LOG_ERROR(L"LoadModule <"+UTF16String(name)+L"> error! os info: "+UTF16String::numberOf(dw)+UTF16String::charOf(L',')+str);
+            LOG_ERROR(L"LoadModule <"+U16String(name)+L"> error! os info: "+U16String::numberOf(dw)+U16String::charOf(L',')+str);
 
             return(false);
         }
diff --git a/src/Win/LogConsole.cpp b/src/Win/LogConsole.cpp
index 31a7d64..fff8142 100644
--- a/src/Win/LogConsole.cpp
+++ b/src/Win/LogConsole.cpp
@@ -25,7 +25,7 @@ namespace hgl
                 console_handle=GetStdHandle(STD_OUTPUT_HANDLE);
             }
 
-            bool Create(const UTF16String &)
+            bool Create(const U16String &)
             {
                 return(true);
             }
diff --git a/src/Win/LogDialog.cpp b/src/Win/LogDialog.cpp
index 72b4edb..e5e472a 100644
--- a/src/Win/LogDialog.cpp
+++ b/src/Win/LogDialog.cpp
@@ -8,7 +8,7 @@ namespace hgl
     {
         class LogWinDialog:public Logger
         {
-            UTF16String name;
+            U16String name;
 
             u16char buf[4096]{};
 
@@ -19,7 +19,7 @@ namespace hgl
                 name=n;
             }
 
-            bool Create(const UTF16String &)
+            bool Create(const U16String &)
             {
                 return(true);
             }
diff --git a/src/Win/WinMessage.cpp b/src/Win/WinMessage.cpp
index ce68eb3..442b82d 100644
--- a/src/Win/WinMessage.cpp
+++ b/src/Win/WinMessage.cpp
@@ -171,8 +171,8 @@ namespace hgl
 
                 ::GetKeyNameTextW(key,name,64);
 
-                LOG_INFO(WideString(L"Unknow Key: " )+WideString::numberOf(key)
-                        +WideString(L" ,name: "     )+WideString(name));
+                LOG_INFO(WString(L"Unknow Key: " )+WString::numberOf(key)
+                        +WString(L" ,name: "     )+WString(name));
             }
     #endif _DEBUG
 
diff --git a/src/Win/WinWindow.cpp b/src/Win/WinWindow.cpp
index d6374e8..22f917a 100644
--- a/src/Win/WinWindow.cpp
+++ b/src/Win/WinWindow.cpp
@@ -208,7 +208,7 @@ namespace hgl
         return ::WaitMessage();
     }
 
-    Window *CreateRenderWindow(const WideString& win_name)
+    Window *CreateRenderWindow(const WString& win_name)
     {
         return(new WinWindow(win_name));
     }