diff --git a/r5dev/ebisusdk/EbisuSDK.cpp b/r5dev/ebisusdk/EbisuSDK.cpp
index 5c4e36cb..edd474b7 100644
--- a/r5dev/ebisusdk/EbisuSDK.cpp
+++ b/r5dev/ebisusdk/EbisuSDK.cpp
@@ -12,7 +12,7 @@ bool IsOriginInitialized()
 		&& (*g_NucleusID)
 		&& (*g_bEbisuSDKCvarInitialized)))
 	//	&& (*g_OriginAuthCode)
-	//		&& (g_OriginNucleusToken[0])))
+	//		&& (g_NucleusToken[0])))
 #endif // DEDICATED
 	{
 		return true;
diff --git a/r5dev/ebisusdk/EbisuSDK.h b/r5dev/ebisusdk/EbisuSDK.h
index 3135ebc4..29f34607 100644
--- a/r5dev/ebisusdk/EbisuSDK.h
+++ b/r5dev/ebisusdk/EbisuSDK.h
@@ -13,9 +13,9 @@ inline CMemory p_EbisuSDK_SetState;
 inline auto EbisuSDK_SetState = p_EbisuSDK_SetState.RCast<void(*)(void)>();
 
 inline uint64_t* g_NucleusID = nullptr;
-inline int* g_OriginErrorLevel = nullptr;
+inline char* g_NucleusToken = nullptr; /*SIZE = 1024*/
 inline char* g_OriginAuthCode = nullptr; /*SIZE = 256*/
-inline char* g_OriginNucleusToken = nullptr; /*SIZE = 1024*/
+inline int* g_OriginErrorLevel = nullptr;
 inline bool* g_bEbisuSDKInitialized = nullptr;
 inline bool* g_bEbisuSDKCvarInitialized = nullptr;
 //#endif // DEDICATED
@@ -37,9 +37,9 @@ class VEbisuSDK : public IDetour
 		LogFunAdr("EbisuSDK_CVar_Init", p_EbisuSDK_CVar_Init.GetPtr());
 		LogFunAdr("EbisuSDK_SetState", p_EbisuSDK_SetState.GetPtr());
 		LogVarAdr("g_NucleusID", reinterpret_cast<uintptr_t>(g_NucleusID));
+		LogVarAdr("g_NucleusToken", reinterpret_cast<uintptr_t>(g_NucleusToken));
 		LogVarAdr("g_OriginErrorLevel", reinterpret_cast<uintptr_t>(g_OriginErrorLevel));
 		LogVarAdr("g_OriginAuthCode", reinterpret_cast<uintptr_t>(g_OriginAuthCode));
-		LogVarAdr("g_OriginNucleusToken", reinterpret_cast<uintptr_t>(g_OriginNucleusToken)); // TODO: rename to g_NucleusToken.
 		LogVarAdr("g_bEbisuSDKInitialized", reinterpret_cast<uintptr_t>(g_bEbisuSDKInitialized));
 		LogVarAdr("g_bEbisuSDKCvarInitialized", reinterpret_cast<uintptr_t>(g_bEbisuSDKCvarInitialized));
 	}
@@ -57,15 +57,15 @@ class VEbisuSDK : public IDetour
 	virtual void GetVar(void) const
 	{
 		g_NucleusID = p_EbisuSDK_CVar_Init.Offset(0x20).FindPatternSelf("4C 89 05", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).RCast<uint64_t*>();
+#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
+		g_NucleusToken = p_EbisuSDK_SetState.Offset(0x1EF).FindPatternSelf("38 1D", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x6).RCast<char*>(); // !TODO: TEST!
+#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
+		g_NucleusToken = p_EbisuSDK_SetState.Offset(0x1EF).FindPatternSelf("80 3D", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).RCast<char*>();
+#endif
+		g_OriginAuthCode = p_EbisuSDK_SetState.Offset(0x1BF).FindPatternSelf("0F B6", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).RCast<char*>();
 		g_OriginErrorLevel = p_EbisuSDK_SetState.Offset(0x20).FindPatternSelf("89 05", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x6).RCast<int*>();
 		g_bEbisuSDKInitialized = p_EbisuSDK_Tier0_Init.Offset(0x0).FindPatternSelf("80 3D", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).RCast<bool*>();
 		g_bEbisuSDKCvarInitialized = p_EbisuSDK_CVar_Init.Offset(0x12A).FindPatternSelf("C6 05", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).RCast<bool*>();
-#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
-		g_OriginNucleusToken = p_EbisuSDK_SetState.Offset(0x1EF).FindPatternSelf("38 1D", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x6).RCast<char*>(); // !TODO: TEST!
-#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
-		g_OriginNucleusToken = p_EbisuSDK_SetState.Offset(0x1EF).FindPatternSelf("80 3D", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).RCast<char*>();
-#endif
-		g_OriginAuthCode = p_EbisuSDK_SetState.Offset(0x1BF).FindPatternSelf("0F B6", CMemory::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).RCast<char*>();
 	}
 	virtual void GetCon(void) const { }
 	virtual void Attach(void) const { }