diff --git a/r5dev/client/cdll_engine_int.cpp b/r5dev/client/cdll_engine_int.cpp
index d0e31fd5..8db66a72 100644
--- a/r5dev/client/cdll_engine_int.cpp
+++ b/r5dev/client/cdll_engine_int.cpp
@@ -38,7 +38,7 @@ void CHLClient::FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t frameS
 			break;
 		}
 	}
-	g_pIConsole->Think();
+	g_pConsole->Think();
 	CHLClient_FrameStageNotify(pHLClient, frameStage);
 }
 
diff --git a/r5dev/filesystem/basefilesystem.cpp b/r5dev/filesystem/basefilesystem.cpp
index bd4c217f..c5103040 100644
--- a/r5dev/filesystem/basefilesystem.cpp
+++ b/r5dev/filesystem/basefilesystem.cpp
@@ -91,7 +91,7 @@ void CBaseFileSystem::Warning(CBaseFileSystem* pFileSystem, FileWarningLevel_t l
 		wconsole->debug(szBuf);
 #ifndef DEDICATED
 		iconsole->debug(szBuf);
-		g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 1.00f)));
+		g_pConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 1.00f)));
 
 		g_spd_sys_w_oss.str("");
 		g_spd_sys_w_oss.clear();
diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp
index ffdf533e..c074ac3b 100644
--- a/r5dev/gameui/IConsole.cpp
+++ b/r5dev/gameui/IConsole.cpp
@@ -913,4 +913,4 @@ void CConsole::SetStyleVar(void)
     style.WindowMinSize = ImVec2(618, 518);
 }
 
-CConsole* g_pIConsole = new CConsole();
+CConsole* g_pConsole = new CConsole();
diff --git a/r5dev/gameui/IConsole.h b/r5dev/gameui/IConsole.h
index 0b92f9ea..fb08608f 100644
--- a/r5dev/gameui/IConsole.h
+++ b/r5dev/gameui/IConsole.h
@@ -117,5 +117,5 @@ public:
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-extern CConsole* g_pIConsole;
+extern CConsole* g_pConsole;
 #endif // !DEDICATED
diff --git a/r5dev/launcher/IApplication.cpp b/r5dev/launcher/IApplication.cpp
index 09e616bf..155663b7 100644
--- a/r5dev/launcher/IApplication.cpp
+++ b/r5dev/launcher/IApplication.cpp
@@ -62,7 +62,7 @@ bool CModAppSystemGroup::Create(CModAppSystemGroup* pModAppSystemGroup)
 #ifndef DEDICATED
 	for (auto& map : g_pCVar->DumpToMap())
 	{
-		g_pIConsole->m_vsvCommandBases.push_back(
+		g_pConsole->m_vsvCommandBases.push_back(
 			CSuggest(map.first.c_str(), map.second->GetFlags()));
 	}
 #endif // !DEDICATED
diff --git a/r5dev/squirrel/sqvm.cpp b/r5dev/squirrel/sqvm.cpp
index 92400c7d..589658b3 100644
--- a/r5dev/squirrel/sqvm.cpp
+++ b/r5dev/squirrel/sqvm.cpp
@@ -162,7 +162,7 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
 				}
 			}
 
-			g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
+			g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
 			g_pLogSystem.AddLog(static_cast<LogType_t>(context), g_spd_sys_w_oss.str());
 
 			g_spd_sys_w_oss.str("");
@@ -232,7 +232,7 @@ SQRESULT SQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
 #ifndef DEDICATED
 		iconsole->debug(vmStr); // Emit to in-game console.
 
-		g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
+		g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
 		g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
 
 		g_spd_sys_w_oss.str("");
diff --git a/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp b/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
index 8cd27932..5615b9ba 100644
--- a/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
+++ b/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
@@ -186,7 +186,7 @@ void    ImGui_ImplWin32_Shutdown()
 static bool ImGui_ImplWin32_UpdateMouseCursor()
 {
     // These have to be here to prevent the mouse in-game from flickering when '::SetCursor(...)' is called.
-    if (g_pBrowser->m_bActivate || g_pIConsole->m_bActivate)
+    if (g_pBrowser->m_bActivate || g_pConsole->m_bActivate)
     {
         ImGuiIO& io = ImGui::GetIO();
         if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)
diff --git a/r5dev/tier0/dbg.cpp b/r5dev/tier0/dbg.cpp
index 6e900f8e..c0896499 100644
--- a/r5dev/tier0/dbg.cpp
+++ b/r5dev/tier0/dbg.cpp
@@ -174,7 +174,7 @@ void DevMsg(eDLL_T context, const char* fmt, ...)
 		break;
 	}
 
