diff --git a/core/AdminCache.cpp b/core/AdminCache.cpp
index 3db94043..f60accb0 100644
--- a/core/AdminCache.cpp
+++ b/core/AdminCache.cpp
@@ -16,7 +16,7 @@
 #include "AdminCache.h"
 #include "ShareSys.h"
 #include "ForwardSys.h"
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 #include "ConCmdManager.h"
 
 AdminCache g_Admins;
diff --git a/core/CGameConfigs.cpp b/core/CGameConfigs.cpp
index 048704cc..2d4eee60 100644
--- a/core/CGameConfigs.cpp
+++ b/core/CGameConfigs.cpp
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "CGameConfigs.h"
-#include "CTextParsers.h"
+#include "TextParsers.h"
 #include "sm_stringutil.h"
 #include "sourcemod.h"
 #include "sourcemm_api.h"
diff --git a/core/ConCmdManager.cpp b/core/ConCmdManager.cpp
index 094e3619..19ae8501 100644
--- a/core/ConCmdManager.cpp
+++ b/core/ConCmdManager.cpp
@@ -15,8 +15,8 @@
 #include "sm_srvcmds.h"
 #include "AdminCache.h"
 #include "sm_stringutil.h"
-#include "CPlayerManager.h"
-#include "CTranslator.h"
+#include "PlayerManager.h"
+#include "Translator.h"
 
 ConCmdManager g_ConCmds;
 
diff --git a/core/CPlayerManager.cpp b/core/PlayerManager.cpp
similarity index 96%
rename from core/CPlayerManager.cpp
rename to core/PlayerManager.cpp
index 8e4776ba..0b9581c3 100644
--- a/core/CPlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -11,7 +11,7 @@
  * Version: $Id$
  */
 
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 #include "ForwardSys.h"
 #include "ShareSys.h"
 #include "AdminCache.h"
diff --git a/core/CPlayerManager.h b/core/PlayerManager.h
similarity index 100%
rename from core/CPlayerManager.h
rename to core/PlayerManager.h
diff --git a/core/CTextParsers.cpp b/core/TextParsers.cpp
similarity index 95%
rename from core/CTextParsers.cpp
rename to core/TextParsers.cpp
index b1e8a205..521d1c1c 100644
--- a/core/CTextParsers.cpp
+++ b/core/TextParsers.cpp
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "CTextParsers.h"
+#include "TextParsers.h"
 #include "ShareSys.h"
 
 CTextParsers g_TextParser;
diff --git a/core/CTextParsers.h b/core/TextParsers.h
similarity index 100%
rename from core/CTextParsers.h
rename to core/TextParsers.h
diff --git a/core/CTranslator.cpp b/core/Translator.cpp
similarity index 95%
rename from core/CTranslator.cpp
rename to core/Translator.cpp
index ce73c044..a29937de 100644
--- a/core/CTranslator.cpp
+++ b/core/Translator.cpp
@@ -14,9 +14,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "CTranslator.h"
+#include "Translator.h"
 #include "CLogger.h"
-#include "CTextParsers.h"
+#include "TextParsers.h"
 #include "LibrarySys.h"
 #include "sm_stringutil.h"
 #include "sourcemod.h"
diff --git a/core/CTranslator.h b/core/Translator.h
similarity index 100%
rename from core/CTranslator.h
rename to core/Translator.h
diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj
index 46e68a91..57ca29d2 100644
--- a/core/msvc8/sourcemod_mm.vcproj
+++ b/core/msvc8/sourcemod_mm.vcproj
@@ -211,22 +211,10 @@
 				RelativePath="..\ConVarManager.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\CPlayerManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CTextParsers.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\CTimerSys.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\CTranslator.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\CUserMessages.cpp"
 				>
@@ -235,6 +223,10 @@
 				RelativePath="..\EventManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\PlayerManager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\sm_autonatives.cpp"
 				>
@@ -263,6 +255,14 @@
 				RelativePath="..\sourcemod.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\TextParsers.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Translator.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -305,22 +305,10 @@
 				RelativePath="..\ConVarManager.h"
 				>
 			</File>
-			<File
-				RelativePath="..\CPlayerManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CTextParsers.h"
-				>
-			</File>
 			<File
 				RelativePath="..\CTimerSys.h"
 				>
 			</File>
-			<File
-				RelativePath="..\CTranslator.h"
-				>
-			</File>
 			<File
 				RelativePath="..\CUserMessages.h"
 				>
