diff --git a/project/Aki.Custom/BTR/BTRManager.cs b/project/Aki.Custom/BTR/BTRManager.cs
index 8930d5b..36a7d80 100644
--- a/project/Aki.Custom/BTR/BTRManager.cs
+++ b/project/Aki.Custom/BTR/BTRManager.cs
@@ -13,7 +13,6 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using Random = UnityEngine.Random;
-using BotEventHandler = GClass598;
 
 namespace Aki.Custom.BTR
 {
diff --git a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
index 2ec49d7..82727d2 100644
--- a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs
@@ -5,7 +5,6 @@ using EFT.GlobalEvents;
 using EFT.Vehicle;
 using HarmonyLib;
 using System.Reflection;
-using GlobalEventHandler = GClass2915;
 
 namespace Aki.Custom.BTR.Patches
 {
@@ -38,7 +37,7 @@ namespace Aki.Custom.BTR.Patches
             if (btrBot.BotsGroup.Enemies.ContainsKey(__instance))
             {
                 // Notify player they are blacklisted from entering BTR
-                GlobalEventHandler.CreateEvent<BtrNotificationInteractionMessageEvent>().Invoke(__instance.Id, EBtrInteractionStatus.Blacklisted);
+                GlobalEventHandlerClass.CreateEvent<BtrNotificationInteractionMessageEvent>().Invoke(__instance.Id, EBtrInteractionStatus.Blacklisted);
                 return;
             }
 
diff --git a/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
index 9be74ff..427a064 100644
--- a/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
+++ b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs
@@ -4,7 +4,6 @@ using EFT;
 using EFT.Vehicle;
 using HarmonyLib;
 using System.Reflection;
-using BotEventHandler = GClass598;
 
 namespace Aki.Custom.BTR.Patches
 {
diff --git a/project/Aki.Custom/Patches/CultistAmuletRemovalPatch.cs b/project/Aki.Custom/Patches/CultistAmuletRemovalPatch.cs
index 7aa18f3..2d6db64 100644
--- a/project/Aki.Custom/Patches/CultistAmuletRemovalPatch.cs
+++ b/project/Aki.Custom/Patches/CultistAmuletRemovalPatch.cs
@@ -17,7 +17,7 @@ namespace Aki.Custom.Patches
 		//Update GClass ref and Possibly name GClass
 		protected override MethodBase GetTargetMethod()
 		{
-			return AccessTools.Method(typeof(GClass456), nameof(GClass456.method_4));
+			return AccessTools.Method(typeof(CultistEventsClass), nameof(CultistEventsClass.method_4));
 		}
 
 		[PatchPostfix]
diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
index 3317782..ddbcb16 100644
--- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
+++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs
@@ -29,7 +29,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode
             _ = nameof(TimeAndWeatherSettings.IsRandomWeather);
             _ = nameof(BotControllerSettings.IsScavWars);
             _ = nameof(WavesSettings.IsBosses);
-            _ = GClass3172.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!!
+            _ = MatchmakerPlayerControllerClass.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!!
 
             // `MatchmakerInsuranceScreen` OnShowNextScreen
             _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuController), nameof(MainMenuController.method_43));
@@ -116,7 +116,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode
 
             // Get fields from MainMenuController.cs
             var raidSettings = Traverse.Create(menuController).Field("raidSettings_0").GetValue<RaidSettings>();
-            var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(GClass3172).ToLowerInvariant()}_0").GetValue<GClass3172>();
+            var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(MatchmakerPlayerControllerClass).ToLowerInvariant()}_0").GetValue<MatchmakerPlayerControllerClass>();
 
             var gclass = new MatchmakerOfflineRaidScreen.GClass3160(profile?.Info, ref raidSettings, matchmakerPlayersController);
 
diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll
index 9a52f4a..5115773 100644
Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