diff --git a/data/json/obsolete_terrains.json b/data/json/obsolete_terrains.json
index 9f500f559f41f..ff08cf793d1f9 100644
--- a/data/json/obsolete_terrains.json
+++ b/data/json/obsolete_terrains.json
@@ -274,6 +274,22 @@
       "haz_sar",
       "haz_sar_entrance_b1",
       "haz_sar_b1",
+      "haz_sar_entrance_north",
+      "haz_sar_north",
+      "haz_sar_entrance_b1_north",
+      "haz_sar_b1_north",
+      "haz_sar_entrance_east",
+      "haz_sar_east",
+      "haz_sar_entrance_b1_east",
+      "haz_sar_b1_east",
+      "haz_sar_entrance_south",
+      "haz_sar_south",
+      "haz_sar_entrance_b1_south",
+      "haz_sar_b1_south",
+      "haz_sar_entrance_west",
+      "haz_sar_west",
+      "haz_sar_entrance_b1_west",
+      "haz_sar_b1_west",
       "house_base_north",
       "house_base_south",
       "house_base_east",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
index 5bab968600498..2959f76bfd649 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
@@ -172,40 +172,6 @@
     "see_cost": 5,
     "flags": [ "RISK_HIGH" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance",
-    "name": "hazardous waste sarcophagus",
-    "sym": "X",
-    "color": "pink",
-    "see_cost": 5,
-    "flags": [ "RISK_HIGH" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar",
-    "name": "hazardous waste sarcophagus",
-    "sym": "X",
-    "color": "pink",
-    "see_cost": 5
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance_b1",
-    "name": "hazardous waste sarcophagus",
-    "sym": "X",
-    "color": "pink",
-    "see_cost": 5,
-    "flags": [ "RISK_HIGH" ]
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_b1",
-    "name": "hazardous waste sarcophagus",
-    "sym": "X",
-    "color": "pink",
-    "see_cost": 5
-  },
   {
     "type": "overmap_terrain",
     "id": "sewer",
diff --git a/data/mods/Graphical_Overmap/overmap_terrain.json b/data/mods/Graphical_Overmap/overmap_terrain.json
index bd7f583283041..3ab496e93534f 100644
--- a/data/mods/Graphical_Overmap/overmap_terrain.json
+++ b/data/mods/Graphical_Overmap/overmap_terrain.json
@@ -22865,34 +22865,6 @@
     "sym": "ó",
     "color": "light_green"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance",
-    "copy-from": "haz_sar_entrance",
-    "sym": "Õ",
-    "color": "green"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar",
-    "copy-from": "haz_sar",
-    "sym": "Õ",
-    "color": "green"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance_b1",
-    "copy-from": "haz_sar_entrance_b1",
-    "sym": "Õ",
-    "color": "green"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_b1",
-    "copy-from": "haz_sar_b1",
-    "sym": "Õ",
-    "color": "green"
-  },
   {
     "type": "overmap_terrain",
     "id": "pump_station_1",
diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json
index 11706a3080958..0ab94a4eeb173 100644
--- a/data/mods/alt_map_key/overmap_terrain.json
+++ b/data/mods/alt_map_key/overmap_terrain.json
@@ -1882,38 +1882,6 @@
     "sym": "t",
     "color": "pink"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance",
-    "copy-from": "haz_sar_entrance",
-    "name": "hazardous waste sarcophagus",
-    "sym": "H",
-    "color": "i_pink"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar",
-    "copy-from": "haz_sar",
-    "name": "hazardous waste sarcophagus",
-    "sym": "h",
-    "color": "i_pink"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_entrance_b1",
-    "copy-from": "haz_sar_entrance_b1",
-    "name": "hazardous waste sarcophagus",
-    "sym": "H",
-    "color": "i_pink"
-  },
-  {
-    "type": "overmap_terrain",
-    "id": "haz_sar_b1",
-    "copy-from": "haz_sar_b1",
-    "name": "hazardous waste sarcophagus",
-    "sym": "h",
-    "color": "i_pink"
-  },
   {
     "type": "overmap_terrain",
     "id": "cave",
diff --git a/src/savegame.cpp b/src/savegame.cpp
index 1853de65d491f..136722172e72e 100644
--- a/src/savegame.cpp
+++ b/src/savegame.cpp
@@ -706,7 +706,6 @@ void overmap::convert_terrain( const std::unordered_map<tripoint, std::string> &
                    old.compare( 0, 5, "cabin" ) == 0 ||
                    old.compare( 0, 5, "pond_" ) == 0 ||
                    old.compare( 0, 6, "bandit" ) == 0 ||
-                   old.compare( 0, 7, "haz_sar" ) == 0 || // remove after 0.E.
                    old.compare( 0, 7, "shelter" ) == 0 ||
                    old.compare( 0, 8, "campsite" ) == 0 ||
                    old.compare( 0, 9, "pwr_large" ) == 0 ||
@@ -786,6 +785,52 @@ void overmap::convert_terrain( const std::unordered_map<tripoint, std::string> &
             } else {
                 debugmsg( "Malformed Megastore" );
             }
+
+        } else if( old.compare( 0, 7, "haz_sar" ) == 0 ) {
+            if( old == "haz_sar_entrance" || old == "haz_sar_entrance_north" ) {
+                ter_set( pos, oter_id( "haz_sar_1_1_north" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_1_2_north" ) );
+                ter_set( pos + point_south, oter_id( "haz_sar_1_3_north" ) );
+                ter_set( pos + point_south_west, oter_id( "haz_sar_1_4_north" ) );
+            } else if( old == "haz_sar_entrance_south" ) {
+                ter_set( pos, oter_id( "haz_sar_1_1_south" ) );
+                ter_set( pos + point_north, oter_id( "haz_sar_1_2_south" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_1_3_south" ) );
+                ter_set( pos + point_north_west, oter_id( "haz_sar_1_4_south" ) );
+            } else if( old == "haz_sar_entrance_east" ) {
+                ter_set( pos, oter_id( "haz_sar_1_1_east" ) );
+                ter_set( pos + point_north, oter_id( "haz_sar_1_2_east" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_1_3_east" ) );
+                ter_set( pos + point_north_west, oter_id( "haz_sar_1_4_east" ) );
+            } else if( old == "haz_sar_entrance_west" ) {
+                ter_set( pos, oter_id( "haz_sar_1_1_west" ) );
+                ter_set( pos + point_south, oter_id( "haz_sar_1_2_west" ) );
+                ter_set( pos + point_east, oter_id( "haz_sar_1_3_west" ) );
+                ter_set( pos + point_south_east, oter_id( "haz_sar_1_4_west" ) );
+            }
+
+            if( old == "haz_sar_entrance_b1" || old == "haz_sar_entrance_b1_north" ) {
+                ter_set( pos, oter_id( "haz_sar_b_1_north" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_b_2_north" ) );
+                ter_set( pos + point_south, oter_id( "haz_sar_b_3_north" ) );
+                ter_set( pos + point_south_west, oter_id( "haz_sar_b_4_north" ) );
+            } else if( old == "haz_sar_entrance_b1_south" ) {
+                ter_set( pos, oter_id( "haz_sar_b_1_south" ) );
+                ter_set( pos + point_north, oter_id( "haz_sar_b_2_south" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_b_3_south" ) );
+                ter_set( pos + point_north_west, oter_id( "haz_sar_b_4_south" ) );
+            } else if( old == "haz_sar_entrance_b1_east" ) {
+                ter_set( pos, oter_id( "haz_sar_b_1_east" ) );
+                ter_set( pos + point_north, oter_id( "haz_sar_b_2_east" ) );
+                ter_set( pos + point_west, oter_id( "haz_sar_b_3_east" ) );
+                ter_set( pos + point_north_west, oter_id( "haz_sar_b_4_east" ) );
+            } else if( old == "haz_sar_entrance_b1_west" ) {
+                ter_set( pos, oter_id( "haz_sar_b_1_west" ) );
+                ter_set( pos + point_south, oter_id( "haz_sar_b_2_west" ) );
+                ter_set( pos + point_east, oter_id( "haz_sar_b_3_west" ) );
+                ter_set( pos + point_south_east, oter_id( "haz_sar_b_4_west" ) );
+            }
+
         } else if( old == "house_base_north" ) {
             ter_set( pos, oter_id( "house_north" ) );
         } else if( old == "house_base_south" ) {