diff --git a/core/CDbgReporter.cpp b/core/DebugReporter.cpp
similarity index 94%
rename from core/CDbgReporter.cpp
rename to core/DebugReporter.cpp
index 601de0e5..20657b9b 100644
--- a/core/CDbgReporter.cpp
+++ b/core/DebugReporter.cpp
@@ -11,8 +11,8 @@
  * Version: $Id$
  */
 
-#include "CDbgReporter.h"
-#include "CLogger.h"
+#include "DebugReporter.h"
+#include "Logger.h"
 #include "PluginSys.h"
 
 CDbgReporter g_DbgReporter;
diff --git a/core/CDbgReporter.h b/core/DebugReporter.h
similarity index 100%
rename from core/CDbgReporter.h
rename to core/DebugReporter.h
diff --git a/core/CGameConfigs.cpp b/core/GameConfigs.cpp
similarity index 94%
rename from core/CGameConfigs.cpp
rename to core/GameConfigs.cpp
index 2d4eee60..66036e41 100644
--- a/core/CGameConfigs.cpp
+++ b/core/GameConfigs.cpp
@@ -13,13 +13,13 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "CGameConfigs.h"
+#include "GameConfigs.h"
 #include "TextParsers.h"
 #include "sm_stringutil.h"
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "CHalfLife2.h"
-#include "CLogger.h"
+#include "HalfLife2.h"
+#include "Logger.h"
 #include "ShareSys.h"
 
 CGameConfigManager g_GameConfigs;
diff --git a/core/CGameConfigs.h b/core/GameConfigs.h
similarity index 100%
rename from core/CGameConfigs.h
rename to core/GameConfigs.h
diff --git a/core/CHalfLife2.cpp b/core/HalfLife2.cpp
similarity index 94%
rename from core/CHalfLife2.cpp
rename to core/HalfLife2.cpp
index ca07c45f..d16972b4 100644
--- a/core/CHalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -11,7 +11,7 @@
  * Version: $Id$
  */
 
-#include "CHalfLife2.h"
+#include "HalfLife2.h"
 #include "sourcemm_api.h"
 
 CHalfLife2 g_HL2;
diff --git a/core/CHalfLife2.h b/core/HalfLife2.h
similarity index 100%
rename from core/CHalfLife2.h
rename to core/HalfLife2.h
diff --git a/core/CLogger.cpp b/core/Logger.cpp
similarity index 94%
rename from core/CLogger.cpp
rename to core/Logger.cpp
index 545256dc..5b0c7e60 100644
--- a/core/CLogger.cpp
+++ b/core/Logger.cpp
@@ -14,7 +14,7 @@
 #include <time.h>
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "systems/LibrarySys.h"
 #include "sm_version.h"
 
diff --git a/core/CLogger.h b/core/Logger.h
similarity index 100%
rename from core/CLogger.h
rename to core/Logger.h
diff --git a/core/CTimerSys.cpp b/core/TimerSys.cpp
similarity index 95%
rename from core/CTimerSys.cpp
rename to core/TimerSys.cpp
index 166b54ed..9740ce9e 100644
--- a/core/CTimerSys.cpp
+++ b/core/TimerSys.cpp
@@ -12,7 +12,7 @@
 * Version: $Id$
 */
 
-#include "CTimerSys.h"
+#include "TimerSys.h"
 
 CTimerSystem g_Timers;
 
diff --git a/core/CTimerSys.h b/core/TimerSys.h
similarity index 100%
rename from core/CTimerSys.h
rename to core/TimerSys.h
diff --git a/core/Translator.cpp b/core/Translator.cpp
index a29937de..cea55b40 100644
--- a/core/Translator.cpp
+++ b/core/Translator.cpp
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "Translator.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "TextParsers.h"
 #include "LibrarySys.h"
 #include "sm_stringutil.h"
diff --git a/core/CUserMessages.cpp b/core/UserMessages.cpp
similarity index 95%
rename from core/CUserMessages.cpp
rename to core/UserMessages.cpp
index d675b737..e9f294b4 100644
--- a/core/CUserMessages.cpp
+++ b/core/UserMessages.cpp
@@ -12,7 +12,7 @@
 * Version: $Id$
 */
 
-#include "CUserMessages.h"
+#include "UserMessages.h"
 
 CUserMessages g_UserMsgs;
 
diff --git a/core/CUserMessages.h b/core/UserMessages.h
similarity index 100%
rename from core/CUserMessages.h
rename to core/UserMessages.h
diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj
index 57ca29d2..d8f75c8c 100644
--- a/core/msvc8/sourcemod_mm.vcproj
+++ b/core/msvc8/sourcemod_mm.vcproj
@@ -187,22 +187,6 @@
 				RelativePath="..\CDataPack.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\CDbgReporter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CGameConfigs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CHalfLife2.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CLogger.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\ConCmdManager.cpp"
 				>
