diff --git a/Core/Generators/BotWeaponGenerator.cs b/Core/Generators/BotWeaponGenerator.cs
index 0a34195e..d88dec88 100644
--- a/Core/Generators/BotWeaponGenerator.cs
+++ b/Core/Generators/BotWeaponGenerator.cs
@@ -522,7 +522,7 @@ public class BotWeaponGenerator
         {
             var id = _hashUtil.Generate();
             _botGeneratorHelper.AddItemWithChildrenToEquipmentSlot(
-                new() { EquipmentSlots.SecuredContainer.ToString() },
+                new() { EquipmentSlots.SecuredContainer },
                 id,
                 ammoTemplate,
                 new()
diff --git a/Core/Generators/PlayerScavGenerator.cs b/Core/Generators/PlayerScavGenerator.cs
index 848d47cd..6d4f3b03 100644
--- a/Core/Generators/PlayerScavGenerator.cs
+++ b/Core/Generators/PlayerScavGenerator.cs
@@ -139,9 +139,9 @@ public class PlayerScavGenerator
 
         // Add additional items to player scav as loot
         AddAdditionalLootToPlayerScavContainers(playerScavKarmaSettings.LootItemsToAddChancePercent, scavData, [
-            "TacticalVest",
-            "Pockets",
-            "Backpack"
+            EquipmentSlots.TacticalVest,
+            EquipmentSlots.Pockets,
+            EquipmentSlots.Backpack
         ]);
 
         // Remove secure container
@@ -162,7 +162,7 @@ public class PlayerScavGenerator
     /// <param name="possibleItemsToAdd">dict of tpl + % chance to be added</param>
     /// <param name="scavData"></param>
     /// <param name="containersToAddTo">Possible slotIds to add loot to</param>
-    protected void AddAdditionalLootToPlayerScavContainers(Dictionary<string, double> possibleItemsToAdd, BotBase scavData, List<string> containersToAddTo)
+    protected void AddAdditionalLootToPlayerScavContainers(Dictionary<string, double> possibleItemsToAdd, BotBase scavData, List<EquipmentSlots> containersToAddTo)
     {
         foreach (var tpl in possibleItemsToAdd)
         {
diff --git a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
index 8e78f281..52234784 100644
--- a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
+++ b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
@@ -66,7 +66,7 @@ public class ExternalInventoryMagGen : InventoryMagGen, IInventoryMagGen
             );
 
             var fitsIntoInventory = _botGeneratorHelper.AddItemWithChildrenToEquipmentSlot(
-                [EquipmentSlots.TacticalVest.ToString(), EquipmentSlots.Pockets.ToString()],
+                [EquipmentSlots.TacticalVest, EquipmentSlots.Pockets],
                 magazineWithAmmo[0].Id,
                 magazineTpl,
                 magazineWithAmmo,
diff --git a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
index 8d756817..1045918c 100644
--- a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
+++ b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
@@ -37,7 +37,7 @@ public class UbglExternalMagGen : InventoryMagGen, IInventoryMagGen
             inventoryMagGen.GetAmmoTemplate().Id,
             (int)bulletCount,
             inventoryMagGen.GetPmcInventory(),
-            [EquipmentSlots.TacticalVest.ToString()]
+            [EquipmentSlots.TacticalVest]
         );
     }
 }
diff --git a/Core/Helpers/BotWeaponGeneratorHelper.cs b/Core/Helpers/BotWeaponGeneratorHelper.cs
index d9a81053..60c9b557 100644
--- a/Core/Helpers/BotWeaponGeneratorHelper.cs
+++ b/Core/Helpers/BotWeaponGeneratorHelper.cs
@@ -129,11 +129,11 @@ public class BotWeaponGeneratorHelper
         string ammoTpl,
         int cartridgeCount,
         BotBaseInventory inventory,
-        List<string> equipmentSlotsToAddTo
+        List<EquipmentSlots> equipmentSlotsToAddTo
     )
     {
         if (equipmentSlotsToAddTo is null)
-            equipmentSlotsToAddTo = [EquipmentSlots.TacticalVest.ToString(), EquipmentSlots.Pockets.ToString()];
+            equipmentSlotsToAddTo = [EquipmentSlots.TacticalVest, EquipmentSlots.Pockets];
         
         var ammoItems = _itemHelper.SplitStack(new () {
             Id = _hashUtil.Generate(),
diff --git a/Core/Models/Eft/Profile/SptProfile.cs b/Core/Models/Eft/Profile/SptProfile.cs
index c82cb010..2950bbdc 100644
--- a/Core/Models/Eft/Profile/SptProfile.cs
+++ b/Core/Models/Eft/Profile/SptProfile.cs
@@ -163,7 +163,7 @@ public class MagazineTemplateAmmoItem
 }
 
 /** Used by defaultEquipmentPresets.json */
-public class DefaultEquipmentPreset : UserBuild
+public class DefaultEquipmentPreset : EquipmentBuild
 {
     [JsonPropertyName("Items")]
     public List<Item>? Items { get; set; }
diff --git a/Core/Models/Spt/Templates/Templates.cs b/Core/Models/Spt/Templates/Templates.cs
index e27669c0..b22cc4f0 100644
--- a/Core/Models/Spt/Templates/Templates.cs
+++ b/Core/Models/Spt/Templates/Templates.cs
@@ -40,7 +40,7 @@ public class Templates
 
     /** Default equipment loadouts that show on main inventory screen */
     [JsonPropertyName("defaultEquipmentPresets")]
-    public List<EquipmentBuild>? DefaultEquipmentPresets { get; set; }
+    public List<DefaultEquipmentPreset>? DefaultEquipmentPresets { get; set; }
 
     /** Achievements */
     [JsonPropertyName("achievements")]
@@ -49,4 +49,4 @@ public class Templates
     /** Location services data */
     [JsonPropertyName("locationServices")]
     public LocationServices? LocationServices { get; set; }
-}
\ No newline at end of file
+}