diff --git a/EXILED/Exiled.API/Enums/LockerType.cs b/EXILED/Exiled.API/Enums/LockerType.cs
index d960514ace..6b21f699c7 100644
--- a/EXILED/Exiled.API/Enums/LockerType.cs
+++ b/EXILED/Exiled.API/Enums/LockerType.cs
@@ -8,7 +8,7 @@
 namespace Exiled.API.Enums
 {
     /// <summary>
-    /// Unique identifier for different types of <see cref="Features.SupplyLocker"/>s.
+    /// Unique identifier for different types of <see cref="Features.Lockers.Locker"/>s.
     /// </summary>
     public enum LockerType
     {
diff --git a/EXILED/Exiled.API/Features/Lockers/Chamber.cs b/EXILED/Exiled.API/Features/Lockers/Chamber.cs
new file mode 100644
index 0000000000..c6bae8c8cb
--- /dev/null
+++ b/EXILED/Exiled.API/Features/Lockers/Chamber.cs
@@ -0,0 +1,173 @@
+// -----------------------------------------------------------------------
+// <copyright file="Chamber.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+namespace Exiled.API.Features.Lockers
+{
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Linq;
+
+    using Exiled.API.Enums;
+    using Exiled.API.Features.Pickups;
+    using Exiled.API.Interfaces;
+    using MapGeneration.Distributors;
+    using UnityEngine;
+
+    /// <summary>
+    /// A wrapper for <see cref="LockerChamber"/>.
+    /// </summary>
+    public class Chamber : IWrapper<LockerChamber>, IWorldSpace
+    {
+        /// <summary>
+        /// <see cref="Dictionary{TKey,TValue}"/> with <see cref="LockerChamber"/> and <see cref="Chamber"/>.
+        /// </summary>
+        internal static readonly Dictionary<LockerChamber, Chamber> Chambers = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Chamber"/> class.
+        /// </summary>
+        /// <param name="chamber"><see cref="LockerChamber"/> instance.</param>
+        /// <param name="locker"><see cref="Lockers.Locker"/> where this chamber is located.</param>
+        public Chamber(LockerChamber chamber, Locker locker)
+        {
+            Base = chamber;
+            Locker = locker;
+
+            Chambers.Add(chamber, this);
+        }
+
+        /// <summary>
+        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="Chamber"/> which contains all the <see cref="Chamber"/> instances.
+        /// </summary>
+        public static IReadOnlyCollection<Chamber> List => Chambers.Values;
+
+        /// <inheritdoc/>
+        public LockerChamber Base { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Lockers.Locker"/> where this chamber is located at.
+        /// </summary>
+        public Locker Locker { get; }
+
+        /// <inheritdoc/>
+        public Vector3 Position => Base.transform.position;
+
+        /// <inheritdoc/>
+        public Quaternion Rotation => Base.transform.rotation;
+
+        /// <summary>
+        /// Gets or sets all pickups that should be spawned when the door is initially opened.
+        /// </summary>
+        public IEnumerable<Pickup> ToBeSpawned
+        {
+            get => Base._toBeSpawned.Select(Pickup.Get);
+            set
+            {
+                Base._toBeSpawned.Clear();
+
+                foreach (Pickup pickup in value)
+                    Base._toBeSpawned.Add(pickup.Base);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets all spawn points.
+        /// </summary>
+        /// <remarks>
+        /// Used if <see cref="UseMultipleSpawnpoints"/> is set to <see langword="true"/>.
+        /// </remarks>
+        public IEnumerable<Transform> Spawnpoints
+        {
+            get => Base._spawnpoints;
+            set => Base._spawnpoints = value.ToArray();
+        }
+
+        /// <summary>
+        /// Gets or sets all the acceptable items which can be spawned in this chamber.
+        /// </summary>
+        public IEnumerable<ItemType> AcceptableTypes
+        {
+            get => Base.AcceptableItems;
+            set => Base.AcceptableItems = value.ToArray();
+        }
+
+        /// <summary>
+        /// Gets or sets required permissions to open this chamber.
+        /// </summary>
+        public KeycardPermissions RequiredPermissions
+        {
+            get => (KeycardPermissions)Base.RequiredPermissions;
+            set => Base.RequiredPermissions = (Interactables.Interobjects.DoorUtils.KeycardPermissions)value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether multiple spawn points  should be used.
+        /// </summary>
+        /// <remarks>
+        /// If <see langword="true"/>, <see cref="Spawnpoints"/> will be used over <see cref="Spawnpoint"/>.
+        /// </remarks>
+        public bool UseMultipleSpawnpoints
+        {
+            get => Base._useMultipleSpawnpoints;
+            set => Base._useMultipleSpawnpoints = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a spawn point for the items in the chamber.
+        /// </summary>
+        /// <remarks>
+        /// Used if <see cref="UseMultipleSpawnpoints"/> is set to <see langword="false"/>.
+        /// </remarks>
+        public Transform Spawnpoint
+        {
+            get => Base._spawnpoint;
+            set => Base._spawnpoint = value;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not items should be spawned as soon as they one chamber is opened.
+        /// </summary>
+        public bool InitiallySpawn
+        {
+            get => Base._spawnOnFirstChamberOpening;
+            set => Base._spawnOnFirstChamberOpening = value;
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of time before a player can interact with the chamber again.
+        /// </summary>
+        public float Cooldown
+        {
+            get => Base._targetCooldown;
+            set => Base._targetCooldown = value;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Stopwatch"/> of current cooldown.
+        /// </summary>
+        /// <remarks>Used in <see cref="CanInteract"/> check.</remarks>
+        public Stopwatch CurrentCooldown => Base._stopwatch;
+
+        /// <summary>
+        /// Gets a value indicating whether the chamber is interactable.
+        /// </summary>
+        public bool CanInteract => Base.CanInteract;
+
+        /// <summary>
+        /// Spawns a specified item from <see cref="AcceptableTypes"/>.
+        /// </summary>
+        /// <param name="type"><see cref="ItemType"/> from <see cref="AcceptableTypes"/>.</param>
+        /// <param name="amount">Amount of items that should be spawned.</param>
+        public void SpawnItem(ItemType type, int amount) => Base.SpawnItem(type, amount);
+
+        /// <summary>
+        /// Gets the chamber by its <see cref="LockerChamber"/>.
+        /// </summary>
+        /// <param name="chamber"><see cref="LockerChamber"/>.</param>
+        /// <returns><see cref="Chamber"/>.</returns>
+        internal static Chamber Get(LockerChamber chamber) => Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
+    }
+}
diff --git a/EXILED/Exiled.API/Features/SupplyLocker.cs b/EXILED/Exiled.API/Features/Lockers/Locker.cs
similarity index 50%
rename from EXILED/Exiled.API/Features/SupplyLocker.cs
rename to EXILED/Exiled.API/Features/Lockers/Locker.cs
index b3bdd538ad..15fb2ccaec 100644
--- a/EXILED/Exiled.API/Features/SupplyLocker.cs
+++ b/EXILED/Exiled.API/Features/Lockers/Locker.cs
@@ -1,79 +1,78 @@
 // -----------------------------------------------------------------------
-// <copyright file="SupplyLocker.cs" company="Exiled Team">
+// <copyright file="Locker.cs" company="Exiled Team">
 // Copyright (c) Exiled Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
 // </copyright>
 // -----------------------------------------------------------------------
-namespace Exiled.API.Features
+namespace Exiled.API.Features.Lockers
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
 
     using Exiled.API.Enums;
     using Exiled.API.Extensions;
+    using Exiled.API.Features;
+    using Exiled.API.Features.Pickups;
     using Exiled.API.Interfaces;
+
     using InventorySystem.Items.Pickups;
     using MapGeneration.Distributors;
+
     using Mirror;
-    using PluginAPI.Core.Items;
     using UnityEngine;
 
+    using BaseLocker = MapGeneration.Distributors.Locker;
 #nullable enable
     /// <summary>
-    /// The in-game SupplyLocker.
+    /// The in-game Locker.
     /// </summary>
-    public class SupplyLocker : IWrapper<Locker>, IWorldSpace
+    public class Locker : IWrapper<BaseLocker>, IWorldSpace
     {
         /// <summary>
-        /// A <see cref="Dictionary{TKey,TValue}"/> containing all known <see cref="Locker"/>s and their corresponding <see cref="SupplyLocker"/>.
+        /// A <see cref="Dictionary{TKey,TValue}"/> containing all known <see cref="BaseLocker"/>s and their corresponding <see cref="Locker"/>.
         /// </summary>
-        internal static readonly Dictionary<Locker, SupplyLocker> LockerToSupplyLocker = new(250, new ComponentsEqualityComparer());
+        internal static readonly Dictionary<BaseLocker, Locker> BaseToExiledLockers = new();
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SupplyLocker"/> class.
+        /// Initializes a new instance of the <see cref="Locker"/> class.
         /// </summary>
-        /// <param name="locker">The encapsulated <see cref="Locker"/>.</param>
-        internal SupplyLocker(Locker locker)
+        /// <param name="locker">The encapsulated <see cref="BaseLocker"/>.</param>
+        public Locker(BaseLocker locker)
         {
             Base = locker;
-            LockerToSupplyLocker.Add(locker, this);
+            BaseToExiledLockers.Add(locker, this);
+
+            Chambers = locker.Chambers.Select(x => new Chamber(x, this)).ToList();
             Type = locker.GetLockerType();
         }
 
         /// <summary>
-        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="SupplyLocker"/> which contains all the <see cref="SupplyLocker"/> instances.
+        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="Locker"/> which contains all the <see cref="Locker"/> instances.
         /// </summary>
-        public static IReadOnlyCollection<SupplyLocker> List => LockerToSupplyLocker.Values;
+        public static IReadOnlyCollection<Locker> List => BaseToExiledLockers.Values;
 
-        /// <summary>
-        /// Gets the <see cref="Locker"/> instance of the supply locker.
-        /// </summary>
-        public Locker Base { get; }
+        /// <inheritdoc/>
+        public BaseLocker Base { get; }
 
         /// <summary>
-        /// Gets the <see cref="LockerType"/> of the <see cref="SupplyLocker"/>.
+        /// Gets the <see cref="LockerType"/> of the <see cref="Locker"/>.
         /// </summary>
         public LockerType Type { get; }
 
         /// <summary>
-        /// Gets the <see cref="SupplyLocker"/> <see cref="UnityEngine.Transform"/>.
+        /// Gets the <see cref="Locker"/> <see cref="UnityEngine.Transform"/>.
         /// </summary>
         public Transform Transform => Base.transform;
 
-        /// <summary>
-        /// Gets the <see cref="SupplyLocker"/> position.
-        /// </summary>
+        /// <inheritdoc/>
         public Vector3 Position => Base.transform.position;
 
-        /// <summary>
-        /// Gets the <see cref="SupplyLocker"/> rotation.
-        /// </summary>
+        /// <inheritdoc/>
         public Quaternion Rotation => Base.transform.rotation;
 
         /// <summary>
-        /// Gets the <see cref="Features.Room"/> in which the <see cref="SupplyLocker"/> is located.
+        /// Gets the <see cref="Features.Room"/> in which the <see cref="Locker"/> is located.
         /// </summary>
         public Room? Room => Room.Get(Position);
 
@@ -83,14 +82,18 @@ internal SupplyLocker(Locker locker)
         public ZoneType Zone => Room?.Zone ?? ZoneType.Unspecified;
 
         /// <summary>
-        /// Gets the <see cref="LockerChamber"/>'s in this <see cref="SupplyLocker"/>.
+        /// Gets the all <see cref="Chambers"/> in this locker.
         /// </summary>
-        public IEnumerable<LockerChamber> Chambers => Base.Chambers;
+        public IReadOnlyCollection<Chamber> Chambers { get; }
 
         /// <summary>
-        /// Gets the <see cref="LockerChamber"/> who has been open.
+        /// Gets or sets an id for manipulating opened chambers.
         /// </summary>
-        public IEnumerable<LockerChamber> OpenedChambers => Chambers.Where(c => c.IsOpen).ToArray();
+        public ushort OpenedChambers
+        {
+            get => Base.OpenedChambers;
+            set => Base.NetworkOpenedChambers = value;
+        }
 
         /// <summary>
         /// Gets a random position from one of the <see cref="Chambers"/>.
@@ -99,51 +102,51 @@ public Vector3 RandomChamberPosition
         {
             get
             {
-                LockerChamber randomChamber = Chambers.GetRandomValue();
+                Chamber randomChamber = Chambers.GetRandomValue();
 
                 // Determine if the chamber uses multiple spawn points and has at least one available spawn point.
-                if (randomChamber._useMultipleSpawnpoints && randomChamber._spawnpoints.Length > 0)
+                if (randomChamber.UseMultipleSpawnpoints && randomChamber.Spawnpoints.Count() > 0)
                 {
                     // Return the position of a random spawn point within the chamber.
-                    return randomChamber._spawnpoints.RandomItem().position;
+                    return randomChamber.Spawnpoints.GetRandomValue().position;
                 }
 
                 // Return the position of the main spawn point for the chamber.
-                return randomChamber._spawnpoint.position;
+                return randomChamber.Spawnpoint.position;
             }
         }
 
         /// <summary>
-        /// Gets the <see cref="SupplyLocker"/> belonging to the <see cref="Locker"/>, if any.
+        /// Gets the <see cref="Locker"/> belonging to the <see cref="BaseLocker"/>, if any.
         /// </summary>
-        /// <param name="locker">The <see cref="Locker"/> to get.</param>
-        /// <returns>A <see cref="SupplyLocker"/> or <see langword="null"/> if not found.</returns>
-        public static SupplyLocker? Get(Locker locker) => locker == null ? null :
-            LockerToSupplyLocker.TryGetValue(locker, out SupplyLocker supply) ? supply : new SupplyLocker(locker);
+        /// <param name="locker">The <see cref="BaseLocker"/> to get.</param>
+        /// <returns>A <see cref="Locker"/> or <see langword="null"/> if not found.</returns>
+        public static Locker? Get(BaseLocker locker) => locker == null ? null :
+            BaseToExiledLockers.TryGetValue(locker, out Locker supply) ? supply : new Locker(locker);
 
         /// <summary>
-        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="SupplyLocker"/> given the specified <see cref="ZoneType"/>.
+        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="Locker"/> given the specified <see cref="ZoneType"/>.
         /// </summary>
         /// <param name="zoneType">The <see cref="ZoneType"/> to search for.</param>
-        /// <returns>The <see cref="SupplyLocker"/> with the given <see cref="ZoneType"/> or <see langword="null"/> if not found.</returns>
-        public static IEnumerable<SupplyLocker> Get(ZoneType zoneType) => Get(room => room.Zone.HasFlag(zoneType));
+        /// <returns>The <see cref="Locker"/> with the given <see cref="ZoneType"/> or <see langword="null"/> if not found.</returns>
+        public static IEnumerable<Locker> Get(ZoneType zoneType) => Get(room => room.Zone.HasFlag(zoneType));
 
         /// <summary>
-        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="SupplyLocker"/> filtered based on a predicate.
+        /// Gets a <see cref="IEnumerable{T}"/> of <see cref="Locker"/> filtered based on a predicate.
         /// </summary>
         /// <param name="predicate">The condition to satify.</param>
-        /// <returns>A <see cref="IEnumerable{T}"/> of <see cref="SupplyLocker"/> which contains elements that satify the condition.</returns>
-        public static IEnumerable<SupplyLocker> Get(Func<SupplyLocker, bool> predicate) => List.Where(predicate);
+        /// <returns>A <see cref="IEnumerable{T}"/> of <see cref="Locker"/> which contains elements that satify the condition.</returns>
+        public static IEnumerable<Locker> Get(Func<Locker, bool> predicate) => List.Where(predicate);
 
         /// <summary>
-        /// Gets a random <see cref="SupplyLocker"/> based on the specified filters.
+        /// Gets a random <see cref="Locker"/> based on the specified filters.
         /// </summary>
         /// <param name="zone">The <see cref="ZoneType"/> to filter by. If unspecified, all zones are considered.</param>
         /// <param name="lockerType">The <see cref="LockerType"/> to filter by. If unspecified, all locker types are considered.</param>
-        /// <returns>A random <see cref="SupplyLocker"/> object, or null if no matching locker is found.</returns>
-        public static SupplyLocker? Random(ZoneType zone = ZoneType.Unspecified, LockerType lockerType = LockerType.Unknow)
+        /// <returns>A random <see cref="Locker"/> object, or null if no matching locker is found.</returns>
+        public static Locker? Random(ZoneType zone = ZoneType.Unspecified, LockerType lockerType = LockerType.Unknow)
         {
-            IEnumerable<SupplyLocker> filteredLockers = List;
+            IEnumerable<Locker> filteredLockers = List;
 
             if (lockerType != LockerType.Unknow)
                 filteredLockers = filteredLockers.Where(l => l.Type == lockerType);
@@ -157,19 +160,19 @@ public Vector3 RandomChamberPosition
         /// <summary>
         /// Adds an item to a randomly selected locker chamber.
         /// </summary>
-        /// <param name="item">The <see cref="ItemPickup"/> to be added to the locker chamber.</param>
-        public void AddItem(ItemPickup item)
+        /// <param name="item">The <see cref="Pickup"/> to be added to the locker chamber.</param>
+        public void AddItem(Pickup item)
         {
             // Select a random chamber from the available locker chambers.
-            LockerChamber chamber = Chambers.GetRandomValue();
+            Chamber chamber = Chambers.GetRandomValue();
 
             // Determine the parent transform where the item will be placed.
-            Transform parentTransform = chamber._useMultipleSpawnpoints && chamber._spawnpoints.Length > 0
-                ? chamber._spawnpoints.RandomItem()
-                : chamber._spawnpoint;
+            Transform parentTransform = chamber.UseMultipleSpawnpoints && chamber.Spawnpoints.Count() > 0
+                ? chamber.Spawnpoints.GetRandomValue()
+                : chamber.Spawnpoint;
 
             // If the chamber is open, immediately set the item's parent and spawn it.
-            if (chamber.IsOpen)
+            if (chamber.Base.IsOpen)
             {
                 item.Transform.SetParent(parentTransform);
                 item.Spawn();
@@ -177,7 +180,7 @@ public void AddItem(ItemPickup item)
             else
             {
                 // If the item is already spawned on the network, unspawn it before proceeding.
-                if (NetworkServer.spawned.ContainsKey(item.OriginalObject.netId))
+                if (NetworkServer.spawned.ContainsKey(item.Base.netId))
                     NetworkServer.UnSpawn(item.GameObject);
 
                 // Set the item's parent transform.
@@ -187,7 +190,7 @@ public void AddItem(ItemPickup item)
                 item.IsLocked = true;
 
                 // Notify any pickup distributor triggers.
-                (item.OriginalObject as IPickupDistributorTrigger)?.OnDistributed();
+                (item.Base as IPickupDistributorTrigger)?.OnDistributed();
 
                 // If the item has a Rigidbody component, make it kinematic and reset its position and rotation.
                 if (item.Rigidbody != null)
@@ -202,36 +205,25 @@ public void AddItem(ItemPickup item)
 
                 // If the chamber is configured to spawn items on the first opening, add the item to the list of items to be spawned.
                 // Otherwise, spawn the item immediately.
-                if (chamber._spawnOnFirstChamberOpening)
-                    chamber._toBeSpawned.Add(item.OriginalObject);
+                if (chamber.InitiallySpawn)
+                    chamber.Base._toBeSpawned.Add(item.Base);
                 else
-                    ItemDistributor.SpawnPickup(item.OriginalObject);
+                    ItemDistributor.SpawnPickup(item.Base);
             }
         }
 
         /// <summary>
-        /// Spawns an item of the specified <see cref="ItemType"/> to the locker by creating a new <see cref="ItemPickup"/>.
+        /// Spawns an item of the specified <see cref="ItemType"/> to the locker by creating a new <see cref="Pickup"/>.
         /// </summary>
         /// <param name="type">The type of item to be added.</param>
-        public void AddItem(ItemType type) => AddItem(ItemPickup.Create(type, default, default));
+        public void AddItem(ItemType type) => AddItem(Pickup.Create(type));
 
         /// <summary>
-        /// Clears the cached lockers in the <see cref="LockerToSupplyLocker"/> dictionary that have become invalid.
-        /// This method identifies and removes all entries where either the key (a <see cref="Locker"/> instance)
-        /// or the value (a <see cref="SupplyLocker"/> instance) is null, ensuring that only valid references
-        /// are kept in the cache.
+        /// Clears the cached lockers in the <see cref="BaseToExiledLockers"/> dictionary.
         /// </summary>
         internal static void ClearCache()
         {
-            List<Locker> keysToRemove = LockerToSupplyLocker
-                .Where(kv => kv.Key == null || kv.Value == null)
-                .Select(kv => kv.Key)
-                .ToList();
-
-            foreach (Locker key in keysToRemove)
-            {
-                LockerToSupplyLocker.Remove(key);
-            }
+            BaseToExiledLockers.Clear();
         }
     }
 }
diff --git a/EXILED/Exiled.API/Features/Map.cs b/EXILED/Exiled.API/Features/Map.cs
index 05e5007a43..13d55fc987 100644
--- a/EXILED/Exiled.API/Features/Map.cs
+++ b/EXILED/Exiled.API/Features/Map.cs
@@ -16,6 +16,7 @@ namespace Exiled.API.Features
     using Enums;
     using Exiled.API.Extensions;
     using Exiled.API.Features.Hazards;
+    using Exiled.API.Features.Lockers;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Features.Toys;
     using global::Hazards;
@@ -79,9 +80,9 @@ DecontaminationController.Singleton.NetworkDecontaminationOverride is Decontamin
         public static ReadOnlyCollection<PocketDimensionTeleport> PocketDimensionTeleports { get; } = TeleportsValue.AsReadOnly();
 
         /// <summary>
-        /// Gets all <see cref="Locker"/> objects.
+        /// Gets all <see cref="MapGeneration.Distributors.Locker"/> objects.
         /// </summary>
-        public static ReadOnlyCollection<Locker> Lockers { get; } = SupplyLocker.LockerToSupplyLocker.Keys.ToList().AsReadOnly();
+        public static ReadOnlyCollection<MapGeneration.Distributors.Locker> Lockers { get; } = Features.Lockers.Locker.BaseToExiledLockers.Keys.ToList().AsReadOnly();
 
         /// <summary>
         /// Gets all <see cref="AdminToy"/> objects.
@@ -207,10 +208,10 @@ public static void ResetLightsColor()
         }
 
         /// <summary>
-        /// Gets a random <see cref="Locker"/>.
+        /// Gets a random <see cref="MapGeneration.Distributors.Locker"/>.
         /// </summary>
-        /// <returns><see cref="Locker"/> object.</returns>
-        public static Locker GetRandomLocker() => Lockers.GetRandomValue();
+        /// <returns><see cref="MapGeneration.Distributors.Locker"/> object.</returns>
+        public static MapGeneration.Distributors.Locker GetRandomLocker() => Lockers.GetRandomValue();
 
         /// <summary>
         /// Gets a random <see cref="Pickup"/>.
diff --git a/EXILED/Exiled.API/Features/Spawn/LockerSpawnPoint.cs b/EXILED/Exiled.API/Features/Spawn/LockerSpawnPoint.cs
index 84579e2272..ecc4341279 100644
--- a/EXILED/Exiled.API/Features/Spawn/LockerSpawnPoint.cs
+++ b/EXILED/Exiled.API/Features/Spawn/LockerSpawnPoint.cs
@@ -10,6 +10,7 @@ namespace Exiled.API.Features.Spawn
     using System.Linq;
 
     using Exiled.API.Enums;
+    using Exiled.API.Features.Lockers;
     using UnityEngine;
     using YamlDotNet.Serialization;
 
@@ -35,7 +36,7 @@ public class LockerSpawnPoint : SpawnPoint
         public Vector3 Offset { get; set; } = Vector3.zero;
 
         /// <summary>
-        /// Gets or sets the type of the <see cref="SupplyLocker"/>.
+        /// Gets or sets the type of the <see cref="Locker"/>.
         /// </summary>
         public LockerType Type { get; set; } = LockerType.Unknow;
 
@@ -56,7 +57,7 @@ public override Vector3 Position
         {
             get
             {
-                SupplyLocker foundLocker = SupplyLocker.Random(Zone, Type) ?? throw new NullReferenceException("No locker found in the specified zone.");
+                Locker foundLocker = Locker.Random(Zone, Type) ?? throw new NullReferenceException("No locker found in the specified zone.");
 
                 // If UseChamber is true, use a random chamber's position.
                 if (UseChamber)
diff --git a/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs b/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs
index 1bbcc5ddb4..30ad47c9f0 100644
--- a/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs
+++ b/EXILED/Exiled.Events/Handlers/Internal/MapGenerated.cs
@@ -18,7 +18,7 @@ namespace Exiled.Events.Handlers.Internal
 
     using Exiled.API.Enums;
     using Exiled.API.Extensions;
-
+    using Exiled.API.Features.Lockers;
     using InventorySystem.Items.Firearms.Attachments;
     using InventorySystem.Items.Firearms.Attachments.Components;
 
@@ -47,7 +47,7 @@ public static void OnMapGenerated()
         {
             Map.ClearCache();
             PrefabHelper.LoadPrefabs();
-            SupplyLocker.ClearCache();
+            Locker.ClearCache();
 
             // TODO: Fix For (https://git.scpslgame.com/northwood-qa/scpsl-bug-reporting/-/issues/377)
             PlayerRoles.RoleAssign.HumanSpawner.Handlers[PlayerRoles.Team.ChaosInsurgency] = new PlayerRoles.RoleAssign.OneRoleHumanSpawner(PlayerRoles.RoleTypeId.ChaosConscript);
diff --git a/EXILED/Exiled.Events/Patches/Generic/LockerList.cs b/EXILED/Exiled.Events/Patches/Generic/LockerList.cs
index a4491f5c39..7dadd8817a 100644
--- a/EXILED/Exiled.Events/Patches/Generic/LockerList.cs
+++ b/EXILED/Exiled.Events/Patches/Generic/LockerList.cs
@@ -12,7 +12,7 @@ namespace Exiled.Events.Patches.Generic
 
     using API.Features;
     using API.Features.Pools;
-
+    using Exiled.API.Features.Lockers;
     using HarmonyLib;
 
     using MapGeneration.Distributors;
@@ -20,22 +20,22 @@ namespace Exiled.Events.Patches.Generic
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="Locker.Start"/>.
+    /// Patches <see cref="MapGeneration.Distributors.Locker.Start"/>.
     /// </summary>
-    [HarmonyPatch(typeof(Locker), nameof(Locker.Start))]
+    [HarmonyPatch(typeof(MapGeneration.Distributors.Locker), nameof(MapGeneration.Distributors.Locker.Start))]
     internal class LockerList
     {
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> codeInstructions)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(codeInstructions);
 
-            // new SupplyLocker(this)
+            // new Locker(this)
             newInstructions.InsertRange(
                 0,
                 new CodeInstruction[]
                 {
                     new(OpCodes.Ldarg_0),
-                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(SupplyLocker))[0]),
+                    new(OpCodes.Newobj, GetDeclaredConstructors(typeof(API.Features.Lockers.Locker))[0]),
                     new(OpCodes.Pop),
                 });