@@ -329,6 +317,10 @@
 				RelativePath="..\EventManager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\PlayerManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\sm_autonatives.h"
 				>
@@ -373,6 +365,14 @@
 				RelativePath="..\sourcemod.h"
 				>
 			</File>
+			<File
+				RelativePath="..\TextParsers.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Translator.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Interfaces"
diff --git a/core/sm_stringutil.cpp b/core/sm_stringutil.cpp
index 3720da97..ef7be0cc 100644
--- a/core/sm_stringutil.cpp
+++ b/core/sm_stringutil.cpp
@@ -17,8 +17,8 @@
 #include "sm_stringutil.h"
 #include "CLogger.h"
 #include "PluginSys.h"
-#include "CTranslator.h"
-#include "CPlayerManager.h"
+#include "Translator.h"
+#include "PlayerManager.h"
 
 #define LADJUST			0x00000004		/* left adjustment */
 #define ZEROPAD			0x00000080		/* zero (as opposed to blank) pad */
diff --git a/core/smn_console.cpp b/core/smn_console.cpp
index ab81ca9a..8fbeb437 100644
--- a/core/smn_console.cpp
+++ b/core/smn_console.cpp
@@ -18,7 +18,7 @@
 #include "ConCmdManager.h"
 #include "PluginSys.h"
 #include "sm_stringutil.h"
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 
 static cell_t sm_CreateConVar(IPluginContext *pContext, const cell_t *params)
 {
diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp
index f8b2f458..8694f7c1 100644
--- a/core/smn_entities.cpp
+++ b/core/smn_entities.cpp
@@ -15,7 +15,7 @@
 #include "sourcemod.h"
 #include "sourcemm_api.h"
 #include "server_class.h"
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 #include "CHalfLife2.h"
 
 inline edict_t *GetEdict(cell_t num)
diff --git a/core/smn_halflife.cpp b/core/smn_halflife.cpp
index 93c00cd0..356ed2ff 100644
--- a/core/smn_halflife.cpp
+++ b/core/smn_halflife.cpp
@@ -14,7 +14,7 @@
 #include "sm_globals.h"
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 
 static cell_t SetRandomSeed(IPluginContext *pContext, const cell_t *params)
 {
diff --git a/core/smn_lang.cpp b/core/smn_lang.cpp
index a0eefde3..5b9ddcbe 100644
--- a/core/smn_lang.cpp
+++ b/core/smn_lang.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "PluginSys.h"
-#include "CTranslator.h"
+#include "Translator.h"
 
 static cell_t sm_LoadTranslations(IPluginContext *pCtx, const cell_t *params)
 {
diff --git a/core/smn_player.cpp b/core/smn_player.cpp
index c520c01e..f7c7190b 100644
--- a/core/smn_player.cpp
+++ b/core/smn_player.cpp
@@ -11,7 +11,7 @@
  * Version: $Id$
  */
 
-#include "CPlayerManager.h"
+#include "PlayerManager.h"
 #include "AdminCache.h"
 #include "sm_stringutil.h"
 
diff --git a/core/smn_textparse.cpp b/core/smn_textparse.cpp
index b61f90de..d0ccf358 100644
--- a/core/smn_textparse.cpp
+++ b/core/smn_textparse.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "sm_globals.h"
-#include "CTextParsers.h"
+#include "TextParsers.h"
 #include "HandleSys.h"
 
 HandleType_t g_TypeSMC = 0;
diff --git a/core/sourcemod.cpp b/core/sourcemod.cpp
index 4271d6d3..15f0a7d1 100644
--- a/core/sourcemod.cpp
+++ b/core/sourcemod.cpp
@@ -23,8 +23,8 @@
 #include "ExtensionSys.h"
 #include "AdminCache.h"
 #include "sm_stringutil.h"
-#include "CPlayerManager.h"
-#include "CTranslator.h"
+#include "PlayerManager.h"
+#include "Translator.h"
 #include "ForwardSys.h"
 #include "CTimerSys.h"
 
diff --git a/core/systems/PluginSys.cpp b/core/systems/PluginSys.cpp
index c4d575e5..8b6bcaa7 100644
--- a/core/systems/PluginSys.cpp
+++ b/core/systems/PluginSys.cpp
@@ -18,7 +18,7 @@
 #include "HandleSys.h"
 #include "sourcemm_api.h"
 #include "sourcemod.h"
-#include "CTextParsers.h"
+#include "TextParsers.h"
 #include "CLogger.h"
 #include "ExtensionSys.h"
 #include "sm_srvcmds.h"