diff --git a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp rename to src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp diff --git a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h b/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h rename to src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h diff --git a/src/cmd/synergyc/COSXClientTaskBarReceiver.cpp b/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyc/COSXClientTaskBarReceiver.cpp rename to src/cmd/synergyc/OSXClientTaskBarReceiver.cpp diff --git a/src/cmd/synergyc/COSXClientTaskBarReceiver.h b/src/cmd/synergyc/OSXClientTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyc/COSXClientTaskBarReceiver.h rename to src/cmd/synergyc/OSXClientTaskBarReceiver.h diff --git a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp rename to src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp diff --git a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h b/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h rename to src/cmd/synergyc/XWindowsClientTaskBarReceiver.h diff --git a/src/cmd/synergyp/CMSWindowsPortableTaskBarReceiver.cpp b/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyp/CMSWindowsPortableTaskBarReceiver.cpp rename to src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.cpp diff --git a/src/cmd/synergyp/CMSWindowsPortableTaskBarReceiver.h b/src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyp/CMSWindowsPortableTaskBarReceiver.h rename to src/cmd/synergyp/MSWindowsPortableTaskBarReceiver.h diff --git a/src/cmd/synergyp/COSXPortableTaskBarReceiver.cpp b/src/cmd/synergyp/OSXPortableTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyp/COSXPortableTaskBarReceiver.cpp rename to src/cmd/synergyp/OSXPortableTaskBarReceiver.cpp diff --git a/src/cmd/synergyp/COSXPortableTaskBarReceiver.h b/src/cmd/synergyp/OSXPortableTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyp/COSXPortableTaskBarReceiver.h rename to src/cmd/synergyp/OSXPortableTaskBarReceiver.h diff --git a/src/cmd/synergyp/CXWindowsPortableTaskBarReceiver.cpp b/src/cmd/synergyp/XWindowsPortableTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergyp/CXWindowsPortableTaskBarReceiver.cpp rename to src/cmd/synergyp/XWindowsPortableTaskBarReceiver.cpp diff --git a/src/cmd/synergyp/CXWindowsPortableTaskBarReceiver.h b/src/cmd/synergyp/XWindowsPortableTaskBarReceiver.h similarity index 100% rename from src/cmd/synergyp/CXWindowsPortableTaskBarReceiver.h rename to src/cmd/synergyp/XWindowsPortableTaskBarReceiver.h diff --git a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp rename to src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp diff --git a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h b/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h similarity index 100% rename from src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h rename to src/cmd/synergys/MSWindowsServerTaskBarReceiver.h diff --git a/src/cmd/synergys/COSXServerTaskBarReceiver.cpp b/src/cmd/synergys/OSXServerTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergys/COSXServerTaskBarReceiver.cpp rename to src/cmd/synergys/OSXServerTaskBarReceiver.cpp diff --git a/src/cmd/synergys/COSXServerTaskBarReceiver.h b/src/cmd/synergys/OSXServerTaskBarReceiver.h similarity index 100% rename from src/cmd/synergys/COSXServerTaskBarReceiver.h rename to src/cmd/synergys/OSXServerTaskBarReceiver.h diff --git a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp similarity index 100% rename from src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp rename to src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp diff --git a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.h b/src/cmd/synergys/XWindowsServerTaskBarReceiver.h similarity index 100% rename from src/cmd/synergys/CXWindowsServerTaskBarReceiver.h rename to src/cmd/synergys/XWindowsServerTaskBarReceiver.h diff --git a/src/lib/arch/CArch.cpp b/src/lib/arch/Arch.cpp similarity index 100% rename from src/lib/arch/CArch.cpp rename to src/lib/arch/Arch.cpp diff --git a/src/lib/arch/CArch.h b/src/lib/arch/Arch.h similarity index 100% rename from src/lib/arch/CArch.h rename to src/lib/arch/Arch.h diff --git a/src/lib/arch/CArchConsoleStd.cpp b/src/lib/arch/ArchConsoleStd.cpp similarity index 100% rename from src/lib/arch/CArchConsoleStd.cpp rename to src/lib/arch/ArchConsoleStd.cpp diff --git a/src/lib/arch/CArchConsoleStd.h b/src/lib/arch/ArchConsoleStd.h similarity index 100% rename from src/lib/arch/CArchConsoleStd.h rename to src/lib/arch/ArchConsoleStd.h diff --git a/src/lib/arch/CArchConsoleUnix.cpp b/src/lib/arch/ArchConsoleUnix.cpp similarity index 100% rename from src/lib/arch/CArchConsoleUnix.cpp rename to src/lib/arch/ArchConsoleUnix.cpp diff --git a/src/lib/arch/CArchConsoleUnix.h b/src/lib/arch/ArchConsoleUnix.h similarity index 100% rename from src/lib/arch/CArchConsoleUnix.h rename to src/lib/arch/ArchConsoleUnix.h diff --git a/src/lib/arch/CArchConsoleWindows.cpp b/src/lib/arch/ArchConsoleWindows.cpp similarity index 100% rename from src/lib/arch/CArchConsoleWindows.cpp rename to src/lib/arch/ArchConsoleWindows.cpp diff --git a/src/lib/arch/CArchConsoleWindows.h b/src/lib/arch/ArchConsoleWindows.h similarity index 100% rename from src/lib/arch/CArchConsoleWindows.h rename to src/lib/arch/ArchConsoleWindows.h diff --git a/src/lib/arch/CArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp similarity index 100% rename from src/lib/arch/CArchDaemonNone.cpp rename to src/lib/arch/ArchDaemonNone.cpp diff --git a/src/lib/arch/CArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h similarity index 100% rename from src/lib/arch/CArchDaemonNone.h rename to src/lib/arch/ArchDaemonNone.h diff --git a/src/lib/arch/CArchDaemonUnix.cpp b/src/lib/arch/ArchDaemonUnix.cpp similarity index 100% rename from src/lib/arch/CArchDaemonUnix.cpp rename to src/lib/arch/ArchDaemonUnix.cpp diff --git a/src/lib/arch/CArchDaemonUnix.h b/src/lib/arch/ArchDaemonUnix.h similarity index 100% rename from src/lib/arch/CArchDaemonUnix.h rename to src/lib/arch/ArchDaemonUnix.h diff --git a/src/lib/arch/CArchDaemonWindows.cpp b/src/lib/arch/ArchDaemonWindows.cpp similarity index 100% rename from src/lib/arch/CArchDaemonWindows.cpp rename to src/lib/arch/ArchDaemonWindows.cpp diff --git a/src/lib/arch/CArchDaemonWindows.h b/src/lib/arch/ArchDaemonWindows.h similarity index 100% rename from src/lib/arch/CArchDaemonWindows.h rename to src/lib/arch/ArchDaemonWindows.h diff --git a/src/lib/arch/CArchFileUnix.cpp b/src/lib/arch/ArchFileUnix.cpp similarity index 100% rename from src/lib/arch/CArchFileUnix.cpp rename to src/lib/arch/ArchFileUnix.cpp diff --git a/src/lib/arch/CArchFileUnix.h b/src/lib/arch/ArchFileUnix.h similarity index 100% rename from src/lib/arch/CArchFileUnix.h rename to src/lib/arch/ArchFileUnix.h diff --git a/src/lib/arch/CArchFileWindows.cpp b/src/lib/arch/ArchFileWindows.cpp similarity index 100% rename from src/lib/arch/CArchFileWindows.cpp rename to src/lib/arch/ArchFileWindows.cpp diff --git a/src/lib/arch/CArchFileWindows.h b/src/lib/arch/ArchFileWindows.h similarity index 100% rename from src/lib/arch/CArchFileWindows.h rename to src/lib/arch/ArchFileWindows.h diff --git a/src/lib/arch/CArchInternetUnix.cpp b/src/lib/arch/ArchInternetUnix.cpp similarity index 100% rename from src/lib/arch/CArchInternetUnix.cpp rename to src/lib/arch/ArchInternetUnix.cpp diff --git a/src/lib/arch/CArchInternetUnix.h b/src/lib/arch/ArchInternetUnix.h similarity index 100% rename from src/lib/arch/CArchInternetUnix.h rename to src/lib/arch/ArchInternetUnix.h diff --git a/src/lib/arch/CArchInternetWindows.cpp b/src/lib/arch/ArchInternetWindows.cpp similarity index 100% rename from src/lib/arch/CArchInternetWindows.cpp rename to src/lib/arch/ArchInternetWindows.cpp diff --git a/src/lib/arch/CArchInternetWindows.h b/src/lib/arch/ArchInternetWindows.h similarity index 100% rename from src/lib/arch/CArchInternetWindows.h rename to src/lib/arch/ArchInternetWindows.h diff --git a/src/lib/arch/CArchLogUnix.cpp b/src/lib/arch/ArchLogUnix.cpp similarity index 100% rename from src/lib/arch/CArchLogUnix.cpp rename to src/lib/arch/ArchLogUnix.cpp diff --git a/src/lib/arch/CArchLogUnix.h b/src/lib/arch/ArchLogUnix.h similarity index 100% rename from src/lib/arch/CArchLogUnix.h rename to src/lib/arch/ArchLogUnix.h diff --git a/src/lib/arch/CArchLogWindows.cpp b/src/lib/arch/ArchLogWindows.cpp similarity index 100% rename from src/lib/arch/CArchLogWindows.cpp rename to src/lib/arch/ArchLogWindows.cpp diff --git a/src/lib/arch/CArchLogWindows.h b/src/lib/arch/ArchLogWindows.h similarity index 100% rename from src/lib/arch/CArchLogWindows.h rename to src/lib/arch/ArchLogWindows.h diff --git a/src/lib/arch/CArchMiscWindows.cpp b/src/lib/arch/ArchMiscWindows.cpp similarity index 100% rename from src/lib/arch/CArchMiscWindows.cpp rename to src/lib/arch/ArchMiscWindows.cpp diff --git a/src/lib/arch/CArchMiscWindows.h b/src/lib/arch/ArchMiscWindows.h similarity index 100% rename from src/lib/arch/CArchMiscWindows.h rename to src/lib/arch/ArchMiscWindows.h diff --git a/src/lib/arch/CArchMultithreadPosix.cpp b/src/lib/arch/ArchMultithreadPosix.cpp similarity index 100% rename from src/lib/arch/CArchMultithreadPosix.cpp rename to src/lib/arch/ArchMultithreadPosix.cpp diff --git a/src/lib/arch/CArchMultithreadPosix.h b/src/lib/arch/ArchMultithreadPosix.h similarity index 100% rename from src/lib/arch/CArchMultithreadPosix.h rename to src/lib/arch/ArchMultithreadPosix.h diff --git a/src/lib/arch/CArchMultithreadWindows.cpp b/src/lib/arch/ArchMultithreadWindows.cpp similarity index 100% rename from src/lib/arch/CArchMultithreadWindows.cpp rename to src/lib/arch/ArchMultithreadWindows.cpp diff --git a/src/lib/arch/CArchMultithreadWindows.h b/src/lib/arch/ArchMultithreadWindows.h similarity index 100% rename from src/lib/arch/CArchMultithreadWindows.h rename to src/lib/arch/ArchMultithreadWindows.h diff --git a/src/lib/arch/CArchNetworkBSD.cpp b/src/lib/arch/ArchNetworkBSD.cpp similarity index 100% rename from src/lib/arch/CArchNetworkBSD.cpp rename to src/lib/arch/ArchNetworkBSD.cpp diff --git a/src/lib/arch/CArchNetworkBSD.h b/src/lib/arch/ArchNetworkBSD.h similarity index 100% rename from src/lib/arch/CArchNetworkBSD.h rename to src/lib/arch/ArchNetworkBSD.h diff --git a/src/lib/arch/CArchNetworkWinsock.cpp b/src/lib/arch/ArchNetworkWinsock.cpp similarity index 100% rename from src/lib/arch/CArchNetworkWinsock.cpp rename to src/lib/arch/ArchNetworkWinsock.cpp diff --git a/src/lib/arch/CArchNetworkWinsock.h b/src/lib/arch/ArchNetworkWinsock.h similarity index 100% rename from src/lib/arch/CArchNetworkWinsock.h rename to src/lib/arch/ArchNetworkWinsock.h diff --git a/src/lib/arch/CArchPluginUnix.cpp b/src/lib/arch/ArchPluginUnix.cpp similarity index 100% rename from src/lib/arch/CArchPluginUnix.cpp rename to src/lib/arch/ArchPluginUnix.cpp diff --git a/src/lib/arch/CArchPluginUnix.h b/src/lib/arch/ArchPluginUnix.h similarity index 100% rename from src/lib/arch/CArchPluginUnix.h rename to src/lib/arch/ArchPluginUnix.h diff --git a/src/lib/arch/CArchPluginWindows.cpp b/src/lib/arch/ArchPluginWindows.cpp similarity index 100% rename from src/lib/arch/CArchPluginWindows.cpp rename to src/lib/arch/ArchPluginWindows.cpp diff --git a/src/lib/arch/CArchPluginWindows.h b/src/lib/arch/ArchPluginWindows.h similarity index 100% rename from src/lib/arch/CArchPluginWindows.h rename to src/lib/arch/ArchPluginWindows.h diff --git a/src/lib/arch/CArchSleepUnix.cpp b/src/lib/arch/ArchSleepUnix.cpp similarity index 100% rename from src/lib/arch/CArchSleepUnix.cpp rename to src/lib/arch/ArchSleepUnix.cpp diff --git a/src/lib/arch/CArchSleepUnix.h b/src/lib/arch/ArchSleepUnix.h similarity index 100% rename from src/lib/arch/CArchSleepUnix.h rename to src/lib/arch/ArchSleepUnix.h diff --git a/src/lib/arch/CArchSleepWindows.cpp b/src/lib/arch/ArchSleepWindows.cpp similarity index 100% rename from src/lib/arch/CArchSleepWindows.cpp rename to src/lib/arch/ArchSleepWindows.cpp diff --git a/src/lib/arch/CArchSleepWindows.h b/src/lib/arch/ArchSleepWindows.h similarity index 100% rename from src/lib/arch/CArchSleepWindows.h rename to src/lib/arch/ArchSleepWindows.h diff --git a/src/lib/arch/CArchStringUnix.cpp b/src/lib/arch/ArchStringUnix.cpp similarity index 100% rename from src/lib/arch/CArchStringUnix.cpp rename to src/lib/arch/ArchStringUnix.cpp diff --git a/src/lib/arch/CArchStringUnix.h b/src/lib/arch/ArchStringUnix.h similarity index 100% rename from src/lib/arch/CArchStringUnix.h rename to src/lib/arch/ArchStringUnix.h diff --git a/src/lib/arch/CArchStringWindows.cpp b/src/lib/arch/ArchStringWindows.cpp similarity index 100% rename from src/lib/arch/CArchStringWindows.cpp rename to src/lib/arch/ArchStringWindows.cpp diff --git a/src/lib/arch/CArchStringWindows.h b/src/lib/arch/ArchStringWindows.h similarity index 100% rename from src/lib/arch/CArchStringWindows.h rename to src/lib/arch/ArchStringWindows.h diff --git a/src/lib/arch/CArchSystemUnix.cpp b/src/lib/arch/ArchSystemUnix.cpp similarity index 100% rename from src/lib/arch/CArchSystemUnix.cpp rename to src/lib/arch/ArchSystemUnix.cpp diff --git a/src/lib/arch/CArchSystemUnix.h b/src/lib/arch/ArchSystemUnix.h similarity index 100% rename from src/lib/arch/CArchSystemUnix.h rename to src/lib/arch/ArchSystemUnix.h diff --git a/src/lib/arch/CArchSystemWindows.cpp b/src/lib/arch/ArchSystemWindows.cpp similarity index 100% rename from src/lib/arch/CArchSystemWindows.cpp rename to src/lib/arch/ArchSystemWindows.cpp diff --git a/src/lib/arch/CArchSystemWindows.h b/src/lib/arch/ArchSystemWindows.h similarity index 100% rename from src/lib/arch/CArchSystemWindows.h rename to src/lib/arch/ArchSystemWindows.h diff --git a/src/lib/arch/CArchTaskBarWindows.cpp b/src/lib/arch/ArchTaskBarWindows.cpp similarity index 100% rename from src/lib/arch/CArchTaskBarWindows.cpp rename to src/lib/arch/ArchTaskBarWindows.cpp diff --git a/src/lib/arch/CArchTaskBarWindows.h b/src/lib/arch/ArchTaskBarWindows.h similarity index 100% rename from src/lib/arch/CArchTaskBarWindows.h rename to src/lib/arch/ArchTaskBarWindows.h diff --git a/src/lib/arch/CArchTaskBarXWindows.cpp b/src/lib/arch/ArchTaskBarXWindows.cpp similarity index 100% rename from src/lib/arch/CArchTaskBarXWindows.cpp rename to src/lib/arch/ArchTaskBarXWindows.cpp diff --git a/src/lib/arch/CArchTaskBarXWindows.h b/src/lib/arch/ArchTaskBarXWindows.h similarity index 100% rename from src/lib/arch/CArchTaskBarXWindows.h rename to src/lib/arch/ArchTaskBarXWindows.h diff --git a/src/lib/arch/CArchTimeUnix.cpp b/src/lib/arch/ArchTimeUnix.cpp similarity index 100% rename from src/lib/arch/CArchTimeUnix.cpp rename to src/lib/arch/ArchTimeUnix.cpp diff --git a/src/lib/arch/CArchTimeUnix.h b/src/lib/arch/ArchTimeUnix.h similarity index 100% rename from src/lib/arch/CArchTimeUnix.h rename to src/lib/arch/ArchTimeUnix.h diff --git a/src/lib/arch/CArchTimeWindows.cpp b/src/lib/arch/ArchTimeWindows.cpp similarity index 100% rename from src/lib/arch/CArchTimeWindows.cpp rename to src/lib/arch/ArchTimeWindows.cpp diff --git a/src/lib/arch/CArchTimeWindows.h b/src/lib/arch/ArchTimeWindows.h similarity index 100% rename from src/lib/arch/CArchTimeWindows.h rename to src/lib/arch/ArchTimeWindows.h diff --git a/src/lib/arch/CMultibyte.h b/src/lib/arch/Multibyte.h similarity index 100% rename from src/lib/arch/CMultibyte.h rename to src/lib/arch/Multibyte.h diff --git a/src/lib/base/CEvent.cpp b/src/lib/base/Event.cpp similarity index 100% rename from src/lib/base/CEvent.cpp rename to src/lib/base/Event.cpp diff --git a/src/lib/base/CEvent.h b/src/lib/base/Event.h similarity index 100% rename from src/lib/base/CEvent.h rename to src/lib/base/Event.h diff --git a/src/lib/base/CEventQueue.cpp b/src/lib/base/EventQueue.cpp similarity index 100% rename from src/lib/base/CEventQueue.cpp rename to src/lib/base/EventQueue.cpp diff --git a/src/lib/base/CEventQueue.h b/src/lib/base/EventQueue.h similarity index 100% rename from src/lib/base/CEventQueue.h rename to src/lib/base/EventQueue.h diff --git a/src/lib/base/CEventTypes.cpp b/src/lib/base/EventTypes.cpp similarity index 100% rename from src/lib/base/CEventTypes.cpp rename to src/lib/base/EventTypes.cpp diff --git a/src/lib/base/CEventTypes.h b/src/lib/base/EventTypes.h similarity index 100% rename from src/lib/base/CEventTypes.h rename to src/lib/base/EventTypes.h diff --git a/src/lib/base/CFunctionEventJob.cpp b/src/lib/base/FunctionEventJob.cpp similarity index 100% rename from src/lib/base/CFunctionEventJob.cpp rename to src/lib/base/FunctionEventJob.cpp diff --git a/src/lib/base/CFunctionEventJob.h b/src/lib/base/FunctionEventJob.h similarity index 100% rename from src/lib/base/CFunctionEventJob.h rename to src/lib/base/FunctionEventJob.h diff --git a/src/lib/base/CFunctionJob.cpp b/src/lib/base/FunctionJob.cpp similarity index 100% rename from src/lib/base/CFunctionJob.cpp rename to src/lib/base/FunctionJob.cpp diff --git a/src/lib/base/CFunctionJob.h b/src/lib/base/FunctionJob.h similarity index 100% rename from src/lib/base/CFunctionJob.h rename to src/lib/base/FunctionJob.h diff --git a/src/lib/base/CLog.cpp b/src/lib/base/Log.cpp similarity index 100% rename from src/lib/base/CLog.cpp rename to src/lib/base/Log.cpp diff --git a/src/lib/base/CLog.h b/src/lib/base/Log.h similarity index 100% rename from src/lib/base/CLog.h rename to src/lib/base/Log.h diff --git a/src/lib/base/CPriorityQueue.h b/src/lib/base/PriorityQueue.h similarity index 100% rename from src/lib/base/CPriorityQueue.h rename to src/lib/base/PriorityQueue.h diff --git a/src/lib/base/CSimpleEventQueueBuffer.cpp b/src/lib/base/SimpleEventQueueBuffer.cpp similarity index 100% rename from src/lib/base/CSimpleEventQueueBuffer.cpp rename to src/lib/base/SimpleEventQueueBuffer.cpp diff --git a/src/lib/base/CSimpleEventQueueBuffer.h b/src/lib/base/SimpleEventQueueBuffer.h similarity index 100% rename from src/lib/base/CSimpleEventQueueBuffer.h rename to src/lib/base/SimpleEventQueueBuffer.h diff --git a/src/lib/base/CStopwatch.cpp b/src/lib/base/Stopwatch.cpp similarity index 100% rename from src/lib/base/CStopwatch.cpp rename to src/lib/base/Stopwatch.cpp diff --git a/src/lib/base/CStopwatch.h b/src/lib/base/Stopwatch.h similarity index 100% rename from src/lib/base/CStopwatch.h rename to src/lib/base/Stopwatch.h diff --git a/src/lib/base/CString.h b/src/lib/base/String.h similarity index 100% rename from src/lib/base/CString.h rename to src/lib/base/String.h diff --git a/src/lib/base/CStringUtil.cpp b/src/lib/base/StringUtil.cpp similarity index 100% rename from src/lib/base/CStringUtil.cpp rename to src/lib/base/StringUtil.cpp diff --git a/src/lib/base/CStringUtil.h b/src/lib/base/StringUtil.h similarity index 100% rename from src/lib/base/CStringUtil.h rename to src/lib/base/StringUtil.h diff --git a/src/lib/base/CUnicode.cpp b/src/lib/base/Unicode.cpp similarity index 100% rename from src/lib/base/CUnicode.cpp rename to src/lib/base/Unicode.cpp diff --git a/src/lib/base/CUnicode.h b/src/lib/base/Unicode.h similarity index 100% rename from src/lib/base/CUnicode.h rename to src/lib/base/Unicode.h diff --git a/src/lib/client/CClient.cpp b/src/lib/client/Client.cpp similarity index 100% rename from src/lib/client/CClient.cpp rename to src/lib/client/Client.cpp diff --git a/src/lib/client/CClient.h b/src/lib/client/Client.h similarity index 100% rename from src/lib/client/CClient.h rename to src/lib/client/Client.h diff --git a/src/lib/client/CServerProxy.cpp b/src/lib/client/ServerProxy.cpp similarity index 100% rename from src/lib/client/CServerProxy.cpp rename to src/lib/client/ServerProxy.cpp diff --git a/src/lib/client/CServerProxy.h b/src/lib/client/ServerProxy.h similarity index 100% rename from src/lib/client/CServerProxy.h rename to src/lib/client/ServerProxy.h diff --git a/src/lib/io/CCryptoMode.cpp b/src/lib/io/CryptoMode.cpp similarity index 100% rename from src/lib/io/CCryptoMode.cpp rename to src/lib/io/CryptoMode.cpp diff --git a/src/lib/io/CCryptoMode.h b/src/lib/io/CryptoMode.h similarity index 100% rename from src/lib/io/CCryptoMode.h rename to src/lib/io/CryptoMode.h diff --git a/src/lib/io/CCryptoMode_cryptopp.h b/src/lib/io/CryptoMode_cryptopp.h similarity index 100% rename from src/lib/io/CCryptoMode_cryptopp.h rename to src/lib/io/CryptoMode_cryptopp.h diff --git a/src/lib/io/CCryptoOptions.cpp b/src/lib/io/CryptoOptions.cpp similarity index 100% rename from src/lib/io/CCryptoOptions.cpp rename to src/lib/io/CryptoOptions.cpp diff --git a/src/lib/io/CCryptoOptions.h b/src/lib/io/CryptoOptions.h similarity index 100% rename from src/lib/io/CCryptoOptions.h rename to src/lib/io/CryptoOptions.h diff --git a/src/lib/io/CCryptoStream.cpp b/src/lib/io/CryptoStream.cpp similarity index 100% rename from src/lib/io/CCryptoStream.cpp rename to src/lib/io/CryptoStream.cpp diff --git a/src/lib/io/CCryptoStream.h b/src/lib/io/CryptoStream.h similarity index 100% rename from src/lib/io/CCryptoStream.h rename to src/lib/io/CryptoStream.h diff --git a/src/lib/io/CCryptoStream_cryptopp.h b/src/lib/io/CryptoStream_cryptopp.h similarity index 100% rename from src/lib/io/CCryptoStream_cryptopp.h rename to src/lib/io/CryptoStream_cryptopp.h diff --git a/src/lib/io/CStreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp similarity index 100% rename from src/lib/io/CStreamBuffer.cpp rename to src/lib/io/StreamBuffer.cpp diff --git a/src/lib/io/CStreamBuffer.h b/src/lib/io/StreamBuffer.h similarity index 100% rename from src/lib/io/CStreamBuffer.h rename to src/lib/io/StreamBuffer.h diff --git a/src/lib/io/CStreamFilter.cpp b/src/lib/io/StreamFilter.cpp similarity index 100% rename from src/lib/io/CStreamFilter.cpp rename to src/lib/io/StreamFilter.cpp diff --git a/src/lib/io/CStreamFilter.h b/src/lib/io/StreamFilter.h similarity index 100% rename from src/lib/io/CStreamFilter.h rename to src/lib/io/StreamFilter.h diff --git a/src/lib/ipc/CIpcClient.cpp b/src/lib/ipc/IpcClient.cpp similarity index 100% rename from src/lib/ipc/CIpcClient.cpp rename to src/lib/ipc/IpcClient.cpp diff --git a/src/lib/ipc/CIpcClient.h b/src/lib/ipc/IpcClient.h similarity index 100% rename from src/lib/ipc/CIpcClient.h rename to src/lib/ipc/IpcClient.h diff --git a/src/lib/ipc/CIpcClientProxy.cpp b/src/lib/ipc/IpcClientProxy.cpp similarity index 100% rename from src/lib/ipc/CIpcClientProxy.cpp rename to src/lib/ipc/IpcClientProxy.cpp diff --git a/src/lib/ipc/CIpcClientProxy.h b/src/lib/ipc/IpcClientProxy.h similarity index 100% rename from src/lib/ipc/CIpcClientProxy.h rename to src/lib/ipc/IpcClientProxy.h diff --git a/src/lib/ipc/CIpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp similarity index 100% rename from src/lib/ipc/CIpcLogOutputter.cpp rename to src/lib/ipc/IpcLogOutputter.cpp diff --git a/src/lib/ipc/CIpcLogOutputter.h b/src/lib/ipc/IpcLogOutputter.h similarity index 100% rename from src/lib/ipc/CIpcLogOutputter.h rename to src/lib/ipc/IpcLogOutputter.h diff --git a/src/lib/ipc/CIpcMessage.cpp b/src/lib/ipc/IpcMessage.cpp similarity index 100% rename from src/lib/ipc/CIpcMessage.cpp rename to src/lib/ipc/IpcMessage.cpp diff --git a/src/lib/ipc/CIpcMessage.h b/src/lib/ipc/IpcMessage.h similarity index 100% rename from src/lib/ipc/CIpcMessage.h rename to src/lib/ipc/IpcMessage.h diff --git a/src/lib/ipc/CIpcServer.cpp b/src/lib/ipc/IpcServer.cpp similarity index 100% rename from src/lib/ipc/CIpcServer.cpp rename to src/lib/ipc/IpcServer.cpp diff --git a/src/lib/ipc/CIpcServer.h b/src/lib/ipc/IpcServer.h similarity index 100% rename from src/lib/ipc/CIpcServer.h rename to src/lib/ipc/IpcServer.h diff --git a/src/lib/ipc/CIpcServerProxy.cpp b/src/lib/ipc/IpcServerProxy.cpp similarity index 100% rename from src/lib/ipc/CIpcServerProxy.cpp rename to src/lib/ipc/IpcServerProxy.cpp diff --git a/src/lib/ipc/CIpcServerProxy.h b/src/lib/ipc/IpcServerProxy.h similarity index 100% rename from src/lib/ipc/CIpcServerProxy.h rename to src/lib/ipc/IpcServerProxy.h diff --git a/src/lib/mt/CCondVar.cpp b/src/lib/mt/CondVar.cpp similarity index 100% rename from src/lib/mt/CCondVar.cpp rename to src/lib/mt/CondVar.cpp diff --git a/src/lib/mt/CCondVar.h b/src/lib/mt/CondVar.h similarity index 100% rename from src/lib/mt/CCondVar.h rename to src/lib/mt/CondVar.h diff --git a/src/lib/mt/CLock.cpp b/src/lib/mt/Lock.cpp similarity index 100% rename from src/lib/mt/CLock.cpp rename to src/lib/mt/Lock.cpp diff --git a/src/lib/mt/CLock.h b/src/lib/mt/Lock.h similarity index 100% rename from src/lib/mt/CLock.h rename to src/lib/mt/Lock.h diff --git a/src/lib/mt/CMutex.cpp b/src/lib/mt/Mutex.cpp similarity index 100% rename from src/lib/mt/CMutex.cpp rename to src/lib/mt/Mutex.cpp diff --git a/src/lib/mt/CMutex.h b/src/lib/mt/Mutex.h similarity index 100% rename from src/lib/mt/CMutex.h rename to src/lib/mt/Mutex.h diff --git a/src/lib/mt/CThread.cpp b/src/lib/mt/Thread.cpp similarity index 100% rename from src/lib/mt/CThread.cpp rename to src/lib/mt/Thread.cpp diff --git a/src/lib/mt/CThread.h b/src/lib/mt/Thread.h similarity index 100% rename from src/lib/mt/CThread.h rename to src/lib/mt/Thread.h diff --git a/src/lib/net/CNetworkAddress.cpp b/src/lib/net/NetworkAddress.cpp similarity index 100% rename from src/lib/net/CNetworkAddress.cpp rename to src/lib/net/NetworkAddress.cpp diff --git a/src/lib/net/CNetworkAddress.h b/src/lib/net/NetworkAddress.h similarity index 100% rename from src/lib/net/CNetworkAddress.h rename to src/lib/net/NetworkAddress.h diff --git a/src/lib/net/CSocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp similarity index 100% rename from src/lib/net/CSocketMultiplexer.cpp rename to src/lib/net/SocketMultiplexer.cpp diff --git a/src/lib/net/CSocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h similarity index 100% rename from src/lib/net/CSocketMultiplexer.h rename to src/lib/net/SocketMultiplexer.h diff --git a/src/lib/net/CTCPListenSocket.cpp b/src/lib/net/TCPListenSocket.cpp similarity index 100% rename from src/lib/net/CTCPListenSocket.cpp rename to src/lib/net/TCPListenSocket.cpp diff --git a/src/lib/net/CTCPListenSocket.h b/src/lib/net/TCPListenSocket.h similarity index 100% rename from src/lib/net/CTCPListenSocket.h rename to src/lib/net/TCPListenSocket.h diff --git a/src/lib/net/CTCPSocket.cpp b/src/lib/net/TCPSocket.cpp similarity index 100% rename from src/lib/net/CTCPSocket.cpp rename to src/lib/net/TCPSocket.cpp diff --git a/src/lib/net/CTCPSocket.h b/src/lib/net/TCPSocket.h similarity index 100% rename from src/lib/net/CTCPSocket.h rename to src/lib/net/TCPSocket.h diff --git a/src/lib/net/CTCPSocketFactory.cpp b/src/lib/net/TCPSocketFactory.cpp similarity index 100% rename from src/lib/net/CTCPSocketFactory.cpp rename to src/lib/net/TCPSocketFactory.cpp diff --git a/src/lib/net/CTCPSocketFactory.h b/src/lib/net/TCPSocketFactory.h similarity index 100% rename from src/lib/net/CTCPSocketFactory.h rename to src/lib/net/TCPSocketFactory.h diff --git a/src/lib/platform/CMSWindowsClipboard.cpp b/src/lib/platform/MSWindowsClipboard.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboard.cpp rename to src/lib/platform/MSWindowsClipboard.cpp diff --git a/src/lib/platform/CMSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboard.h rename to src/lib/platform/MSWindowsClipboard.h diff --git a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp b/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp rename to src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp diff --git a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.h b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardAnyTextConverter.h rename to src/lib/platform/MSWindowsClipboardAnyTextConverter.h diff --git a/src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp rename to src/lib/platform/MSWindowsClipboardBitmapConverter.cpp diff --git a/src/lib/platform/CMSWindowsClipboardBitmapConverter.h b/src/lib/platform/MSWindowsClipboardBitmapConverter.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardBitmapConverter.h rename to src/lib/platform/MSWindowsClipboardBitmapConverter.h diff --git a/src/lib/platform/CMSWindowsClipboardFacade.cpp b/src/lib/platform/MSWindowsClipboardFacade.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardFacade.cpp rename to src/lib/platform/MSWindowsClipboardFacade.cpp diff --git a/src/lib/platform/CMSWindowsClipboardFacade.h b/src/lib/platform/MSWindowsClipboardFacade.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardFacade.h rename to src/lib/platform/MSWindowsClipboardFacade.h diff --git a/src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp b/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp rename to src/lib/platform/MSWindowsClipboardHTMLConverter.cpp diff --git a/src/lib/platform/CMSWindowsClipboardHTMLConverter.h b/src/lib/platform/MSWindowsClipboardHTMLConverter.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardHTMLConverter.h rename to src/lib/platform/MSWindowsClipboardHTMLConverter.h diff --git a/src/lib/platform/CMSWindowsClipboardTextConverter.cpp b/src/lib/platform/MSWindowsClipboardTextConverter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardTextConverter.cpp rename to src/lib/platform/MSWindowsClipboardTextConverter.cpp diff --git a/src/lib/platform/CMSWindowsClipboardTextConverter.h b/src/lib/platform/MSWindowsClipboardTextConverter.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardTextConverter.h rename to src/lib/platform/MSWindowsClipboardTextConverter.h diff --git a/src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp rename to src/lib/platform/MSWindowsClipboardUTF16Converter.cpp diff --git a/src/lib/platform/CMSWindowsClipboardUTF16Converter.h b/src/lib/platform/MSWindowsClipboardUTF16Converter.h similarity index 100% rename from src/lib/platform/CMSWindowsClipboardUTF16Converter.h rename to src/lib/platform/MSWindowsClipboardUTF16Converter.h diff --git a/src/lib/platform/CMSWindowsDebugOutputter.cpp b/src/lib/platform/MSWindowsDebugOutputter.cpp similarity index 100% rename from src/lib/platform/CMSWindowsDebugOutputter.cpp rename to src/lib/platform/MSWindowsDebugOutputter.cpp diff --git a/src/lib/platform/CMSWindowsDebugOutputter.h b/src/lib/platform/MSWindowsDebugOutputter.h similarity index 100% rename from src/lib/platform/CMSWindowsDebugOutputter.h rename to src/lib/platform/MSWindowsDebugOutputter.h diff --git a/src/lib/platform/CMSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp similarity index 100% rename from src/lib/platform/CMSWindowsDesks.cpp rename to src/lib/platform/MSWindowsDesks.cpp diff --git a/src/lib/platform/CMSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h similarity index 100% rename from src/lib/platform/CMSWindowsDesks.h rename to src/lib/platform/MSWindowsDesks.h diff --git a/src/lib/platform/CMSWindowsEventQueueBuffer.cpp b/src/lib/platform/MSWindowsEventQueueBuffer.cpp similarity index 100% rename from src/lib/platform/CMSWindowsEventQueueBuffer.cpp rename to src/lib/platform/MSWindowsEventQueueBuffer.cpp diff --git a/src/lib/platform/CMSWindowsEventQueueBuffer.h b/src/lib/platform/MSWindowsEventQueueBuffer.h similarity index 100% rename from src/lib/platform/CMSWindowsEventQueueBuffer.h rename to src/lib/platform/MSWindowsEventQueueBuffer.h diff --git a/src/lib/platform/CMSWindowsHookLibraryLoader.cpp b/src/lib/platform/MSWindowsHookLibraryLoader.cpp similarity index 100% rename from src/lib/platform/CMSWindowsHookLibraryLoader.cpp rename to src/lib/platform/MSWindowsHookLibraryLoader.cpp diff --git a/src/lib/platform/CMSWindowsHookLibraryLoader.h b/src/lib/platform/MSWindowsHookLibraryLoader.h similarity index 100% rename from src/lib/platform/CMSWindowsHookLibraryLoader.h rename to src/lib/platform/MSWindowsHookLibraryLoader.h diff --git a/src/lib/platform/CMSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp similarity index 100% rename from src/lib/platform/CMSWindowsKeyState.cpp rename to src/lib/platform/MSWindowsKeyState.cpp diff --git a/src/lib/platform/CMSWindowsKeyState.h b/src/lib/platform/MSWindowsKeyState.h similarity index 100% rename from src/lib/platform/CMSWindowsKeyState.h rename to src/lib/platform/MSWindowsKeyState.h diff --git a/src/lib/platform/CMSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp similarity index 100% rename from src/lib/platform/CMSWindowsScreen.cpp rename to src/lib/platform/MSWindowsScreen.cpp diff --git a/src/lib/platform/CMSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h similarity index 100% rename from src/lib/platform/CMSWindowsScreen.h rename to src/lib/platform/MSWindowsScreen.h diff --git a/src/lib/platform/CMSWindowsScreenSaver.cpp b/src/lib/platform/MSWindowsScreenSaver.cpp similarity index 100% rename from src/lib/platform/CMSWindowsScreenSaver.cpp rename to src/lib/platform/MSWindowsScreenSaver.cpp diff --git a/src/lib/platform/CMSWindowsScreenSaver.h b/src/lib/platform/MSWindowsScreenSaver.h similarity index 100% rename from src/lib/platform/CMSWindowsScreenSaver.h rename to src/lib/platform/MSWindowsScreenSaver.h diff --git a/src/lib/platform/CMSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp similarity index 100% rename from src/lib/platform/CMSWindowsSession.cpp rename to src/lib/platform/MSWindowsSession.cpp diff --git a/src/lib/platform/CMSWindowsSession.h b/src/lib/platform/MSWindowsSession.h similarity index 100% rename from src/lib/platform/CMSWindowsSession.h rename to src/lib/platform/MSWindowsSession.h diff --git a/src/lib/platform/CMSWindowsUtil.cpp b/src/lib/platform/MSWindowsUtil.cpp similarity index 100% rename from src/lib/platform/CMSWindowsUtil.cpp rename to src/lib/platform/MSWindowsUtil.cpp diff --git a/src/lib/platform/CMSWindowsUtil.h b/src/lib/platform/MSWindowsUtil.h similarity index 100% rename from src/lib/platform/CMSWindowsUtil.h rename to src/lib/platform/MSWindowsUtil.h diff --git a/src/lib/platform/CMSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp similarity index 100% rename from src/lib/platform/CMSWindowsWatchdog.cpp rename to src/lib/platform/MSWindowsWatchdog.cpp diff --git a/src/lib/platform/CMSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h similarity index 100% rename from src/lib/platform/CMSWindowsWatchdog.h rename to src/lib/platform/MSWindowsWatchdog.h diff --git a/src/lib/platform/COSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp similarity index 100% rename from src/lib/platform/COSXClipboard.cpp rename to src/lib/platform/OSXClipboard.cpp diff --git a/src/lib/platform/COSXClipboard.h b/src/lib/platform/OSXClipboard.h similarity index 100% rename from src/lib/platform/COSXClipboard.h rename to src/lib/platform/OSXClipboard.h diff --git a/src/lib/platform/COSXClipboardAnyTextConverter.cpp b/src/lib/platform/OSXClipboardAnyTextConverter.cpp similarity index 100% rename from src/lib/platform/COSXClipboardAnyTextConverter.cpp rename to src/lib/platform/OSXClipboardAnyTextConverter.cpp diff --git a/src/lib/platform/COSXClipboardAnyTextConverter.h b/src/lib/platform/OSXClipboardAnyTextConverter.h similarity index 100% rename from src/lib/platform/COSXClipboardAnyTextConverter.h rename to src/lib/platform/OSXClipboardAnyTextConverter.h diff --git a/src/lib/platform/COSXClipboardTextConverter.cpp b/src/lib/platform/OSXClipboardTextConverter.cpp similarity index 100% rename from src/lib/platform/COSXClipboardTextConverter.cpp rename to src/lib/platform/OSXClipboardTextConverter.cpp diff --git a/src/lib/platform/COSXClipboardTextConverter.h b/src/lib/platform/OSXClipboardTextConverter.h similarity index 100% rename from src/lib/platform/COSXClipboardTextConverter.h rename to src/lib/platform/OSXClipboardTextConverter.h diff --git a/src/lib/platform/COSXClipboardUTF16Converter.cpp b/src/lib/platform/OSXClipboardUTF16Converter.cpp similarity index 100% rename from src/lib/platform/COSXClipboardUTF16Converter.cpp rename to src/lib/platform/OSXClipboardUTF16Converter.cpp diff --git a/src/lib/platform/COSXClipboardUTF16Converter.h b/src/lib/platform/OSXClipboardUTF16Converter.h similarity index 100% rename from src/lib/platform/COSXClipboardUTF16Converter.h rename to src/lib/platform/OSXClipboardUTF16Converter.h diff --git a/src/lib/platform/COSXDragSimulator.h b/src/lib/platform/OSXDragSimulator.h similarity index 100% rename from src/lib/platform/COSXDragSimulator.h rename to src/lib/platform/OSXDragSimulator.h diff --git a/src/lib/platform/COSXDragView.h b/src/lib/platform/OSXDragView.h similarity index 100% rename from src/lib/platform/COSXDragView.h rename to src/lib/platform/OSXDragView.h diff --git a/src/lib/platform/COSXEventQueueBuffer.cpp b/src/lib/platform/OSXEventQueueBuffer.cpp similarity index 100% rename from src/lib/platform/COSXEventQueueBuffer.cpp rename to src/lib/platform/OSXEventQueueBuffer.cpp diff --git a/src/lib/platform/COSXEventQueueBuffer.h b/src/lib/platform/OSXEventQueueBuffer.h similarity index 100% rename from src/lib/platform/COSXEventQueueBuffer.h rename to src/lib/platform/OSXEventQueueBuffer.h diff --git a/src/lib/platform/COSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp similarity index 100% rename from src/lib/platform/COSXKeyState.cpp rename to src/lib/platform/OSXKeyState.cpp diff --git a/src/lib/platform/COSXKeyState.h b/src/lib/platform/OSXKeyState.h similarity index 100% rename from src/lib/platform/COSXKeyState.h rename to src/lib/platform/OSXKeyState.h diff --git a/src/lib/platform/COSXPasteboardPeeker.h b/src/lib/platform/OSXPasteboardPeeker.h similarity index 100% rename from src/lib/platform/COSXPasteboardPeeker.h rename to src/lib/platform/OSXPasteboardPeeker.h diff --git a/src/lib/platform/COSXScreen.cpp b/src/lib/platform/OSXScreen.cpp similarity index 100% rename from src/lib/platform/COSXScreen.cpp rename to src/lib/platform/OSXScreen.cpp diff --git a/src/lib/platform/COSXScreen.h b/src/lib/platform/OSXScreen.h similarity index 100% rename from src/lib/platform/COSXScreen.h rename to src/lib/platform/OSXScreen.h diff --git a/src/lib/platform/COSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp similarity index 100% rename from src/lib/platform/COSXScreenSaver.cpp rename to src/lib/platform/OSXScreenSaver.cpp diff --git a/src/lib/platform/COSXScreenSaver.h b/src/lib/platform/OSXScreenSaver.h similarity index 100% rename from src/lib/platform/COSXScreenSaver.h rename to src/lib/platform/OSXScreenSaver.h diff --git a/src/lib/platform/COSXScreenSaverUtil.h b/src/lib/platform/OSXScreenSaverUtil.h similarity index 100% rename from src/lib/platform/COSXScreenSaverUtil.h rename to src/lib/platform/OSXScreenSaverUtil.h diff --git a/src/lib/platform/CXWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboard.cpp rename to src/lib/platform/XWindowsClipboard.cpp diff --git a/src/lib/platform/CXWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h similarity index 100% rename from src/lib/platform/CXWindowsClipboard.h rename to src/lib/platform/XWindowsClipboard.h diff --git a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp rename to src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp diff --git a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h rename to src/lib/platform/XWindowsClipboardAnyBitmapConverter.h diff --git a/src/lib/platform/CXWindowsClipboardBMPConverter.cpp b/src/lib/platform/XWindowsClipboardBMPConverter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardBMPConverter.cpp rename to src/lib/platform/XWindowsClipboardBMPConverter.cpp diff --git a/src/lib/platform/CXWindowsClipboardBMPConverter.h b/src/lib/platform/XWindowsClipboardBMPConverter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardBMPConverter.h rename to src/lib/platform/XWindowsClipboardBMPConverter.h diff --git a/src/lib/platform/CXWindowsClipboardHTMLConverter.cpp b/src/lib/platform/XWindowsClipboardHTMLConverter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardHTMLConverter.cpp rename to src/lib/platform/XWindowsClipboardHTMLConverter.cpp diff --git a/src/lib/platform/CXWindowsClipboardHTMLConverter.h b/src/lib/platform/XWindowsClipboardHTMLConverter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardHTMLConverter.h rename to src/lib/platform/XWindowsClipboardHTMLConverter.h diff --git a/src/lib/platform/CXWindowsClipboardTextConverter.cpp b/src/lib/platform/XWindowsClipboardTextConverter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardTextConverter.cpp rename to src/lib/platform/XWindowsClipboardTextConverter.cpp diff --git a/src/lib/platform/CXWindowsClipboardTextConverter.h b/src/lib/platform/XWindowsClipboardTextConverter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardTextConverter.h rename to src/lib/platform/XWindowsClipboardTextConverter.h diff --git a/src/lib/platform/CXWindowsClipboardUCS2Converter.cpp b/src/lib/platform/XWindowsClipboardUCS2Converter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardUCS2Converter.cpp rename to src/lib/platform/XWindowsClipboardUCS2Converter.cpp diff --git a/src/lib/platform/CXWindowsClipboardUCS2Converter.h b/src/lib/platform/XWindowsClipboardUCS2Converter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardUCS2Converter.h rename to src/lib/platform/XWindowsClipboardUCS2Converter.h diff --git a/src/lib/platform/CXWindowsClipboardUTF8Converter.cpp b/src/lib/platform/XWindowsClipboardUTF8Converter.cpp similarity index 100% rename from src/lib/platform/CXWindowsClipboardUTF8Converter.cpp rename to src/lib/platform/XWindowsClipboardUTF8Converter.cpp diff --git a/src/lib/platform/CXWindowsClipboardUTF8Converter.h b/src/lib/platform/XWindowsClipboardUTF8Converter.h similarity index 100% rename from src/lib/platform/CXWindowsClipboardUTF8Converter.h rename to src/lib/platform/XWindowsClipboardUTF8Converter.h diff --git a/src/lib/platform/CXWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp similarity index 100% rename from src/lib/platform/CXWindowsEventQueueBuffer.cpp rename to src/lib/platform/XWindowsEventQueueBuffer.cpp diff --git a/src/lib/platform/CXWindowsEventQueueBuffer.h b/src/lib/platform/XWindowsEventQueueBuffer.h similarity index 100% rename from src/lib/platform/CXWindowsEventQueueBuffer.h rename to src/lib/platform/XWindowsEventQueueBuffer.h diff --git a/src/lib/platform/CXWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp similarity index 100% rename from src/lib/platform/CXWindowsKeyState.cpp rename to src/lib/platform/XWindowsKeyState.cpp diff --git a/src/lib/platform/CXWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h similarity index 100% rename from src/lib/platform/CXWindowsKeyState.h rename to src/lib/platform/XWindowsKeyState.h diff --git a/src/lib/platform/CXWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp similarity index 100% rename from src/lib/platform/CXWindowsScreen.cpp rename to src/lib/platform/XWindowsScreen.cpp diff --git a/src/lib/platform/CXWindowsScreen.h b/src/lib/platform/XWindowsScreen.h similarity index 100% rename from src/lib/platform/CXWindowsScreen.h rename to src/lib/platform/XWindowsScreen.h diff --git a/src/lib/platform/CXWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp similarity index 100% rename from src/lib/platform/CXWindowsScreenSaver.cpp rename to src/lib/platform/XWindowsScreenSaver.cpp diff --git a/src/lib/platform/CXWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h similarity index 100% rename from src/lib/platform/CXWindowsScreenSaver.h rename to src/lib/platform/XWindowsScreenSaver.h diff --git a/src/lib/platform/CXWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp similarity index 100% rename from src/lib/platform/CXWindowsUtil.cpp rename to src/lib/platform/XWindowsUtil.cpp diff --git a/src/lib/platform/CXWindowsUtil.h b/src/lib/platform/XWindowsUtil.h similarity index 100% rename from src/lib/platform/CXWindowsUtil.h rename to src/lib/platform/XWindowsUtil.h diff --git a/src/lib/server/CBaseClientProxy.cpp b/src/lib/server/BaseClientProxy.cpp similarity index 100% rename from src/lib/server/CBaseClientProxy.cpp rename to src/lib/server/BaseClientProxy.cpp diff --git a/src/lib/server/CBaseClientProxy.h b/src/lib/server/BaseClientProxy.h similarity index 100% rename from src/lib/server/CBaseClientProxy.h rename to src/lib/server/BaseClientProxy.h diff --git a/src/lib/server/CClientListener.cpp b/src/lib/server/ClientListener.cpp similarity index 100% rename from src/lib/server/CClientListener.cpp rename to src/lib/server/ClientListener.cpp diff --git a/src/lib/server/CClientListener.h b/src/lib/server/ClientListener.h similarity index 100% rename from src/lib/server/CClientListener.h rename to src/lib/server/ClientListener.h diff --git a/src/lib/server/CClientProxy.cpp b/src/lib/server/ClientProxy.cpp similarity index 100% rename from src/lib/server/CClientProxy.cpp rename to src/lib/server/ClientProxy.cpp diff --git a/src/lib/server/CClientProxy.h b/src/lib/server/ClientProxy.h similarity index 100% rename from src/lib/server/CClientProxy.h rename to src/lib/server/ClientProxy.h diff --git a/src/lib/server/CClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp similarity index 100% rename from src/lib/server/CClientProxy1_0.cpp rename to src/lib/server/ClientProxy1_0.cpp diff --git a/src/lib/server/CClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h similarity index 100% rename from src/lib/server/CClientProxy1_0.h rename to src/lib/server/ClientProxy1_0.h diff --git a/src/lib/server/CClientProxy1_1.cpp b/src/lib/server/ClientProxy1_1.cpp similarity index 100% rename from src/lib/server/CClientProxy1_1.cpp rename to src/lib/server/ClientProxy1_1.cpp diff --git a/src/lib/server/CClientProxy1_1.h b/src/lib/server/ClientProxy1_1.h similarity index 100% rename from src/lib/server/CClientProxy1_1.h rename to src/lib/server/ClientProxy1_1.h diff --git a/src/lib/server/CClientProxy1_2.cpp b/src/lib/server/ClientProxy1_2.cpp similarity index 100% rename from src/lib/server/CClientProxy1_2.cpp rename to src/lib/server/ClientProxy1_2.cpp diff --git a/src/lib/server/CClientProxy1_2.h b/src/lib/server/ClientProxy1_2.h similarity index 100% rename from src/lib/server/CClientProxy1_2.h rename to src/lib/server/ClientProxy1_2.h diff --git a/src/lib/server/CClientProxy1_3.cpp b/src/lib/server/ClientProxy1_3.cpp similarity index 100% rename from src/lib/server/CClientProxy1_3.cpp rename to src/lib/server/ClientProxy1_3.cpp diff --git a/src/lib/server/CClientProxy1_3.h b/src/lib/server/ClientProxy1_3.h similarity index 100% rename from src/lib/server/CClientProxy1_3.h rename to src/lib/server/ClientProxy1_3.h diff --git a/src/lib/server/CClientProxy1_4.cpp b/src/lib/server/ClientProxy1_4.cpp similarity index 100% rename from src/lib/server/CClientProxy1_4.cpp rename to src/lib/server/ClientProxy1_4.cpp diff --git a/src/lib/server/CClientProxy1_4.h b/src/lib/server/ClientProxy1_4.h similarity index 100% rename from src/lib/server/CClientProxy1_4.h rename to src/lib/server/ClientProxy1_4.h diff --git a/src/lib/server/CClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp similarity index 100% rename from src/lib/server/CClientProxy1_5.cpp rename to src/lib/server/ClientProxy1_5.cpp diff --git a/src/lib/server/CClientProxy1_5.h b/src/lib/server/ClientProxy1_5.h similarity index 100% rename from src/lib/server/CClientProxy1_5.h rename to src/lib/server/ClientProxy1_5.h diff --git a/src/lib/server/CClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp similarity index 100% rename from src/lib/server/CClientProxyUnknown.cpp rename to src/lib/server/ClientProxyUnknown.cpp diff --git a/src/lib/server/CClientProxyUnknown.h b/src/lib/server/ClientProxyUnknown.h similarity index 100% rename from src/lib/server/CClientProxyUnknown.h rename to src/lib/server/ClientProxyUnknown.h diff --git a/src/lib/server/CConfig.cpp b/src/lib/server/Config.cpp similarity index 100% rename from src/lib/server/CConfig.cpp rename to src/lib/server/Config.cpp diff --git a/src/lib/server/CConfig.h b/src/lib/server/Config.h similarity index 100% rename from src/lib/server/CConfig.h rename to src/lib/server/Config.h diff --git a/src/lib/server/CInputFilter.cpp b/src/lib/server/InputFilter.cpp similarity index 100% rename from src/lib/server/CInputFilter.cpp rename to src/lib/server/InputFilter.cpp diff --git a/src/lib/server/CInputFilter.h b/src/lib/server/InputFilter.h similarity index 100% rename from src/lib/server/CInputFilter.h rename to src/lib/server/InputFilter.h diff --git a/src/lib/server/CPrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp similarity index 100% rename from src/lib/server/CPrimaryClient.cpp rename to src/lib/server/PrimaryClient.cpp diff --git a/src/lib/server/CPrimaryClient.h b/src/lib/server/PrimaryClient.h similarity index 100% rename from src/lib/server/CPrimaryClient.h rename to src/lib/server/PrimaryClient.h diff --git a/src/lib/server/CServer.cpp b/src/lib/server/Server.cpp similarity index 100% rename from src/lib/server/CServer.cpp rename to src/lib/server/Server.cpp diff --git a/src/lib/server/CServer.h b/src/lib/server/Server.h similarity index 100% rename from src/lib/server/CServer.h rename to src/lib/server/Server.h diff --git a/src/lib/synergy/CApp.cpp b/src/lib/synergy/App.cpp similarity index 100% rename from src/lib/synergy/CApp.cpp rename to src/lib/synergy/App.cpp diff --git a/src/lib/synergy/CApp.h b/src/lib/synergy/App.h similarity index 100% rename from src/lib/synergy/CApp.h rename to src/lib/synergy/App.h diff --git a/src/lib/synergy/CAppUtil.cpp b/src/lib/synergy/AppUtil.cpp similarity index 100% rename from src/lib/synergy/CAppUtil.cpp rename to src/lib/synergy/AppUtil.cpp diff --git a/src/lib/synergy/CAppUtil.h b/src/lib/synergy/AppUtil.h similarity index 100% rename from src/lib/synergy/CAppUtil.h rename to src/lib/synergy/AppUtil.h diff --git a/src/lib/synergy/CAppUtilUnix.cpp b/src/lib/synergy/AppUtilUnix.cpp similarity index 100% rename from src/lib/synergy/CAppUtilUnix.cpp rename to src/lib/synergy/AppUtilUnix.cpp diff --git a/src/lib/synergy/CAppUtilUnix.h b/src/lib/synergy/AppUtilUnix.h similarity index 100% rename from src/lib/synergy/CAppUtilUnix.h rename to src/lib/synergy/AppUtilUnix.h diff --git a/src/lib/synergy/CAppUtilWindows.cpp b/src/lib/synergy/AppUtilWindows.cpp similarity index 100% rename from src/lib/synergy/CAppUtilWindows.cpp rename to src/lib/synergy/AppUtilWindows.cpp diff --git a/src/lib/synergy/CAppUtilWindows.h b/src/lib/synergy/AppUtilWindows.h similarity index 100% rename from src/lib/synergy/CAppUtilWindows.h rename to src/lib/synergy/AppUtilWindows.h diff --git a/src/lib/synergy/CArgsBase.cpp b/src/lib/synergy/ArgsBase.cpp similarity index 100% rename from src/lib/synergy/CArgsBase.cpp rename to src/lib/synergy/ArgsBase.cpp diff --git a/src/lib/synergy/CArgsBase.h b/src/lib/synergy/ArgsBase.h similarity index 100% rename from src/lib/synergy/CArgsBase.h rename to src/lib/synergy/ArgsBase.h diff --git a/src/lib/synergy/CClientApp.cpp b/src/lib/synergy/ClientApp.cpp similarity index 100% rename from src/lib/synergy/CClientApp.cpp rename to src/lib/synergy/ClientApp.cpp diff --git a/src/lib/synergy/CClientApp.h b/src/lib/synergy/ClientApp.h similarity index 100% rename from src/lib/synergy/CClientApp.h rename to src/lib/synergy/ClientApp.h diff --git a/src/lib/synergy/CClientTaskBarReceiver.cpp b/src/lib/synergy/ClientTaskBarReceiver.cpp similarity index 100% rename from src/lib/synergy/CClientTaskBarReceiver.cpp rename to src/lib/synergy/ClientTaskBarReceiver.cpp diff --git a/src/lib/synergy/CClientTaskBarReceiver.h b/src/lib/synergy/ClientTaskBarReceiver.h similarity index 100% rename from src/lib/synergy/CClientTaskBarReceiver.h rename to src/lib/synergy/ClientTaskBarReceiver.h diff --git a/src/lib/synergy/CClipboard.cpp b/src/lib/synergy/Clipboard.cpp similarity index 100% rename from src/lib/synergy/CClipboard.cpp rename to src/lib/synergy/Clipboard.cpp diff --git a/src/lib/synergy/CClipboard.h b/src/lib/synergy/Clipboard.h similarity index 100% rename from src/lib/synergy/CClipboard.h rename to src/lib/synergy/Clipboard.h diff --git a/src/lib/synergy/CDaemonApp.cpp b/src/lib/synergy/DaemonApp.cpp similarity index 100% rename from src/lib/synergy/CDaemonApp.cpp rename to src/lib/synergy/DaemonApp.cpp diff --git a/src/lib/synergy/CDaemonApp.h b/src/lib/synergy/DaemonApp.h similarity index 100% rename from src/lib/synergy/CDaemonApp.h rename to src/lib/synergy/DaemonApp.h diff --git a/src/lib/synergy/CDragInformation.cpp b/src/lib/synergy/DragInformation.cpp similarity index 100% rename from src/lib/synergy/CDragInformation.cpp rename to src/lib/synergy/DragInformation.cpp diff --git a/src/lib/synergy/CDragInformation.h b/src/lib/synergy/DragInformation.h similarity index 100% rename from src/lib/synergy/CDragInformation.h rename to src/lib/synergy/DragInformation.h diff --git a/src/lib/synergy/CFileChunker.cpp b/src/lib/synergy/FileChunker.cpp similarity index 100% rename from src/lib/synergy/CFileChunker.cpp rename to src/lib/synergy/FileChunker.cpp diff --git a/src/lib/synergy/CFileChunker.h b/src/lib/synergy/FileChunker.h similarity index 100% rename from src/lib/synergy/CFileChunker.h rename to src/lib/synergy/FileChunker.h diff --git a/src/lib/synergy/CKeyMap.cpp b/src/lib/synergy/KeyMap.cpp similarity index 100% rename from src/lib/synergy/CKeyMap.cpp rename to src/lib/synergy/KeyMap.cpp diff --git a/src/lib/synergy/CKeyMap.h b/src/lib/synergy/KeyMap.h similarity index 100% rename from src/lib/synergy/CKeyMap.h rename to src/lib/synergy/KeyMap.h diff --git a/src/lib/synergy/CKeyState.cpp b/src/lib/synergy/KeyState.cpp similarity index 100% rename from src/lib/synergy/CKeyState.cpp rename to src/lib/synergy/KeyState.cpp diff --git a/src/lib/synergy/CKeyState.h b/src/lib/synergy/KeyState.h similarity index 100% rename from src/lib/synergy/CKeyState.h rename to src/lib/synergy/KeyState.h diff --git a/src/lib/synergy/CPacketStreamFilter.cpp b/src/lib/synergy/PacketStreamFilter.cpp similarity index 100% rename from src/lib/synergy/CPacketStreamFilter.cpp rename to src/lib/synergy/PacketStreamFilter.cpp diff --git a/src/lib/synergy/CPacketStreamFilter.h b/src/lib/synergy/PacketStreamFilter.h similarity index 100% rename from src/lib/synergy/CPacketStreamFilter.h rename to src/lib/synergy/PacketStreamFilter.h diff --git a/src/lib/synergy/CPlatformScreen.cpp b/src/lib/synergy/PlatformScreen.cpp similarity index 100% rename from src/lib/synergy/CPlatformScreen.cpp rename to src/lib/synergy/PlatformScreen.cpp diff --git a/src/lib/synergy/CPlatformScreen.h b/src/lib/synergy/PlatformScreen.h similarity index 100% rename from src/lib/synergy/CPlatformScreen.h rename to src/lib/synergy/PlatformScreen.h diff --git a/src/lib/synergy/CPortableTaskBarReceiver.cpp b/src/lib/synergy/PortableTaskBarReceiver.cpp similarity index 100% rename from src/lib/synergy/CPortableTaskBarReceiver.cpp rename to src/lib/synergy/PortableTaskBarReceiver.cpp diff --git a/src/lib/synergy/CPortableTaskBarReceiver.h b/src/lib/synergy/PortableTaskBarReceiver.h similarity index 100% rename from src/lib/synergy/CPortableTaskBarReceiver.h rename to src/lib/synergy/PortableTaskBarReceiver.h diff --git a/src/lib/synergy/CProtocolUtil.cpp b/src/lib/synergy/ProtocolUtil.cpp similarity index 100% rename from src/lib/synergy/CProtocolUtil.cpp rename to src/lib/synergy/ProtocolUtil.cpp diff --git a/src/lib/synergy/CProtocolUtil.h b/src/lib/synergy/ProtocolUtil.h similarity index 100% rename from src/lib/synergy/CProtocolUtil.h rename to src/lib/synergy/ProtocolUtil.h diff --git a/src/lib/synergy/CScreen.cpp b/src/lib/synergy/Screen.cpp similarity index 100% rename from src/lib/synergy/CScreen.cpp rename to src/lib/synergy/Screen.cpp diff --git a/src/lib/synergy/CScreen.h b/src/lib/synergy/Screen.h similarity index 100% rename from src/lib/synergy/CScreen.h rename to src/lib/synergy/Screen.h diff --git a/src/lib/synergy/CServerApp.cpp b/src/lib/synergy/ServerApp.cpp similarity index 100% rename from src/lib/synergy/CServerApp.cpp rename to src/lib/synergy/ServerApp.cpp diff --git a/src/lib/synergy/CServerApp.h b/src/lib/synergy/ServerApp.h similarity index 100% rename from src/lib/synergy/CServerApp.h rename to src/lib/synergy/ServerApp.h diff --git a/src/lib/synergy/CServerTaskBarReceiver.cpp b/src/lib/synergy/ServerTaskBarReceiver.cpp similarity index 100% rename from src/lib/synergy/CServerTaskBarReceiver.cpp rename to src/lib/synergy/ServerTaskBarReceiver.cpp diff --git a/src/lib/synergy/CServerTaskBarReceiver.h b/src/lib/synergy/ServerTaskBarReceiver.h similarity index 100% rename from src/lib/synergy/CServerTaskBarReceiver.h rename to src/lib/synergy/ServerTaskBarReceiver.h diff --git a/src/lib/synergy/CToolApp.cpp b/src/lib/synergy/ToolApp.cpp similarity index 100% rename from src/lib/synergy/CToolApp.cpp rename to src/lib/synergy/ToolApp.cpp diff --git a/src/lib/synergy/CToolApp.h b/src/lib/synergy/ToolApp.h similarity index 100% rename from src/lib/synergy/CToolApp.h rename to src/lib/synergy/ToolApp.h diff --git a/src/lib/synergy/ClipboardTypes.h b/src/lib/synergy/lipboardTypes.h similarity index 100% rename from src/lib/synergy/ClipboardTypes.h rename to src/lib/synergy/lipboardTypes.h diff --git a/src/lib/synwinxt/CClassFactory.cpp b/src/lib/synwinxt/ClassFactory.cpp similarity index 100% rename from src/lib/synwinxt/CClassFactory.cpp rename to src/lib/synwinxt/ClassFactory.cpp diff --git a/src/lib/synwinxt/CClassFactory.h b/src/lib/synwinxt/ClassFactory.h similarity index 100% rename from src/lib/synwinxt/CClassFactory.h rename to src/lib/synwinxt/ClassFactory.h diff --git a/src/lib/synwinxt/CDataHandlerExtension.cpp b/src/lib/synwinxt/DataHandlerExtension.cpp similarity index 100% rename from src/lib/synwinxt/CDataHandlerExtension.cpp rename to src/lib/synwinxt/DataHandlerExtension.cpp diff --git a/src/lib/synwinxt/CDataHandlerExtension.h b/src/lib/synwinxt/DataHandlerExtension.h similarity index 100% rename from src/lib/synwinxt/CDataHandlerExtension.h rename to src/lib/synwinxt/DataHandlerExtension.h diff --git a/src/test/integtests/CIpcTests.cpp b/src/test/integtests/IpcTests.cpp similarity index 100% rename from src/test/integtests/CIpcTests.cpp rename to src/test/integtests/IpcTests.cpp diff --git a/src/test/integtests/CTestEventQueue.cpp b/src/test/integtests/TestEventQueue.cpp similarity index 100% rename from src/test/integtests/CTestEventQueue.cpp rename to src/test/integtests/TestEventQueue.cpp diff --git a/src/test/integtests/CTestEventQueue.h b/src/test/integtests/TestEventQueue.h similarity index 100% rename from src/test/integtests/CTestEventQueue.h rename to src/test/integtests/TestEventQueue.h diff --git a/src/test/integtests/arch/CArchInternetUnixTests.cpp b/src/test/integtests/arch/ArchInternetUnixTests.cpp similarity index 100% rename from src/test/integtests/arch/CArchInternetUnixTests.cpp rename to src/test/integtests/arch/ArchInternetUnixTests.cpp diff --git a/src/test/integtests/arch/CArchInternetWindowsTests.cpp b/src/test/integtests/arch/ArchInternetWindowsTests.cpp similarity index 100% rename from src/test/integtests/arch/CArchInternetWindowsTests.cpp rename to src/test/integtests/arch/ArchInternetWindowsTests.cpp diff --git a/src/test/integtests/platform/CMSWindowsClipboardTests.cpp b/src/test/integtests/platform/MSWindowsClipboardTests.cpp similarity index 100% rename from src/test/integtests/platform/CMSWindowsClipboardTests.cpp rename to src/test/integtests/platform/MSWindowsClipboardTests.cpp diff --git a/src/test/integtests/platform/CMSWindowsKeyStateTests.cpp b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp similarity index 100% rename from src/test/integtests/platform/CMSWindowsKeyStateTests.cpp rename to src/test/integtests/platform/MSWindowsKeyStateTests.cpp diff --git a/src/test/integtests/platform/COSXClipboardTests.cpp b/src/test/integtests/platform/OSXClipboardTests.cpp similarity index 100% rename from src/test/integtests/platform/COSXClipboardTests.cpp rename to src/test/integtests/platform/OSXClipboardTests.cpp diff --git a/src/test/integtests/platform/COSXKeyStateTests.cpp b/src/test/integtests/platform/OSXKeyStateTests.cpp similarity index 100% rename from src/test/integtests/platform/COSXKeyStateTests.cpp rename to src/test/integtests/platform/OSXKeyStateTests.cpp diff --git a/src/test/integtests/platform/COSXScreenTests.cpp b/src/test/integtests/platform/OSXScreenTests.cpp similarity index 100% rename from src/test/integtests/platform/COSXScreenTests.cpp rename to src/test/integtests/platform/OSXScreenTests.cpp diff --git a/src/test/integtests/platform/CXWindowsClipboardTests.cpp b/src/test/integtests/platform/XWindowsClipboardTests.cpp similarity index 100% rename from src/test/integtests/platform/CXWindowsClipboardTests.cpp rename to src/test/integtests/platform/XWindowsClipboardTests.cpp diff --git a/src/test/integtests/platform/CXWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp similarity index 100% rename from src/test/integtests/platform/CXWindowsKeyStateTests.cpp rename to src/test/integtests/platform/XWindowsKeyStateTests.cpp diff --git a/src/test/integtests/platform/CXWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp similarity index 100% rename from src/test/integtests/platform/CXWindowsScreenSaverTests.cpp rename to src/test/integtests/platform/XWindowsScreenSaverTests.cpp diff --git a/src/test/integtests/platform/CXWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp similarity index 100% rename from src/test/integtests/platform/CXWindowsScreenTests.cpp rename to src/test/integtests/platform/XWindowsScreenTests.cpp diff --git a/src/test/unittests/client/CMockClient.h b/src/test/unittests/client/MockClient.h similarity index 100% rename from src/test/unittests/client/CMockClient.h rename to src/test/unittests/client/MockClient.h diff --git a/src/test/unittests/client/CServerProxyTests.cpp b/src/test/unittests/client/ServerProxyTests.cpp similarity index 100% rename from src/test/unittests/client/CServerProxyTests.cpp rename to src/test/unittests/client/ServerProxyTests.cpp diff --git a/src/test/unittests/io/CMockCryptoStream.h b/src/test/unittests/io/MockCryptoStream.h similarity index 100% rename from src/test/unittests/io/CMockCryptoStream.h rename to src/test/unittests/io/MockCryptoStream.h diff --git a/src/test/unittests/io/CMockStream.h b/src/test/unittests/io/MockStream.h similarity index 100% rename from src/test/unittests/io/CMockStream.h rename to src/test/unittests/io/MockStream.h diff --git a/src/test/unittests/server/CClientProxyTests.cpp b/src/test/unittests/server/ClientProxyTests.cpp similarity index 100% rename from src/test/unittests/server/CClientProxyTests.cpp rename to src/test/unittests/server/ClientProxyTests.cpp diff --git a/src/test/unittests/server/CMockConfig.h b/src/test/unittests/server/MockConfig.h similarity index 100% rename from src/test/unittests/server/CMockConfig.h rename to src/test/unittests/server/MockConfig.h diff --git a/src/test/unittests/server/CMockInputFilter.h b/src/test/unittests/server/MockInputFilter.h similarity index 100% rename from src/test/unittests/server/CMockInputFilter.h rename to src/test/unittests/server/MockInputFilter.h diff --git a/src/test/unittests/server/CMockPrimaryClient.h b/src/test/unittests/server/MockPrimaryClient.h similarity index 100% rename from src/test/unittests/server/CMockPrimaryClient.h rename to src/test/unittests/server/MockPrimaryClient.h diff --git a/src/test/unittests/server/CMockServer.h b/src/test/unittests/server/MockServer.h similarity index 100% rename from src/test/unittests/server/CMockServer.h rename to src/test/unittests/server/MockServer.h diff --git a/src/test/unittests/synergy/CClipboardTests.cpp b/src/test/unittests/synergy/ClipboardTests.cpp similarity index 100% rename from src/test/unittests/synergy/CClipboardTests.cpp rename to src/test/unittests/synergy/ClipboardTests.cpp diff --git a/src/test/unittests/synergy/CCryptoStreamTests.cpp b/src/test/unittests/synergy/CryptoStreamTests.cpp similarity index 100% rename from src/test/unittests/synergy/CCryptoStreamTests.cpp rename to src/test/unittests/synergy/CryptoStreamTests.cpp diff --git a/src/test/unittests/synergy/CKeyStateTests.cpp b/src/test/unittests/synergy/KeyStateTests.cpp similarity index 100% rename from src/test/unittests/synergy/CKeyStateTests.cpp rename to src/test/unittests/synergy/KeyStateTests.cpp diff --git a/src/test/unittests/synergy/CKeyStateTests.h b/src/test/unittests/synergy/KeyStateTests.h similarity index 100% rename from src/test/unittests/synergy/CKeyStateTests.h rename to src/test/unittests/synergy/KeyStateTests.h diff --git a/src/test/unittests/synergy/CMockEventQueue.h b/src/test/unittests/synergy/MockEventQueue.h similarity index 100% rename from src/test/unittests/synergy/CMockEventQueue.h rename to src/test/unittests/synergy/MockEventQueue.h diff --git a/src/test/unittests/synergy/CMockKeyMap.h b/src/test/unittests/synergy/MockKeyMap.h similarity index 100% rename from src/test/unittests/synergy/CMockKeyMap.h rename to src/test/unittests/synergy/MockKeyMap.h diff --git a/src/test/unittests/synergy/CMockScreen.h b/src/test/unittests/synergy/MockScreen.h similarity index 100% rename from src/test/unittests/synergy/CMockScreen.h rename to src/test/unittests/synergy/MockScreen.h