diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs
index 90e6e4161..5d928c2d4 100644
--- a/Projects/Server/Items/Item.cs
+++ b/Projects/Server/Items/Item.cs
@@ -2469,7 +2469,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
         var map = m_Map;
 
         return map == null
-            ? Map.NullEnumerable<IEntity>.Instance
+            ? PooledEnumeration.NullEnumerable<IEntity>.Instance
             : map.GetObjectsInRange(m_Parent == null ? m_Location : GetWorldLocation(), range);
     }
 
@@ -2478,7 +2478,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
         var map = m_Map;
 
         return map?.GetItemsInRange(m_Parent == null ? m_Location : GetWorldLocation(), range)
-               ?? Map.NullEnumerable<Item>.Instance;
+               ?? PooledEnumeration.NullEnumerable<Item>.Instance;
     }
 
     public IPooledEnumerable<Mobile> GetMobilesInRange(int range)
@@ -2486,7 +2486,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
         var map = m_Map;
 
         return map?.GetMobilesInRange(m_Parent == null ? m_Location : GetWorldLocation(), range)
-               ?? Map.NullEnumerable<Mobile>.Instance;
+               ?? PooledEnumeration.NullEnumerable<Mobile>.Instance;
     }
 
     public IPooledEnumerable<NetState> GetClientsInRange(int range)
@@ -2494,7 +2494,7 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
         var map = m_Map;
 
         return map.GetClientsInRange(m_Parent == null ? m_Location : GetWorldLocation(), range)
-               ?? Map.NullEnumerable<NetState>.Instance;
+               ?? PooledEnumeration.NullEnumerable<NetState>.Instance;
     }
 
     public bool GetTempFlag(int flag) => ((LookupCompactInfo()?.m_TempFlags ?? 0) & flag) != 0;
diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index 2f5700e04..5bc962481 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -8067,18 +8067,18 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
     public IPooledEnumerable<Item> GetItemsInRange(int range) => GetItemsInRange<Item>(range);
 
     public IPooledEnumerable<T> GetItemsInRange<T>(int range) where T : Item =>
-        m_Map?.GetItemsInRange<T>(m_Location, range) ?? Map.NullEnumerable<T>.Instance;
+        m_Map?.GetItemsInRange<T>(m_Location, range) ?? PooledEnumeration.NullEnumerable<T>.Instance;
 
     public IPooledEnumerable<IEntity> GetObjectsInRange(int range) =>
-        m_Map?.GetObjectsInRange(m_Location, range) ?? Map.NullEnumerable<IEntity>.Instance;
+        m_Map?.GetObjectsInRange(m_Location, range) ?? PooledEnumeration.NullEnumerable<IEntity>.Instance;
 
     public IPooledEnumerable<Mobile> GetMobilesInRange(int range) => GetMobilesInRange<Mobile>(range);
 
     public IPooledEnumerable<T> GetMobilesInRange<T>(int range) where T : Mobile =>
-        m_Map?.GetMobilesInRange<T>(m_Location, range) ?? Map.NullEnumerable<T>.Instance;
+        m_Map?.GetMobilesInRange<T>(m_Location, range) ?? PooledEnumeration.NullEnumerable<T>.Instance;
 
     public IPooledEnumerable<NetState> GetClientsInRange(int range) =>
-        m_Map?.GetClientsInRange(m_Location, range) ?? Map.NullEnumerable<NetState>.Instance;
+        m_Map?.GetClientsInRange(m_Location, range) ?? PooledEnumeration.NullEnumerable<NetState>.Instance;
 
     public void SayTo(Mobile to, bool ascii, string text) =>
         PrivateOverheadMessage(MessageType.Regular, SpeechHue, ascii, text, to.NetState);
diff --git a/Projects/Server/TileMatrix/TileMatrix.cs b/Projects/Server/TileMatrix/TileMatrix.cs
index f5036e8b1..e6d4c1e15 100644
--- a/Projects/Server/TileMatrix/TileMatrix.cs
+++ b/Projects/Server/TileMatrix/TileMatrix.cs
@@ -244,7 +244,7 @@ public class TileMatrix
         {
             var eable = _map.GetMultiTilesAt(x, y);
 
-            if (eable == Map.NullEnumerable<StaticTile[]>.Instance)
+            if (eable == PooledEnumeration.NullEnumerable<StaticTile[]>.Instance)
             {
                 return tiles[x & 0x7][y & 0x7];
             }
diff --git a/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs b/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
index 0e756a657..f33234a1b 100644
--- a/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
+++ b/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
@@ -118,7 +118,7 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
         public override bool Contains(int x, int y) => !_notContainedList.Any(e => e.X == x && e.Y == y);
 
         public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) =>
-            new(this, true, new Map.PooledEnumerable<IEntity>(_list));
+            new(this, true, new PooledEnumeration.PooledEnumerable<IEntity>(_list));
     }
 
     private class MockedMobile : Mobile