@@ -212,17 +196,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\CTimerSys.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CUserMessages.cpp"
+				RelativePath="..\DebugReporter.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\EventManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\GameConfigs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\HalfLife2.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Logger.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\PlayerManager.cpp"
 				>
@@ -259,10 +251,18 @@
 				RelativePath="..\TextParsers.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\TimerSys.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\Translator.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\UserMessages.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -277,26 +277,10 @@
 				RelativePath="..\CDataPack.h"
 				>
 			</File>
-			<File
-				RelativePath="..\CDbgReporter.h"
-				>
-			</File>
 			<File
 				RelativePath="..\CellRecipientFilter.h"
 				>
 			</File>
-			<File
-				RelativePath="..\CGameConfigs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CHalfLife2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CLogger.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ConCmdManager.h"
 				>
@@ -306,17 +290,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\CTimerSys.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CUserMessages.h"
+				RelativePath="..\DebugReporter.h"
 				>
 			</File>
 			<File
 				RelativePath="..\EventManager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\GameConfigs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\HalfLife2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Logger.h"
+				>
+			</File>
 			<File
 				RelativePath="..\PlayerManager.h"
 				>
@@ -369,10 +361,18 @@
 				RelativePath="..\TextParsers.h"
 				>
 			</File>
+			<File
+				RelativePath="..\TimerSys.h"
+				>
+			</File>
 			<File
 				RelativePath="..\Translator.h"
 				>
 			</File>
+			<File
+				RelativePath="..\UserMessages.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Interfaces"
diff --git a/core/sm_stringutil.cpp b/core/sm_stringutil.cpp
index ef7be0cc..6a6e86b8 100644
--- a/core/sm_stringutil.cpp
+++ b/core/sm_stringutil.cpp
@@ -15,7 +15,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include "sm_stringutil.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "PluginSys.h"
 #include "Translator.h"
 #include "PlayerManager.h"
diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp
index 8694f7c1..5f0a9f4d 100644
--- a/core/smn_entities.cpp
+++ b/core/smn_entities.cpp
@@ -16,7 +16,7 @@
 #include "sourcemm_api.h"
 #include "server_class.h"
 #include "PlayerManager.h"
-#include "CHalfLife2.h"
+#include "HalfLife2.h"
 
 inline edict_t *GetEdict(cell_t num)
 {
diff --git a/core/smn_filesystem.cpp b/core/smn_filesystem.cpp
index f875b0a1..eeb02565 100644
--- a/core/smn_filesystem.cpp
+++ b/core/smn_filesystem.cpp
@@ -16,7 +16,7 @@
 #include "HandleSys.h"
 #include "LibrarySys.h"
 #include "sm_stringutil.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "PluginSys.h"
 #include "sourcemm_api.h"
 
diff --git a/core/smn_usermsgs.cpp b/core/smn_usermsgs.cpp
index 155d7c22..02c03ae9 100644
--- a/core/smn_usermsgs.cpp
+++ b/core/smn_usermsgs.cpp
@@ -14,7 +14,7 @@
 
 #include "HandleSys.h"
 #include "PluginSys.h"
-#include "CUserMessages.h"
+#include "UserMessages.h"
 #include "smn_usermsgs.h"
 
 HandleType_t g_WrBitBufType;
diff --git a/core/sourcemod.cpp b/core/sourcemod.cpp
index 15f0a7d1..ecceb494 100644
--- a/core/sourcemod.cpp
+++ b/core/sourcemod.cpp
@@ -19,7 +19,7 @@
 #include <sh_string.h>
 #include "PluginSys.h"
 #include "ShareSys.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "ExtensionSys.h"
 #include "AdminCache.h"
 #include "sm_stringutil.h"
diff --git a/core/systems/ExtensionSys.cpp b/core/systems/ExtensionSys.cpp
index 066f616b..7bc8abec 100644
--- a/core/systems/ExtensionSys.cpp
+++ b/core/systems/ExtensionSys.cpp
@@ -15,7 +15,7 @@
 #include "ExtensionSys.h"
 #include "LibrarySys.h"
 #include "ShareSys.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "sourcemm_api.h"
 #include "PluginSys.h"
 #include "sm_srvcmds.h"
diff --git a/core/systems/PluginSys.cpp b/core/systems/PluginSys.cpp
index 8b6bcaa7..0b38ff04 100644
--- a/core/systems/PluginSys.cpp
+++ b/core/systems/PluginSys.cpp
@@ -19,7 +19,7 @@
 #include "sourcemm_api.h"
 #include "sourcemod.h"
 #include "TextParsers.h"
-#include "CLogger.h"
+#include "Logger.h"
 #include "ExtensionSys.h"
 #include "sm_srvcmds.h"
 #include "sm_stringutil.h"