diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp
index 278d6abc1..5e0c61369 100644
--- a/src/lib/client/ServerProxy.cpp
+++ b/src/lib/client/ServerProxy.cpp
@@ -16,10 +16,10 @@
 #include "deskflow/Clipboard.h"
 #include "deskflow/ClipboardChunk.h"
 #include "deskflow/FileChunk.h"
+#include "deskflow/OptionTypes.h"
 #include "deskflow/ProtocolUtil.h"
 #include "deskflow/StreamChunker.h"
 #include "deskflow/XDeskflow.h"
-#include "deskflow/option_types.h"
 #include "deskflow/protocol_types.h"
 #include "io/IStream.h"
 
diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt
index c9626ae54..789f4c98d 100644
--- a/src/lib/deskflow/CMakeLists.txt
+++ b/src/lib/deskflow/CMakeLists.txt
@@ -120,7 +120,7 @@ add_library(${lib_name} STATIC ${PLATFORM_CODE}
   KeyState.cpp
   KeyState.h
   MouseTypes.h
-  option_types.h
+  OptionTypes.h
   PacketStreamFilter.cpp
   PacketStreamFilter.h
   PlatformScreen.cpp
diff --git a/src/lib/deskflow/IClient.h b/src/lib/deskflow/IClient.h
index 3096e2c59..514ee00ac 100644
--- a/src/lib/deskflow/IClient.h
+++ b/src/lib/deskflow/IClient.h
@@ -11,7 +11,7 @@
 #include "deskflow/IScreen.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 
 #include <string>
 
diff --git a/src/lib/deskflow/IPlatformScreen.h b/src/lib/deskflow/IPlatformScreen.h
index 46195934c..a8a5f650c 100644
--- a/src/lib/deskflow/IPlatformScreen.h
+++ b/src/lib/deskflow/IPlatformScreen.h
@@ -13,7 +13,7 @@
 #include "deskflow/IPrimaryScreen.h"
 #include "deskflow/IScreen.h"
 #include "deskflow/ISecondaryScreen.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 
 class IClipboard;
 
diff --git a/src/lib/deskflow/option_types.h b/src/lib/deskflow/OptionTypes.h
similarity index 100%
rename from src/lib/deskflow/option_types.h
rename to src/lib/deskflow/OptionTypes.h
diff --git a/src/lib/deskflow/Screen.h b/src/lib/deskflow/Screen.h
index 0a5841b09..46d729734 100644
--- a/src/lib/deskflow/Screen.h
+++ b/src/lib/deskflow/Screen.h
@@ -12,7 +12,7 @@
 #include "deskflow/IScreen.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 
 class IClipboard;
 class IPlatformScreen;
diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h
index 60bd543f0..688f8c9d1 100644
--- a/src/lib/platform/MSWindowsDesks.h
+++ b/src/lib/platform/MSWindowsDesks.h
@@ -10,7 +10,7 @@
 #include "common/stdmap.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 #include "mt/CondVar.h"
 #include "mt/Mutex.h"
 #include "platform/dfwhook.h"
diff --git a/src/lib/server/ClientProxyUnknown.h b/src/lib/server/ClientProxyUnknown.h
index 5314fb9df..bd675f5e5 100644
--- a/src/lib/server/ClientProxyUnknown.h
+++ b/src/lib/server/ClientProxyUnknown.h
@@ -9,7 +9,7 @@
 
 #include "base/Event.h"
 #include "base/EventTypes.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 
 #include <string>
 
diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp
index e213c120e..a1c93099c 100644
--- a/src/lib/server/Config.cpp
+++ b/src/lib/server/Config.cpp
@@ -12,8 +12,8 @@
 #include "common/stdostream.h"
 #include "deskflow/KeyMap.h"
 #include "deskflow/KeyTypes.h"
+#include "deskflow/OptionTypes.h"
 #include "deskflow/XDeskflow.h"
-#include "deskflow/option_types.h"
 #include "net/XSocket.h"
 #include "server/Server.h"
 
diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h
index e311a26a6..2a1b882c4 100644
--- a/src/lib/server/Config.h
+++ b/src/lib/server/Config.h
@@ -12,7 +12,7 @@
 #include "common/stdmap.h"
 #include "common/stdset.h"
 #include "deskflow/IPlatformScreen.h"
-#include "deskflow/option_types.h"
+#include "deskflow/OptionTypes.h"
 #include "deskflow/protocol_types.h"
 #include "net/NetworkAddress.h"
 #include "server/InputFilter.h"
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 21884dad7..8dbb58eb5 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -17,11 +17,11 @@
 #include "deskflow/DropHelper.h"
 #include "deskflow/FileChunk.h"
 #include "deskflow/IPlatformScreen.h"
+#include "deskflow/OptionTypes.h"
 #include "deskflow/PacketStreamFilter.h"
 #include "deskflow/Screen.h"
 #include "deskflow/StreamChunker.h"
 #include "deskflow/XDeskflow.h"
-#include "deskflow/option_types.h"
 #include "deskflow/protocol_types.h"
 #include "mt/Thread.h"
 #include "net/TCPSocket.h"
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index 7d78229f3..e304a80b3 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -19,8 +19,8 @@
 #include "deskflow/INode.h"
 #include "deskflow/KeyTypes.h"
 #include "deskflow/MouseTypes.h"
+#include "deskflow/OptionTypes.h"
 #include "deskflow/ServerArgs.h"
-#include "deskflow/option_types.h"
 #include "server/Config.h"
 #include <memory>