diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index 5258ab96d5..80de812a73 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -138,8 +138,8 @@ namespace Content.MapRenderer.Painters
 
         private (float x, float y) TransformLocalPosition(Vector2 position, IMapGrid grid)
         {
-            var xOffset = (int) Math.Abs(grid.LocalBounds.Left);
-            var yOffset = (int) Math.Abs(grid.LocalBounds.Bottom);
+            var xOffset = (int) Math.Abs(grid.LocalAABB.Left);
+            var yOffset = (int) Math.Abs(grid.LocalAABB.Bottom);
             var tileSize = grid.TileSize;
 
             var x = ((float) Math.Floor(position.X) + xOffset) * tileSize * TilePainter.TileImageSize;
diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs
index 2909369f8d..d59a4958d3 100644
--- a/Content.MapRenderer/Painters/MapPainter.cs
+++ b/Content.MapRenderer/Painters/MapPainter.cs
@@ -114,7 +114,7 @@ namespace Content.MapRenderer.Painters
                 var tileXSize = grid.TileSize * TilePainter.TileImageSize;
                 var tileYSize = grid.TileSize * TilePainter.TileImageSize;
 
-                var bounds = grid.LocalBounds;
+                var bounds = grid.LocalAABB;
 
                 var left = bounds.Left;
                 var right = bounds.Right;
diff --git a/Content.MapRenderer/Painters/TilePainter.cs b/Content.MapRenderer/Painters/TilePainter.cs
index 19acd467fa..c35a499ca2 100644
--- a/Content.MapRenderer/Painters/TilePainter.cs
+++ b/Content.MapRenderer/Painters/TilePainter.cs
@@ -31,7 +31,7 @@ namespace Content.MapRenderer.Painters
             var stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            var bounds = grid.LocalBounds;
+            var bounds = grid.LocalAABB;
             var xOffset = Math.Abs(bounds.Left);
             var yOffset = Math.Abs(bounds.Bottom);
             var tileSize = grid.TileSize * TileImageSize;
diff --git a/Content.Server/StationEvents/Events/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs
index 2fc566ff91..a89a6ce851 100644
--- a/Content.Server/StationEvents/Events/RadiationStorm.cs
+++ b/Content.Server/StationEvents/Events/RadiationStorm.cs
@@ -118,7 +118,7 @@ namespace Content.Server.StationEvents.Events
                 return false;
             }
 
-            var bounds = mapGrid.LocalBounds;
+            var bounds = mapGrid.LocalAABB;
             var randomX = _robustRandom.Next((int) bounds.Left, (int) bounds.Right);
             var randomY = _robustRandom.Next((int) bounds.Bottom, (int) bounds.Top);
 
diff --git a/Content.Server/StationEvents/Events/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs
index a7fa34dd83..bb93459883 100644
--- a/Content.Server/StationEvents/Events/StationEvent.cs
+++ b/Content.Server/StationEvents/Events/StationEvent.cs
@@ -208,7 +208,7 @@ namespace Content.Server.StationEvents.Events
 
             var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
             var found = false;
-            var gridBounds = grid.WorldBounds;
+            var gridBounds = grid.WorldAABB;
             var gridPos = grid.WorldPosition;
 
             for (var i = 0; i < 10; i++)