diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index ca1b604716..6cff665002 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -114,9 +114,8 @@ namespace Content.IntegrationTests.Tests.Damageable
 
             await server.WaitPost(() =>
             {
-                var mapId = sMapManager.NextMapId();
-                var coordinates = new MapCoordinates(0, 0, mapId);
-                sMapManager.CreateMap(mapId);
+                var map = sMapManager.CreateMap();
+                var coordinates = new MapCoordinates(0, 0, map);
 
                 sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates);
                 sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDamageableEntity);
diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index 7156ab6da4..12dde43968 100644
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -33,8 +33,7 @@ namespace Content.IntegrationTests.Tests
                 var dir = new ResourcePath(mapPath).Directory;
                 resManager.UserData.CreateDir(dir);
 
-                var nextMapId = mapManager.NextMapId();
-                var mapId = mapManager.CreateMap(nextMapId);
+                var mapId = mapManager.CreateMap();
 
                 {
                     var mapGrid = mapManager.CreateGrid(mapId);
@@ -51,7 +50,7 @@ namespace Content.IntegrationTests.Tests
 
                 mapLoader.SaveMap(mapId, mapPath);
 
-                mapManager.DeleteMap(nextMapId);
+                mapManager.DeleteMap(mapId);
             });
             await server.WaitIdleAsync();
 
diff --git a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
index 2e97064687..b00c58bf4e 100644
--- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Audio;
-using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
@@ -23,23 +22,14 @@ namespace Content.Shared.SubFloor
         {
             base.Initialize();
 
-            MapManager.GridChanged += MapManagerOnGridChanged;
-            MapManager.TileChanged += MapManagerOnTileChanged;
-
+            SubscribeLocalEvent<GridModifiedEvent>(OnGridChanged);
+            SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
             SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
             SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
             SubscribeLocalEvent<SubFloorHideComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
             SubscribeLocalEvent<SubFloorHideComponent, GettingInteractedWithAttemptEvent>(OnInteractionAttempt);
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            MapManager.GridChanged -= MapManagerOnGridChanged;
-            MapManager.TileChanged -= MapManagerOnTileChanged;
-        }
-
         private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, GettingInteractedWithAttemptEvent args)
         {
             // No interactions with entities hidden under floor tiles.
@@ -83,22 +73,22 @@ namespace Content.Shared.SubFloor
             }
         }
 
-        private void MapManagerOnTileChanged(object? sender, TileChangedEventArgs e)
+        private void OnTileChanged(TileChangedEvent args)
         {
-            if (e.OldTile.IsEmpty)
+            if (args.OldTile.IsEmpty)
                 return; // Nothing is anchored here anyways.
 
-            if (e.NewTile.Tile.IsEmpty)
+            if (args.NewTile.Tile.IsEmpty)
                 return; // Anything that was here will be unanchored anyways.
 
-            UpdateTile(MapManager.GetGrid(e.NewTile.GridIndex), e.NewTile.GridIndices);
+            UpdateTile(MapManager.GetGrid(args.NewTile.GridIndex), args.NewTile.GridIndices);
         }
 
-        private void MapManagerOnGridChanged(object? sender, GridChangedEventArgs e)
+        private void OnGridChanged(GridModifiedEvent args)
         {
-            foreach (var modified in e.Modified)
+            foreach (var modified in args.Modified)
             {
-                UpdateTile(e.Grid, modified.position);
+                UpdateTile(args.Grid, modified.position);
             }
         }