diff --git a/DATA/MISSIONS/M12/npcships.ini b/DATA/MISSIONS/M12/npcships.ini
index 44cef69..43fe844 100644
--- a/DATA/MISSIONS/M12/npcships.ini
+++ b/DATA/MISSIONS/M12/npcships.ini
@@ -11,7 +11,7 @@ npc_class = lawful, elite_fighter
 nickname = MSN12_Juni
 loadout = MSN12_Juni
 level = d12
-ship_archetype = li_elite2
+ship_archetype = or_elite
 pilot = MSN12_Juni
 state_graph = FIGHTER
 npc_class = lawful, elite_fighter
diff --git a/DATA/MISSIONS/M13/npcships.ini b/DATA/MISSIONS/M13/npcships.ini
index 654cdda..9b701b7 100644
--- a/DATA/MISSIONS/M13/npcships.ini
+++ b/DATA/MISSIONS/M13/npcships.ini
@@ -20,7 +20,7 @@ npc_class = lawful, elite_fighter
 nickname = MSN13_Juni
 loadout = MSN13_Juni
 level = d13
-ship_archetype = li_elite2
+ship_archetype = or_elite
 pilot = MSN13_Juni
 state_graph = FIGHTER
 npc_class = lawful, elite_fighter
diff --git a/DATA/SHIPS/loadouts.ini b/DATA/SHIPS/loadouts.ini
index 58ca441..8b7111d 100644
--- a/DATA/SHIPS/loadouts.ini
+++ b/DATA/SHIPS/loadouts.ini
@@ -3295,8 +3295,8 @@ equip = DockingLightRedSmall, HpDockLight02
 [Loadout]
 nickname = MSN03_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark03_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark03_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3327,8 +3327,8 @@ cargo = ge_s_repair_01, 10
 [Loadout]
 nickname = MSN04_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark04_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark04_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3359,8 +3359,8 @@ cargo = ge_s_repair_01, 10
 [Loadout]
 nickname = MSN05_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark04_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark04_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3391,8 +3391,8 @@ cargo = ge_s_repair_01, 20
 [Loadout]
 nickname = MSN07_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark05_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark05_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3423,8 +3423,8 @@ cargo = ge_s_repair_01, 20
 [Loadout]
 nickname = MSN08_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark05_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark05_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3489,8 +3489,8 @@ cargo = ge_s_repair_01, 30
 [Loadout]
 nickname = MSN11_Juni
 archetype = li_elite2
-equip = ge_lf_engine_01
-equip = shield01_mark06_lf, HpShield01
+equip = ge_le_engine_01
+equip = shield01_mark06_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3520,9 +3520,9 @@ cargo = ge_s_repair_01, 20
 
 [Loadout]
 nickname = MSN12_Juni
-archetype = li_elite2
+archetype = or_elite
 equip = ge_oe_engine_01
-equip = shield01_mark06_hf, HpShield01
+equip = shield01_mark07_hf, HpShield01
 equip = infinite_power
 equip = ge_s_scanner_02
 equip = ge_s_tractor_01
@@ -3553,7 +3553,7 @@ cargo = ge_s_repair_01, 30
 
 [Loadout]
 nickname = MSN13_Juni
-archetype = li_elite2
+archetype = or_elite
 equip = ge_oe_engine_01
 equip = shield01_mark07_hf, HpShield01
 equip = infinite_power