-	g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
+	g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
 	g_pLogSystem.AddLog(tLog, g_spd_sys_w_oss.str());
 
 	g_spd_sys_w_oss.str("");
@@ -251,7 +251,7 @@ void Warning(eDLL_T context, const char* fmt, ...)
 #ifndef DEDICATED
 	iconsole->info(svOut);
 
-	g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
+	g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
 	g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str());
 
 	g_spd_sys_w_oss.str("");
@@ -328,7 +328,7 @@ void Error(eDLL_T context, const char* fmt, ...)
 #ifndef DEDICATED
 	iconsole->info(svOut);
 
-	g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
+	g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
 	g_pLogSystem.AddLog(LogType_t::ERROR_C, g_spd_sys_w_oss.str());
 
 	g_spd_sys_w_oss.str("");
diff --git a/r5dev/vphysics/QHull.cpp b/r5dev/vphysics/QHull.cpp
index 0e47a65f..f9d5af5b 100644
--- a/r5dev/vphysics/QHull.cpp
+++ b/r5dev/vphysics/QHull.cpp
@@ -32,7 +32,7 @@ int HQHull_PrintFunc(const char* fmt, ...)
 
 #ifndef DEDICATED
 	iconsole->debug(buf);
-	g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(0.81f, 0.81f, 0.81f, 1.00f)));
+	g_pConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(0.81f, 0.81f, 0.81f, 1.00f)));
 
 	g_spd_sys_w_oss.str("");
 	g_spd_sys_w_oss.clear();
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index c73bb6f7..b6149039 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -50,7 +50,7 @@ GameConsole_Invoke_f
 */
 void GameConsole_Invoke_f(const CCommand& args)
 {
-	g_pIConsole->m_bActivate = !g_pIConsole->m_bActivate;
+	g_pConsole->m_bActivate = !g_pConsole->m_bActivate;
 }
 
 /*
diff --git a/r5dev/windows/id3dx.cpp b/r5dev/windows/id3dx.cpp
index bc040768..57a423d0 100644
--- a/r5dev/windows/id3dx.cpp
+++ b/r5dev/windows/id3dx.cpp
@@ -68,7 +68,7 @@ LRESULT CALLBACK HwndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	{
 		if (wParam == g_pImGuiConfig->IConsole_Config.m_nBind0 || wParam == g_pImGuiConfig->IConsole_Config.m_nBind1)
 		{
-			g_pIConsole->m_bActivate = !g_pIConsole->m_bActivate;
+			g_pConsole->m_bActivate = !g_pConsole->m_bActivate;
 		}
 
 		if (wParam == g_pImGuiConfig->IBrowser_Config.m_nBind0 || wParam == g_pImGuiConfig->IBrowser_Config.m_nBind1)
@@ -77,7 +77,7 @@ LRESULT CALLBACK HwndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 	}
 
-	if (g_pIConsole->m_bActivate || g_pBrowser->m_bActivate)
+	if (g_pConsole->m_bActivate || g_pBrowser->m_bActivate)
 	{//////////////////////////////////////////////////////////////////////////////
 		g_bBlockInput = true;
 
@@ -278,12 +278,12 @@ void DrawImGui()
 		g_pInputSystem->EnableInput(false); // Disable input to game when browser is drawn.
 		g_pBrowser->Draw("Server Browser", &g_pBrowser->m_bActivate);
 	}
-	if (g_pIConsole->m_bActivate)
+	if (g_pConsole->m_bActivate)
 	{
 		g_pInputSystem->EnableInput(false); // Disable input to game when console is drawn.
-		g_pIConsole->Draw("Console", &g_pIConsole->m_bActivate);
+		g_pConsole->Draw("Console", &g_pConsole->m_bActivate);
 	}
-	if (!g_pIConsole->m_bActivate && !g_pBrowser->m_bActivate)
+	if (!g_pConsole->m_bActivate && !g_pBrowser->m_bActivate)
 	{
 		g_pInputSystem->EnableInput(true); // Enable input to game when both are not drawn.
 	}
@@ -369,7 +369,7 @@ HRESULT GetDeviceAndCtxFromSwapchain(IDXGISwapChain* pSwapChain, ID3D11Device**
 
 HRESULT __stdcall GetResizeBuffers(IDXGISwapChain* pSwapChain, UINT nBufferCount, UINT nWidth, UINT nHeight, DXGI_FORMAT dxFormat, UINT nSwapChainFlags)
 {
-	g_pIConsole->m_bActivate = false;
+	g_pConsole->m_bActivate = false;
 	g_pBrowser->m_bActivate = false;
 	g_bInitialized    = false;
 	g_bPresentHooked  = false;