diff --git a/DATA/EQUIPMENT/market_commodities.ini b/DATA/EQUIPMENT/market_commodities.ini
index d55c2f5f..4a4284a5 100644
--- a/DATA/EQUIPMENT/market_commodities.ini
+++ b/DATA/EQUIPMENT/market_commodities.ini
@@ -2553,7 +2553,7 @@ MarketGood = commodity_pharm, 0, -1, 0, 0, 1, 0.5263
 ; REM LINER
 
 [BaseGood]
-base = Hi02_REM_LINER
+base = Hi02_REM_LINER_Base
 MarketGood = commodity_slaves, 0, -1, 150, 500, 0, 1.000000
 MarketGood = commodity_prisoners, 0, -1, 0, 0, 1, 2.000000
 
diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini
index 0f762563..b4763403 100644
--- a/DATA/EQUIPMENT/market_misc.ini
+++ b/DATA/EQUIPMENT/market_misc.ini
@@ -11569,7 +11569,7 @@ MarketGood = nomad_torpedo01_player_ammo, 10, -1, 50, 50, 0, 1
 ; REM LINER
 
 [BaseGood]
-base = Hi02_REM_LINER
+base = Hi02_REM_LINER_Base
 MarketGood = ge_gf1_engine_01, 0, -1, 100, 100, 0, 1
 MarketGood = missile01_mark01_ammo, 1, -1, 50, 50, 0, 1
 MarketGood = missile01_mark02_ammo, 1, -1, 50, 50, 0, 1
diff --git a/DATA/EQUIPMENT/market_ships.ini b/DATA/EQUIPMENT/market_ships.ini
index 1bcc8580..1e97da9e 100644
--- a/DATA/EQUIPMENT/market_ships.ini
+++ b/DATA/EQUIPMENT/market_ships.ini
@@ -264,7 +264,7 @@ base = St02_01_base
 marketgood = oe_package, 16, -1, 1, 1, 0, 1, 1
 
 [BaseGood]
-base = Hi02_REM_LINER
+base = Hi02_REM_LINER_Base
 marketgood = package_bh_elite3, 1, -1, 1, 1, 0, 1, 1
 
 
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 68359aa7..d9a6abff 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -45150,7 +45150,7 @@ fixture = ew0602_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 ; REM LINER
 
 [MBase]
-nickname = Hi02_REM_LINER
+nickname = Hi02_REM_LINER_Base
 local_faction = REM_CLAN
 diff = 30
 [MVendor]
diff --git a/DATA/UNIVERSE/SYSTEMS/HI02/hi02.ini b/DATA/UNIVERSE/SYSTEMS/HI02/hi02.ini
index 3f8a33c3..ea9ae88c 100644
--- a/DATA/UNIVERSE/SYSTEMS/HI02/hi02.ini
+++ b/DATA/UNIVERSE/SYSTEMS/HI02/hi02.ini
@@ -1849,8 +1849,8 @@ ids_name = 261350
 ids_info = 67000
 behavior = NOTHING
 pilot = pilot_crazy
-dock_with = Hi02_REM_LINER
-base = Hi02_REM_LINER
+dock_with = Hi02_REM_LINER_Base
+base = Hi02_REM_LINER_Base
 reputation = REM_CLAN
 rotate = 0, 0, 0
 archetype = prison_liner
diff --git a/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini b/DATA/UNIVERSE/custom_bases/Hi02_REM_LINER_Base.ini
similarity index 77%
rename from DATA/UNIVERSE/custom_bases/REMLINER_Base.ini
rename to DATA/UNIVERSE/custom_bases/Hi02_REM_LINER_Base.ini
index a5ddbb96..448d37de 100644
--- a/DATA/UNIVERSE/custom_bases/REMLINER_Base.ini
+++ b/DATA/UNIVERSE/custom_bases/Hi02_REM_LINER_Base.ini
@@ -1,5 +1,5 @@
 [BaseInfo]
-nickname = Hi02_REM_LINER
+nickname = Hi02_REM_LINER_Base
 start_room = Deck
 
 [Room]
diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini
index 2d7e6eb6..b9d87060 100644
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -1476,6 +1476,16 @@ terrain_dyna_01 = debris_small1
 terrain_dyna_02 = debris_small2
 
 
+; REM LINER
+
+[Base]
+nickname = Hi02_REM_LINER_Base
+system = Hi02
+strid_name = 198007
+file = Universe\custom_bases\Hi02_REM_LINER_Base.ini
+BGCS_base_run_by = W02bF35
+
+
 ; Omicron Minor
 
 [Base]
@@ -1518,6 +1528,16 @@ strid_name = 197409
 file = Universe\Systems\St03b\Bases\St03b_01_Base.ini
 autosave_forbidden = true
 
+; Alexandria
+
+[Base]
+nickname = ST03_01_Base
+system = ST03
+strid_name = 198005
+file = UNIVERSE\SYSTEMS\ST03\Bases\ST03_01_Base.ini
+BGCS_base_run_by = W02bF35
+
+
 [Base]
 nickname = br_m_hydrocarbon_miner
 system = Br02
@@ -1648,6 +1668,24 @@ system = Ew06
 strid_name = 261790
 file = Universe\Systems\Ew06\Bases\Ew06_02_Base.ini
 
+; Farway Station
+
+[Base]
+nickname = Ew06_Farway_Base
+system = EW06
+strid_name = 198009
+file = Universe\Systems\Ew06\Bases\Farway_Base.ini
+BGCS_base_run_by = W02bF53
+
+; Nomad Base
+
+[Base]
+nickname = Ew06_Nomad_Base
+system = Ew06
+strid_name = 0
+file = Universe\Systems\Ew06\Bases\Nomad_Base.ini
+BGCS_base_run_by = W02bF53
+
 [system]
 nickname = Li01
 file = Systems\Li01\Li01.ini
@@ -2156,74 +2194,6 @@ NavMapScale = 3
 
 
 
-; REM Additions
-
-; Omicron Gamma
-
-;REM LINER
-
-[Base]
-nickname = Hi02_REM_LINER
-system = Hi02
-strid_name = 198007
-file = Universe\custom_bases\REMLINER_Base.ini
-BGCS_base_run_by = W02bF35
-
-
-
-; Unknown Gamma
-
-; Farway Station
-
-[Base]
-nickname = Ew06_Farway_Base
-system = EW06
-strid_name = 198009
-file = Universe\Systems\Ew06\Bases\Farway_Base.ini
-BGCS_base_run_by = W02bF53
-
-; Nomad Base
-
-[Base]
-nickname = Ew06_Nomad_Base
-system = Ew06
-strid_name = 0
-file = Universe\Systems\Ew06\Bases\Nomad_Base.ini
-BGCS_base_run_by = W02bF53
-
-
-
-
-; Omicron Major
-
-
-
-
-; Omicron Major 2
-
-; Alexandria
-
-[Base]
-nickname = ST03_01_Base
-system = ST03
-strid_name = 198005
-file = UNIVERSE\SYSTEMS\ST03\Bases\ST03_01_Base.ini
-BGCS_base_run_by = W02bF35
-
-
-
-; Omicron Lambda
-
-[system]
-nickname = ST04
-file = systems\St04\St04.ini
-pos = 15, 5
-visit = 0
-strid_name = 198004
-ids_info = 1
-NavMapScale = 2.125000
-msg_id_prefix = gcs_refer_system_ST04
-
 ; Cairo
 
 [Base]
@@ -2261,4 +2231,16 @@ file = UNIVERSE\SYSTEMS\ST04\Bases\St04_04_Base.ini
 BGCS_base_run_by = W02bF35
 
 
+; Omicron Lambda
+
+[system]
+nickname = ST04
+file = systems\St04\St04.ini
+pos = 15, 5
+visit = 0
+strid_name = 198004
+ids_info = 1
+NavMapScale = 2.125000
+msg_id_prefix = gcs_refer_system_ST04
+