diff --git a/r5dev/public/iconvar.h b/r5dev/public/iconvar.h
index 6ef97a7d..f899a9d1 100644
--- a/r5dev/public/iconvar.h
+++ b/r5dev/public/iconvar.h
@@ -136,15 +136,17 @@ public:
 	virtual void SetValue(float flValue) = 0;
 	virtual void SetValue(int nValue) = 0;
 
-	// Return name of command
-	virtual const char* GetName(void) const = 0;
+	// Original name 'GetName'. Renamed due to name ambiguity
+	// as we are not implementing it in ConVar, we are just
+	// interfacing it with the game executable.
+	virtual const char* GetCommandName(void) const = 0;
 
 	// Return name of command (usually == GetName(), except in case of FCVAR_SS_ADDED vars
 	virtual const char* GetBaseName(void) const = 0;
 
 	// Accessors.. not as efficient as using GetState()/GetInfo()
 	// if you call these methods multiple times on the same IConVar
-	virtual bool IsFlagSet(int nFlag) const = 0;
+	virtual bool IsConVarFlagSet(int nFlag) const = 0; // Original name 'IsFlagSet'. Renamed for same reason as 'GetName'.
 
 	virtual int GetSplitScreenPlayerSlot() const = 0;
 };
diff --git a/r5dev/tier1/cvar.h b/r5dev/tier1/cvar.h
index bb806da2..fc41bf00 100644
--- a/r5dev/tier1/cvar.h
+++ b/r5dev/tier1/cvar.h
@@ -402,9 +402,6 @@ public:
 	void InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke);
 	void RemoveChangeCallback(FnChangeCallback_t callback);
 
-	virtual bool IsFlagSet(int nFlags) { return (nFlags & m_pParent->m_nFlags) ? true : false; };
-	virtual const char* GetName(void) const { return m_pParent->m_pszName; };
-
 	struct CVValue_t
 	{
 		char* m_pszString;
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 890202b7..62fe8c21 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -727,7 +727,7 @@ NET_UseRandomKeyChanged_f
 */
 void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
 {
-	if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
+	if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetCommandName()))
 	{
 		if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
 			return; // Same value.
@@ -931,7 +931,7 @@ RCON_PasswordChanged_f
 */
 void RCON_PasswordChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
 {
-	if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
+	if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetCommandName()))
 	{
 		if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
 			return; // Same password.