diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
index f5a6b90b4..73c2353d4 100644
--- a/src/lib/base/Event.h
+++ b/src/lib/base/Event.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "common/Common.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 
 class EventData
 {
diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h
index e6f0b7209..f55cce665 100644
--- a/src/lib/base/EventQueue.h
+++ b/src/lib/base/EventQueue.h
@@ -13,7 +13,7 @@
 #include "base/IEventQueue.h"
 #include "base/PriorityQueue.h"
 #include "base/Stopwatch.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "mt/CondVar.h"
 
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index bad92e709..9c7f811f8 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(common STATIC
   StdExcept.h
   StdIStream.h
   StdList.h
-  stdmap.h
+  StdMap.h
   stdostream.h
   stdpost.h
   stdpre.h
diff --git a/src/lib/common/stdmap.h b/src/lib/common/StdMap.h
similarity index 100%
rename from src/lib/common/stdmap.h
rename to src/lib/common/StdMap.h
diff --git a/src/lib/deskflow/KeyMap.h b/src/lib/deskflow/KeyMap.h
index a8bd5f7f7..8739677f7 100644
--- a/src/lib/deskflow/KeyMap.h
+++ b/src/lib/deskflow/KeyMap.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "base/String.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "common/stdvector.h"
 #include "deskflow/KeyTypes.h"
diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h
index 85b195d62..e8f0e678e 100644
--- a/src/lib/net/SocketMultiplexer.h
+++ b/src/lib/net/SocketMultiplexer.h
@@ -9,7 +9,7 @@
 
 #include "arch/IArchNetwork.h"
 #include "common/StdList.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 
 template <class T> class CondVar;
 class Mutex;
diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h
index c6ff0806a..be30c069f 100644
--- a/src/lib/platform/MSWindowsDesks.h
+++ b/src/lib/platform/MSWindowsDesks.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
 #include "deskflow/OptionTypes.h"
diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h
index 43173c105..236ed4676 100644
--- a/src/lib/platform/OSXKeyState.h
+++ b/src/lib/platform/OSXKeyState.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "OSXAutoTypes.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "common/stdvector.h"
 #include "deskflow/KeyState.h"
diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h
index e608d6aae..e39013e1a 100644
--- a/src/lib/platform/OSXScreen.h
+++ b/src/lib/platform/OSXScreen.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdvector.h"
 #include "deskflow/DragInformation.h"
 #include "deskflow/PlatformScreen.h"
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h
index eba3690e8..0b643b50a 100644
--- a/src/lib/platform/XWindowsClipboard.h
+++ b/src/lib/platform/XWindowsClipboard.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "common/StdList.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdvector.h"
 #include "deskflow/ClipboardTypes.h"
 #include "deskflow/IClipboard.h"
diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp
index 8380ee753..fb7086382 100644
--- a/src/lib/platform/XWindowsKeyState.cpp
+++ b/src/lib/platform/XWindowsKeyState.cpp
@@ -15,7 +15,7 @@
 #include "platform/XWindowsKeyState.h"
 
 #include "base/Log.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "deskflow/AppUtil.h"
 #include "deskflow/ClientApp.h"
 #include "deskflow/ClientArgs.h"
diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index 5cb138130..1772db540 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdvector.h"
 #include "deskflow/KeyState.h"
 
diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h
index 02f843cc9..931dfa3b1 100644
--- a/src/lib/platform/XWindowsScreenSaver.h
+++ b/src/lib/platform/XWindowsScreenSaver.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "base/IEventQueue.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "deskflow/IScreenSaver.h"
 
 #if X_DISPLAY_MISSING
diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h
index 902539380..9efe13310 100644
--- a/src/lib/platform/XWindowsUtil.h
+++ b/src/lib/platform/XWindowsUtil.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "base/EventTypes.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdvector.h"
 
 #include <string>
diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h
index 5e52856fc..6b3197b28 100644
--- a/src/lib/server/Config.h
+++ b/src/lib/server/Config.h
@@ -9,7 +9,7 @@
 
 #include "base/String.h"
 #include "base/XBase.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/OptionTypes.h"
diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h
index 14aba3582..b4d52af48 100644
--- a/src/lib/server/InputFilter.h
+++ b/src/lib/server/InputFilter.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "deskflow/IPlatformScreen.h"
 #include "deskflow/KeyTypes.h"
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index e304a80b3..bc0a19dd8 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -10,7 +10,7 @@
 #include "base/Event.h"
 #include "base/EventTypes.h"
 #include "base/Stopwatch.h"
-#include "common/stdmap.h"
+#include "common/StdMap.h"
 #include "common/stdset.h"
 #include "common/stdvector.h"
 #include "deskflow/Clipboard.h"