diff --git a/r5dev/vstdlib/autocompletefilelist.cpp b/r5dev/vstdlib/autocompletefilelist.cpp
index 73b98906..3117dd85 100644
--- a/r5dev/vstdlib/autocompletefilelist.cpp
+++ b/r5dev/vstdlib/autocompletefilelist.cpp
@@ -14,7 +14,7 @@
 //  commandname subdir/filename2.ext
 // Returns number of files in list for autocompletion
 //-----------------------------------------------------------------------------
-int CAutoCompleteFileList::AutoCompletionFunc(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
+int CBaseAutoCompleteFileList::AutoCompletionFunc(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
 {
-	return v_CAutoCompleteFileList_AutoCompletionFunc(this, partial, commands);
+	return v_CBaseAutoCompleteFileList_AutoCompletionFunc(this, partial, commands);
 }
diff --git a/r5dev/vstdlib/autocompletefilelist.h b/r5dev/vstdlib/autocompletefilelist.h
index 9d29a8a6..9c51ad9c 100644
--- a/r5dev/vstdlib/autocompletefilelist.h
+++ b/r5dev/vstdlib/autocompletefilelist.h
@@ -15,10 +15,10 @@
 //-----------------------------------------------------------------------------
 // Purpose: Simple helper class for doing autocompletion of all files in a specific directory by extension
 //-----------------------------------------------------------------------------
-class CAutoCompleteFileList
+class CBaseAutoCompleteFileList
 {
 public:
-	CAutoCompleteFileList(const char* cmdname, const char* subdir, const char* extension)
+	CBaseAutoCompleteFileList(const char* cmdname, const char* subdir, const char* extension)
 	{
 		m_pszCommandName = cmdname;
 		m_pszSubDir = subdir;
diff --git a/r5dev/vstdlib/completion.cpp b/r5dev/vstdlib/completion.cpp
index c5256fe1..690eae7d 100644
--- a/r5dev/vstdlib/completion.cpp
+++ b/r5dev/vstdlib/completion.cpp
@@ -58,7 +58,7 @@ int _Host_Map_f_CompletionFunc(char const* cmdname, char const* partial, char co
 //			**commands - 
 // Output : int
 //-----------------------------------------------------------------------------
-int _Host_Pak_f_CompletionFunc(CAutoCompleteFileList* autocomplete, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
+int _Host_Pak_f_CompletionFunc(CBaseAutoCompleteFileList* autocomplete, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
 {
 	int count = autocomplete->AutoCompletionFunc(partial, commands);
 	if (count > 0)
@@ -128,7 +128,7 @@ int Host_Changelevel_f_CompletionFunc(char const* partial, char commands[COMMAND
 	return _Host_Map_f_CompletionFunc(cmdname, partial, commands);
 }
 
-static CAutoCompleteFileList s_GiveAutoFileList("give", "scripts/weapons", "txt");
+static CBaseAutoCompleteFileList s_GiveAutoFileList("give", "scripts/weapons", "txt");
 //-----------------------------------------------------------------------------
 // Purpose: 
 // Input  : *partial - 
@@ -140,7 +140,7 @@ int Game_Give_f_CompletionFunc(char const* partial, char commands[COMMAND_COMPLE
 	return s_GiveAutoFileList.AutoCompletionFunc(partial, commands);
 }
 
-static CAutoCompleteFileList s_PakLoadAutoFileList("pak_requestload", "paks/Win64", "rpak");
+static CBaseAutoCompleteFileList s_PakLoadAutoFileList("pak_requestload", "paks/Win64", "rpak");
 //-----------------------------------------------------------------------------
 // Purpose: 
 // Input  : *partial - 
@@ -152,7 +152,7 @@ int RTech_PakLoad_f_CompletionFunc(char const* partial, char commands[COMMAND_CO
 	return _Host_Pak_f_CompletionFunc(&s_PakLoadAutoFileList, partial, commands);
 }
 
-static CAutoCompleteFileList s_PakUnloadAutoFileList("pak_requestunload", "paks/Win64", "rpak");
+static CBaseAutoCompleteFileList s_PakUnloadAutoFileList("pak_requestunload", "paks/Win64", "rpak");
 //-----------------------------------------------------------------------------
 // Purpose: 
 // Input  : *partial - 
diff --git a/r5dev/vstdlib/completion.h b/r5dev/vstdlib/completion.h
index 089a6b82..78d51af1 100644
--- a/r5dev/vstdlib/completion.h
+++ b/r5dev/vstdlib/completion.h
@@ -12,26 +12,26 @@ int Game_Give_f_CompletionFunc(char const* partial, char commands[COMMAND_COMPLE
 int RTech_PakLoad_f_CompletionFunc(char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
 int RTech_PakUnload_f_CompletionFunc(char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
 
-inline CMemory p_CAutoCompleteFileList_AutoCompletionFunc;
-inline auto v_CAutoCompleteFileList_AutoCompletionFunc = p_CAutoCompleteFileList_AutoCompletionFunc.RCast<int(*)(
-	CAutoCompleteFileList* thisp, const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])>();
+inline CMemory p_CBaseAutoCompleteFileList_AutoCompletionFunc;
+inline auto v_CBaseAutoCompleteFileList_AutoCompletionFunc = p_CBaseAutoCompleteFileList_AutoCompletionFunc.RCast<int(*)(
+	CBaseAutoCompleteFileList* thisp, const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])>();
 
 ///////////////////////////////////////////////////////////////////////////////
 class VCompletion : public IDetour
 {
 	virtual void GetAdr(void) const
 	{
-		LogFunAdr("CAutoCompleteFileList::AutoCompletionFunc", p_CAutoCompleteFileList_AutoCompletionFunc.GetPtr());
+		LogFunAdr("CBaseAutoCompleteFileList::AutoCompletionFunc", p_CBaseAutoCompleteFileList_AutoCompletionFunc.GetPtr());
 	}
 	virtual void GetFun(void) const
 	{
 #if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
 		p_CBaseAutoCompleteFileList_AutoCompletionFunc = g_GameDll.FindPatternSIMD("40 55 53 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ?? 48 81 EC ?? ?? ?? ?? 48 8B 39");
 #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
-		p_CAutoCompleteFileList_AutoCompletionFunc = g_GameDll.FindPatternSIMD("48 8B C4 4C 89 40 18 55 41 54");
+		p_CBaseAutoCompleteFileList_AutoCompletionFunc = g_GameDll.FindPatternSIMD("48 8B C4 4C 89 40 18 55 41 54");
 #endif
-		v_CAutoCompleteFileList_AutoCompletionFunc = p_CAutoCompleteFileList_AutoCompletionFunc.RCast<int(*)(
-			CAutoCompleteFileList*, const char*, char[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])>();
+		v_CBaseAutoCompleteFileList_AutoCompletionFunc = p_CBaseAutoCompleteFileList_AutoCompletionFunc.RCast<int(*)(
+			CBaseAutoCompleteFileList*, const char*, char[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])>();
 	}
 	virtual void GetVar(void) const { }
 	virtual void GetCon(void) const { }