diff --git a/r5dev/game/server/player.cpp b/r5dev/game/server/player.cpp
index 48d2fc06..1109a68e 100644
--- a/r5dev/game/server/player.cpp
+++ b/r5dev/game/server/player.cpp
@@ -17,20 +17,20 @@ void CPlayer::RunNullCommand(void)
 {
 	CUserCmd cmd;
 
-	float flOldFrameTime = (*g_pGlobals)->m_fFrameTime;
-	float flOldCurTime = (*g_pGlobals)->m_fCurTime;
+	float flOldFrameTime = (*g_pGlobals)->m_flFrameTime;
+	float flOldCurTime = (*g_pGlobals)->m_flCurTime;
 
 	pl.fixangle = FIXANGLE_NONE;
 	EyeAngles(&cmd.viewangles);
 
-	SetTimeBase((*g_pGlobals)->m_fCurTime);
+	SetTimeBase((*g_pGlobals)->m_flCurTime);
 	MoveHelperServer()->SetHost(this);
 
 	PlayerRunCommand(&cmd, MoveHelperServer());
 	SetLastUserCommand(&cmd);
 
-	(*g_pGlobals)->m_fFrameTime = flOldFrameTime;
-	(*g_pGlobals)->m_fCurTime = flOldCurTime;
+	(*g_pGlobals)->m_flFrameTime = flOldFrameTime;
+	(*g_pGlobals)->m_flCurTime = flOldCurTime;
 
 	MoveHelperServer()->SetHost(NULL);
 }
@@ -58,7 +58,7 @@ inline void CPlayer::SetTimeBase(float flTimeBase)
 
 	SetLastUCmdSimulationRemainderTime(flTime);
 
-	float flSomeTime = flTimeBase - m_lastUCmdSimulationRemainderTime * (*g_pGlobals)->m_nTickInterval;
+	float flSomeTime = flTimeBase - m_lastUCmdSimulationRemainderTime * (*g_pGlobals)->m_flTickInterval;
 	if (flSomeTime >= 0.0)
 	{
 		flTime = flSomeTime;
@@ -78,7 +78,7 @@ void CPlayer::SetLastUCmdSimulationRemainderTime(float flRemainderTime)
 		edict_t nEdict = NetworkProp()->GetEdict();
 		if (nEdict != FL_EDICT_INVALID)
 		{
-			_InterlockedOr16((SHORT*)(*g_pGlobals)->m_pInterlock + nEdict + 32, 0x200u);
+			_InterlockedOr16((SHORT*)(*g_pGlobals)->m_pEdicts + nEdict + 32, 0x200u);
 		}
 
 		m_lastUCmdSimulationRemainderTime = flRemainderTime;
@@ -96,7 +96,7 @@ void CPlayer::SetTotalExtraClientCmdTimeAttempted(float flAttemptedTime)
 		edict_t nEdict = NetworkProp()->GetEdict();
 		if (nEdict != FL_EDICT_INVALID)
 		{
-			_InterlockedOr16((SHORT*)(*g_pGlobals)->m_pInterlock + nEdict + 32, 0x200u);
+			_InterlockedOr16((SHORT*)(*g_pGlobals)->m_pEdicts + nEdict + 32, 0x200u);
 		}
 
 		m_totalExtraClientCmdTimeAttempted = flAttemptedTime;
diff --git a/r5dev/game/shared/shareddefs.h b/r5dev/game/shared/shareddefs.h
index e896c805..f3119134 100644
--- a/r5dev/game/shared/shareddefs.h
+++ b/r5dev/game/shared/shareddefs.h
@@ -14,7 +14,7 @@
 #ifndef CLIENT_DLL
 #include "game/server/gameinterface.h"
 
-#define TICK_INTERVAL			((*g_pGlobals)->m_nTickInterval)
+#define TICK_INTERVAL			((*g_pGlobals)->m_flTickInterval)
 
 #define TIME_TO_TICKS( dt )		( (int)( 0.5f + (float)(dt) / TICK_INTERVAL ) )
 #define TICKS_TO_TIME( t )		( TICK_INTERVAL *( t ) )
diff --git a/r5dev/game/shared/util_shared.cpp b/r5dev/game/shared/util_shared.cpp
index 07c6489e..e3b84806 100644
--- a/r5dev/game/shared/util_shared.cpp
+++ b/r5dev/game/shared/util_shared.cpp
@@ -18,7 +18,7 @@ CPlayer* UTIL_PlayerByIndex(int nIndex)
 		return nullptr;
 
 	// !TODO: Improve this!!!
-	CPlayer* pPlayer = reinterpret_cast<CPlayer*>((*g_pGlobals)->m_pInterlock[nIndex + 0x7808]);
+	CPlayer* pPlayer = reinterpret_cast<CPlayer*>((*g_pGlobals)->m_pEdicts[nIndex + 0x7808]);
 	return pPlayer;
 }
 #endif // CLIENT_DLL
diff --git a/r5dev/public/edict.h b/r5dev/public/edict.h
index 33219125..8e531a0d 100644
--- a/r5dev/public/edict.h
+++ b/r5dev/public/edict.h
@@ -33,7 +33,7 @@ public:
 	MapLoadType_t   m_eLoadType;      // How the current map was loaded.
 	bool            m_bMapLoadFailed; // Map has failed to load, we need to kick back to the main menu (unused?).
 
-	int64_t*        m_pInterlock;     // r5apex_ds.exe 'CBaseServer::Clear() + 0x7E'
+	int64_t*        m_pEdicts;        // r5apex_ds.exe 'CBaseServer::Clear() + 0x7E'
 	void*           m_pUnk1;          // r5apex_ds.exe 'CBaseServer::Clear() + 0x93'
 	void*           m_pUnk2;          // r5apex_ds.exe 'CServer::FrameJob()  + 0x20'
 	void*           m_pUnk3;
diff --git a/r5dev/public/globalvars_base.h b/r5dev/public/globalvars_base.h
index 274bb8c6..664ef0b3 100644
--- a/r5dev/public/globalvars_base.h
+++ b/r5dev/public/globalvars_base.h
@@ -36,7 +36,7 @@ public:
 	int m_nMaxClients;   // Max players as specified in the playlists file.
 	GameMode_t m_nGameMode; // 1 (MP) 2 (PVE) 3 (SP)
 	int m_nTickCount;    // Simulation ticks - resets on restart.
-	int m_flTickInterfal;
+	int m_flTickInterval;
 
 	int m_nUnk1;
 	int m_nUnk2;