diff --git a/game/shared/igamesystem.h b/game/shared/igamesystem.h
index cdd86828..9ff37005 100644
--- a/game/shared/igamesystem.h
+++ b/game/shared/igamesystem.h
@@ -387,10 +387,10 @@ public:
 
 // Quick and dirty server system for users who don't care about precise ordering
 // and usually only want to implement a few of the callbacks
-class CBaseGameSystem : public IGameSystem
+class CAutoGameSystem : public IGameSystem
 {
 public:
-	CBaseGameSystem(const char* pszInitName = "unnamed")
+	CAutoGameSystem(const char* pszInitName = "unnamed")
 	 :  m_pName(pszInitName)
 	{
 	}
@@ -491,16 +491,13 @@ public:
 	virtual void SetGameSystemGlobalPtrs(void* pValue) override {}
 	virtual void SetName(const char* pName) override { m_pName = pName; }
 	virtual bool DoesGameSystemReallocate() override { return false; }
-	virtual ~CBaseGameSystem() {}
+	virtual ~CAutoGameSystem() {}
 
 private:
 	const char* m_pName;
 };
 
-class CAutoGameSystem : public CBaseGameSystem
-{
-protected:
-	virtual ~CAutoGameSystem() {};
-};
+// AMNOTE: Deprecated, use CAutoGameSystem instead
+using CBaseGameSystem = CAutoGameSystem;
 
 #endif // IGAMESYSTEM_H