diff --git a/DATA/EQUIPMENT/market_commodities.ini b/DATA/EQUIPMENT/market_commodities.ini
index 9b45c21b..d55c2f5f 100644
--- a/DATA/EQUIPMENT/market_commodities.ini
+++ b/DATA/EQUIPMENT/market_commodities.ini
@@ -2561,4 +2561,29 @@ MarketGood = commodity_prisoners, 0, -1, 0, 0, 1, 2.000000
 ; Farway Station
 
 [BaseGood]
-base = Ew06_Farway_Base
\ No newline at end of file
+base = Ew06_Farway_Base
+
+
+; Alexandria
+
+[BaseGood] 
+base = ST03_01_Base
+
+
+; Kairo
+
+[BaseGood]
+base = ST04_01_Base
+
+
+
+; Menes
+
+[BaseGood]
+base = ST04_02_Base
+
+
+; Sinai
+
+[BaseGood]
+base = ST04_03_Base
diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini
index fdf740f7..0f762563 100644
--- a/DATA/EQUIPMENT/market_misc.ini
+++ b/DATA/EQUIPMENT/market_misc.ini
@@ -11643,8 +11643,32 @@ MarketGood = li_turret02_mark03, 10, 0.2, 10, 10, 0, 1
 MarketGood = missile01_mark01, 0, -1, 10, 10, 0, 1
 MarketGood = missile02_mark01, 0, -1, 10, 10, 0, 1
 
+; Alexandria
+
+[BaseGood] 
+base = ST03_01_Base
+
 
 ; Farway Station
 
 [BaseGood]
 base = Ew06_Farway_Base
+
+
+; Kairo
+
+[BaseGood]
+base = ST04_01_Base
+
+
+
+; Menes
+
+[BaseGood]
+base = ST04_02_Base
+
+
+; Sinai
+
+[BaseGood]
+base = ST04_03_Base
diff --git a/DATA/EQUIPMENT/market_ships.ini b/DATA/EQUIPMENT/market_ships.ini
index e29f841b..1bcc8580 100644
--- a/DATA/EQUIPMENT/market_ships.ini
+++ b/DATA/EQUIPMENT/market_ships.ini
@@ -267,18 +267,38 @@ marketgood = oe_package, 16, -1, 1, 1, 0, 1, 1
 base = Hi02_REM_LINER
 marketgood = package_bh_elite3, 1, -1, 1, 1, 0, 1, 1
 
+
+
+; Farway Station
+
 [BaseGood] 
 base = Ew06_Farway_Base
 
-[BaseGood] 
-base = St04_01_base
+
+
+; Alexandria
 
 [BaseGood] 
-base = St04_02_base
+base = ST03_01_Base
+
+
+
+; Kairo
 
 [BaseGood] 
-base = St04_03_base
-marketgood = remtrain_package, 16, -1, 1, 1, 0, 1, 1
+base = ST04_01_Base
+
+
+
+; Menes
 
 [BaseGood] 
-base = St04_04_base
\ No newline at end of file
+base = ST04_02_Base
+
+
+
+; Sinai
+
+[BaseGood] 
+base = ST04_03_Base
+marketgood = remtrain_package, 16, -1, 1, 1, 0, 1, 1
\ No newline at end of file
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 4e95092b..68359aa7 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -45220,10 +45220,10 @@ fixture = allianz_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shi
 ; Kairo
 
 [MBase]
-nickname = St04_01_Base
+nickname = ST04_01_Base
 local_faction = fc_or_grp
 diff = 10
-msg_id_prefix = gcs_refer_base_St04_01_Base
+msg_id_prefix = gcs_refer_base_ST04_01_Base
 
 [MVendor]
 num_offers = 2, 4
@@ -45406,10 +45406,10 @@ fixture = st0401_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 ; Menes
 
 [MBase]
-nickname = St04_02_Base
+nickname = ST04_02_Base
 local_faction = fc_or_grp
 diff = 9
-msg_id_prefix = gcs_refer_base_St04_02_Base
+msg_id_prefix = gcs_refer_base_ST04_02_Base
 
 [MVendor]
 num_offers = 8, 16
@@ -45728,6 +45728,7 @@ fixture = st0403_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 nickname = Ew06_Farway_Base
 local_faction = co_os_grp
 diff = 19
+msg_id_prefix = gcs_refer_base_EW06_Farway_Base
 
 
 [MVendor]
@@ -45841,7 +45842,7 @@ fixture = farway_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 ; Alexandria
 
 [MBase]
-nickname = St03_01_Base
+nickname = ST03_01_Base
 local_faction = fc_or_grp
 diff = 9
 msg_id_prefix = gcs_refer_base_St03_01_Base