diff --git a/project/Aki.Core/Patches/TransportPrefixPatch.cs b/project/Aki.Core/Patches/TransportPrefixPatch.cs
index 16d63db..2d2355a 100644
--- a/project/Aki.Core/Patches/TransportPrefixPatch.cs
+++ b/project/Aki.Core/Patches/TransportPrefixPatch.cs
@@ -40,7 +40,7 @@ namespace Aki.Core.Patches
         }
 
         [PatchPrefix]
-        private static bool PatchPrefix(ref GStruct21 legacyParams)
+        private static bool PatchPrefix(ref LegacyParamsStruct legacyParams)
         {
             //Console.WriteLine($"Original url {legacyParams.Url}");
             legacyParams.Url = legacyParams.Url
diff --git a/project/Aki.Debugging/BTR/BTRManager.cs b/project/Aki.Debugging/BTR/BTRManager.cs
index eb11527..55fd8d9 100644
--- a/project/Aki.Debugging/BTR/BTRManager.cs
+++ b/project/Aki.Debugging/BTR/BTRManager.cs
@@ -1,14 +1,9 @@
-using Aki.Reflection.Utils;
-using Comfort.Common;
+using Comfort.Common;
 using EFT;
 using EFT.Vehicle;
 using HarmonyLib;
-using System;
 using System.Linq;
 using UnityEngine;
-using BTRController = GClass2911;
-using BTRDataPacket = GStruct378;
-using PlayerInteractPacket = GStruct167;
 
 namespace Aki.Debugging.BTR
 {
@@ -18,7 +13,7 @@ namespace Aki.Debugging.BTR
         private BotsController botsController;
 
         private BotBTRService btrBotService;
-        private BTRController btrController;
+        private BTRControllerClass btrController;
         private BTRVehicle btrServerSide;
         private BTRView btrClientSide;
         private BTRDataPacket btrDataPacket = default;
@@ -42,12 +37,12 @@ namespace Aki.Debugging.BTR
 
                 if (gameWorld.BtrController == null)
                 {
-                    if (!Singleton<BTRController>.Instantiated)
+                    if (!Singleton<BTRControllerClass>.Instantiated)
                     {
-                        Singleton<BTRController>.Create(new BTRController());
+                        Singleton<BTRControllerClass>.Create(new BTRControllerClass());
                     }
 
-                    gameWorld.BtrController = btrController = Singleton<BTRController>.Instance;
+                    gameWorld.BtrController = btrController = Singleton<BTRControllerClass>.Instance;
                 }
 
                 botsController = Singleton<IBotGame>.Instance.BotsController;
diff --git a/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs
index 8da307a..534048e 100644
--- a/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs
+++ b/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs
@@ -14,7 +14,7 @@ namespace Aki.Debugging.BTR.Patches
     {
         protected override MethodBase GetTargetMethod()
         {
-            var targetType = typeof(GClass1854).GetNestedTypes(PatchConstants.PrivateFlags).Where(x => x.Name == "Class1469").First();
+            var targetType = typeof(GetActionsClass).GetNestedTypes(PatchConstants.PrivateFlags).Where(x => x.Name == "Class1469").First();
             return AccessTools.Method(targetType, "method_2");
         }
 
@@ -24,7 +24,7 @@ namespace Aki.Debugging.BTR.Patches
             var gameWorld = Singleton<GameWorld>.Instance;
             var player = gameWorld.MainPlayer;
 
-            var questController = (GClass3201)AccessTools.Field(player.GetType(), "_questController").GetValue(player);
+            var questController = (AbstractQuestControllerClass)AccessTools.Field(player.GetType(), "_questController").GetValue(player);
             var inventoryController = (InventoryControllerClass)AccessTools.Field(player.GetType(), "_inventoryController").GetValue(player);
 
             GClass3130 btrDialog = new GClass3130(player.Profile, Profile.TraderInfo.BTR_TRADER_ID, questController, inventoryController, null);
diff --git a/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs b/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs
index e276875..c49cd24 100644
--- a/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs
+++ b/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs
@@ -1,7 +1,6 @@
 using Aki.Reflection.Patching;
 using Comfort.Common;
 using EFT;
-using EFT.Vehicle;
 using HarmonyLib;
 using System.Reflection;
 
diff --git a/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs b/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs
index 69afa44..5948e87 100644
--- a/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs
+++ b/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs
@@ -16,7 +16,7 @@ namespace Aki.Debugging.BTR.Patches
         {
             _statusProperty = AccessTools.Property(typeof(AbstractGame), "Status");
 
-            return AccessTools.Method(typeof(GClass2911), "method_1");
+            return AccessTools.Method(typeof(BTRControllerClass), "method_1");
         }
 
         [PatchPrefix]
diff --git a/project/Aki.SinglePlayer/Patches/Progression/MidRaidAchievementChangePatch.cs b/project/Aki.SinglePlayer/Patches/Progression/MidRaidAchievementChangePatch.cs
index d77fc34..27914b3 100644
--- a/project/Aki.SinglePlayer/Patches/Progression/MidRaidAchievementChangePatch.cs
+++ b/project/Aki.SinglePlayer/Patches/Progression/MidRaidAchievementChangePatch.cs
@@ -1,6 +1,5 @@
 using System.Reflection;
 using Aki.Reflection.Patching;
-using AchievementsController = GClass3207;
 
 namespace Aki.SinglePlayer.Patches.Progression
 {
@@ -12,7 +11,7 @@ namespace Aki.SinglePlayer.Patches.Progression
 	{
 		protected override MethodBase GetTargetMethod()
 		{
-			return typeof(AchievementsController).GetConstructors()[0];
+			return typeof(AchievementControllerClass).GetConstructors()[0];
 		}
 
 		[PatchPrefix]
diff --git a/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs b/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs
index bc5fbaf..8fd1f6d 100644
--- a/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs
+++ b/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs
@@ -30,7 +30,7 @@ namespace Aki.SinglePlayer.Patches.Progression
                 
             var player = gameWorld.MainPlayer;
 
-            var questController = Traverse.Create(player).Field<GClass3201>("_questController").Value;
+            var questController = Traverse.Create(player).Field<AbstractQuestControllerClass>("_questController").Value;
             if (questController != null)
             {
                 foreach (var quest in questController.Quests.ToList())
diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll
index 0c591d5..344e509 100644
Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